chromium/src
0
Fork 0
Code Activity

Move base/gfx/skia_util to skia/ext/skia_util_win.

Browse Source 
In a later pass, I will separate off the cross-platform part of this file into skia/ext/skia_util (only one function).
Review URL: http://codereview.chromium.org/13101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6306 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
brettw@google.com
2008-12-03 20:48:29 +00:00
parent fc78fd42b8
commit 90d22e2aee
23 changed files with 30 additions and 31 deletions

8
base/build/base_gfx.vcproj

@@ -177,14 +177,6 @@
RelativePath="..\gfx\size.h" RelativePath="..\gfx\size.h"
> >
</File> </File>
<File
RelativePath="..\gfx\skia_utils.cc"
>
</File>
<File
RelativePath="..\gfx\skia_utils.h"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

2
base/gfx/base_gfx.scons

@@ -32,7 +32,6 @@ input_files = [
'point.cc', 'point.cc',
'rect.cc', 'rect.cc',
'size.cc', 'size.cc',
'skia_utils.cc',
] ]
if env['PLATFORM'] in ('posix', 'darwin'): if env['PLATFORM'] in ('posix', 'darwin'):
@@ -41,7 +40,6 @@ if env['PLATFORM'] in ('posix', 'darwin'):
to_be_ported_files = [ to_be_ported_files = [
'gdi_util.cc', 'gdi_util.cc',
'native_theme.cc', 'native_theme.cc',
'skia_utils.cc',
] ]
for remove in to_be_ported_files: for remove in to_be_ported_files:
input_files.remove(remove) input_files.remove(remove)

2
chrome/browser/autocomplete/autocomplete_edit.cc

@@ -8,7 +8,6 @@
#include "base/base_drag_source.h" #include "base/base_drag_source.h"
#include "base/clipboard.h" #include "base/clipboard.h"
#include "base/gfx/skia_utils.h"
#include "base/iat_patch.h" #include "base/iat_patch.h"
#include "base/ref_counted.h" #include "base/ref_counted.h"
#include "base/scoped_clipboard_writer.h" #include "base/scoped_clipboard_writer.h"
@@ -35,6 +34,7 @@
#include "chrome/common/win_util.h" #include "chrome/common/win_util.h"
#include "chrome/views/accessibility/autocomplete_accessibility.h" #include "chrome/views/accessibility/autocomplete_accessibility.h"
#include "googleurl/src/url_util.h" #include "googleurl/src/url_util.h"
#include "skia/ext/skia_utils_win.h"
#include "generated_resources.h" #include "generated_resources.h"

2
chrome/browser/views/bookmark_bar_view.cc

@@ -7,7 +7,6 @@
#include <limits> #include <limits>
#include "base/base_drag_source.h" #include "base/base_drag_source.h"
#include "base/gfx/skia_utils.h"
#include "chrome/app/theme/theme_resources.h" #include "chrome/app/theme/theme_resources.h"
#include "chrome/browser/bookmarks/bookmark_context_menu.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h"
#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -45,6 +44,7 @@
#include "chrome/views/widget.h" #include "chrome/views/widget.h"
#include "chrome/views/window.h" #include "chrome/views/window.h"
#include "generated_resources.h" #include "generated_resources.h"
#include "skia/ext/skia_utils_win.h"
using views::BaseButton; using views::BaseButton;
using views::DropTargetEvent; using views::DropTargetEvent;

2
chrome/browser/views/options/content_page_view.cc

@@ -11,7 +11,6 @@
#include "base/file_util.h" #include "base/file_util.h"
#include "base/gfx/native_theme.h" #include "base/gfx/native_theme.h"
#include "base/gfx/skia_utils.h"
#include "chrome/app/theme/theme_resources.h" #include "chrome/app/theme/theme_resources.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/shell_dialogs.h" #include "chrome/browser/shell_dialogs.h"
@@ -31,6 +30,7 @@
#include "chrome/views/text_field.h" #include "chrome/views/text_field.h"
#include "chrome/views/widget.h" #include "chrome/views/widget.h"
#include "generated_resources.h" #include "generated_resources.h"
#include "skia/ext/skia_utils_win.h"
#include "skia/include/SkBitmap.h" #include "skia/include/SkBitmap.h"
namespace { namespace {

1
chrome/browser/views/options/fonts_page_view.cc

@@ -10,7 +10,6 @@
#include "base/file_util.h" #include "base/file_util.h"
#include "base/gfx/native_theme.h" #include "base/gfx/native_theme.h"
#include "base/gfx/skia_utils.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "chrome/app/theme/theme_resources.h" #include "chrome/app/theme/theme_resources.h"
#include "chrome/app/locales/locale_settings.h" #include "chrome/app/locales/locale_settings.h"

1
chrome/browser/views/options/languages_page_view.cc

@@ -11,7 +11,6 @@
#include "base/file_util.h" #include "base/file_util.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "base/gfx/native_theme.h" #include "base/gfx/native_theme.h"
#include "base/gfx/skia_utils.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "chrome/app/theme/theme_resources.h" #include "chrome/app/theme/theme_resources.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"

1
chrome/browser/views/options/options_group_view.cc

@@ -8,7 +8,6 @@
#include "chrome/browser/views/options/options_group_view.h" #include "chrome/browser/views/options/options_group_view.h"
#include "base/gfx/native_theme.h" #include "base/gfx/native_theme.h"
#include "base/gfx/skia_utils.h"
#include "chrome/app/locales/locale_settings.h" #include "chrome/app/locales/locale_settings.h"
#include "chrome/browser/views/standard_layout.h" #include "chrome/browser/views/standard_layout.h"
#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/chrome_font.h"

5
chrome/common/gfx/color_utils.cc

@@ -12,10 +12,13 @@
#include "chrome/common/gfx/color_utils.h" #include "chrome/common/gfx/color_utils.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/gfx/skia_utils.h"
#include "base/logging.h" #include "base/logging.h"
#include "skia/include/SkBitmap.h" #include "skia/include/SkBitmap.h"
#if defined(OS_WIN)
#include "skia/ext/skia_utils_win.h"
#endif
namespace color_utils { namespace color_utils {
// These transformations are based on the equations in: // These transformations are based on the equations in:

2
chrome/views/background.cc

@@ -4,11 +4,11 @@
#include "chrome/views/background.h" #include "chrome/views/background.h"
#include "base/gfx/skia_utils.h"
#include "base/logging.h" #include "base/logging.h"
#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/views/painter.h" #include "chrome/views/painter.h"
#include "chrome/views/view.h" #include "chrome/views/view.h"
#include "skia/ext/skia_utils_win.h"
#include "skia/include/SkPaint.h" #include "skia/include/SkPaint.h"
namespace views { namespace views {

2
chrome/views/chrome_menu.cc

@@ -10,7 +10,6 @@
#include "base/base_drag_source.h" #include "base/base_drag_source.h"
#include "base/gfx/native_theme.h" #include "base/gfx/native_theme.h"
#include "base/gfx/skia_utils.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/task.h" #include "base/task.h"
#include "base/timer.h" #include "base/timer.h"
@@ -25,6 +24,7 @@
#include "chrome/views/view_constants.h" #include "chrome/views/view_constants.h"
#include "chrome/views/widget_win.h" #include "chrome/views/widget_win.h"
#include "generated_resources.h" #include "generated_resources.h"
#include "skia/ext/skia_utils_win.h"
#undef min #undef min
#undef max #undef max

2
chrome/views/single_split_view.cc

@@ -4,9 +4,9 @@
#include "chrome/views/single_split_view.h" #include "chrome/views/single_split_view.h"
#include "base/gfx/skia_utils.h"
#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/views/background.h" #include "chrome/views/background.h"
#include "skia/ext/skia_utils_win.h"
namespace views { namespace views {

2
chrome/views/tabbed_pane.cc

@@ -7,7 +7,6 @@
#include <vssym32.h> #include <vssym32.h>
#include "base/gfx/native_theme.h" #include "base/gfx/native_theme.h"
#include "base/gfx/skia_utils.h"
#include "base/logging.h" #include "base/logging.h"
#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/chrome_font.h"
@@ -18,6 +17,7 @@
#include "chrome/views/background.h" #include "chrome/views/background.h"
#include "chrome/views/root_view.h" #include "chrome/views/root_view.h"
#include "chrome/views/widget_win.h" #include "chrome/views/widget_win.h"
#include "skia/ext/skia_utils_win.h"
#include "skia/include/SkColor.h" #include "skia/include/SkColor.h"
namespace views { namespace views {

2
chrome/views/table_view.cc

@@ -9,7 +9,6 @@
#include "base/string_util.h" #include "base/string_util.h"
#include "base/win_util.h" #include "base/win_util.h"
#include "base/gfx/skia_utils.h"
#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/favicon_size.h"
#include "chrome/common/gfx/icon_util.h" #include "chrome/common/gfx/icon_util.h"
@@ -18,6 +17,7 @@
#include "chrome/views/hwnd_view.h" #include "chrome/views/hwnd_view.h"
#include "SkBitmap.h" #include "SkBitmap.h"
#include "SkColorFilter.h" #include "SkColorFilter.h"
#include "skia/ext/skia_utils_win.h"
namespace views { namespace views {

2
chrome/views/text_field.cc

@@ -12,7 +12,6 @@
#include <vsstyle.h> #include <vsstyle.h>
#include "base/gfx/native_theme.h" #include "base/gfx/native_theme.h"
#include "base/gfx/skia_utils.h"
#include "base/scoped_clipboard_writer.h" #include "base/scoped_clipboard_writer.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "base/win_util.h" #include "base/win_util.h"
@@ -25,6 +24,7 @@
#include "chrome/views/hwnd_view.h" #include "chrome/views/hwnd_view.h"
#include "chrome/views/menu.h" #include "chrome/views/menu.h"
#include "chrome/views/widget.h" #include "chrome/views/widget.h"
#include "skia/ext/skia_utils_win.h"
#include "generated_resources.h" #include "generated_resources.h"

1
skia/SConscript

@@ -183,6 +183,7 @@ if env['PLATFORM'] == 'win32':
input_files.append('ext/bitmap_platform_device_win.cc') input_files.append('ext/bitmap_platform_device_win.cc')
input_files.append('ext/platform_canvas_win.cc') input_files.append('ext/platform_canvas_win.cc')
input_files.append('ext/platform_device_win.cc') input_files.append('ext/platform_device_win.cc')
input_files.append('ext/skia_utils_win.cc")
input_files.append('ext/vector_canvas.cc') input_files.append('ext/vector_canvas.cc')
input_files.append('ext/vector_device.cc') input_files.append('ext/vector_device.cc')

2
skia/ext/platform_device_win.cc

@@ -5,7 +5,7 @@
#include "skia/ext/platform_device_win.h" #include "skia/ext/platform_device_win.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/gfx/skia_utils.h" #include "skia/ext/skia_utils_win.h"
#include "SkMatrix.h" #include "SkMatrix.h"
#include "SkPath.h" #include "SkPath.h"
#include "SkRegion.h" #include "SkRegion.h"

2
base/gfx/skia_utils.cc → skia/ext/skia_utils_win.cc

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "base/gfx/skia_utils.h" #include "skia/ext/skia_utils_win.h"
#include "base/logging.h" #include "base/logging.h"
#include "SkRect.h" #include "SkRect.h"

6
base/gfx/skia_utils.h → skia/ext/skia_utils_win.h

@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef BASE_GFX_SKIA_UTILS_H__ #ifndef BASE_GFX_SKIA_UTILS_WIN_H_
#define BASE_GFX_SKIA_UTILS_H__ #define BASE_GFX_SKIA_UTILS_WIN_H_
#include "SkColor.h" #include "SkColor.h"
#include "SkShader.h" #include "SkShader.h"
@@ -52,5 +52,5 @@ COLORREF SkColorToCOLORREF(SkColor color);
} // namespace gfx } // namespace gfx
#endif #endif // SKIA_EXT_SKIA_UTILS_WIN_H_

2
skia/ext/vector_device.cc

@@ -5,9 +5,9 @@
#include "skia/ext/vector_device.h" #include "skia/ext/vector_device.h"
#include "base/gfx/gdi_util.h" #include "base/gfx/gdi_util.h"
#include "base/gfx/skia_utils.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/scoped_handle.h" #include "base/scoped_handle.h"
#include "skia/ext/skia_utils_win.h"
#include "SkUtils.h" #include "SkUtils.h"

8
skia/skia.vcproj

@@ -1360,6 +1360,14 @@
RelativePath=".\ext\platform_device_win.h" RelativePath=".\ext\platform_device_win.h"
> >
</File> </File>
<File
RelativePath=".\ext\skia_utils_win.cc"
>
</File>
<File
RelativePath=".\ext\skia_utils_win.h"
>
</File>
<File <File
RelativePath=".\ext\vector_canvas.cc" RelativePath=".\ext\vector_canvas.cc"
> >

1
webkit/port/platform/graphics/PlatformContextSkia.cpp

@@ -34,7 +34,6 @@
#include "SkiaUtils.h" #include "SkiaUtils.h"
#include "wtf/MathExtras.h" #include "wtf/MathExtras.h"
#include "base/gfx/skia_utils.h" // TODO(brettw) remove this depencency.
#include "skia/ext/image_operations.h" #include "skia/ext/image_operations.h"
#include "skia/ext/platform_canvas.h" #include "skia/ext/platform_canvas.h"

3
webkit/port/rendering/RenderThemeWin.cpp

@@ -37,9 +37,10 @@
#include "SkiaUtils.h" #include "SkiaUtils.h"
#include "ThemeHelperWin.h" #include "ThemeHelperWin.h"
// TODO(brettw) all of these dependencies should eventually be removed.
#include "base/gfx/native_theme.h" #include "base/gfx/native_theme.h"
#include "base/gfx/skia_utils.h"
#include "base/win_util.h" #include "base/win_util.h"
#include "skia/ext/skia_utils_win.h"
namespace { namespace {