diff options
24 files changed, 53 insertions, 146 deletions
diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj index 1663719..ca1b056 100644 --- a/base/base.xcodeproj/project.pbxproj +++ b/base/base.xcodeproj/project.pbxproj @@ -82,7 +82,6 @@ 7B836E180E55CE5B00F6AD31 /* libicudata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B836D970E55CE4700F6AD31 /* libicudata.a */; }; 7B8505B30E5B432200730B43 /* size.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B8505A40E5B3FBE00730B43 /* size.cc */; }; 7B8505D30E5B43EE00730B43 /* rect_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45629E40E27C058005E4685 /* rect_unittest.cc */; }; - 7B8505D40E5B43FE00730B43 /* convolver_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48A06790E3F714300172919 /* convolver_unittest.cc */; }; 7B8505D50E5B441000730B43 /* png_codec_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4562A200E27C8C1005E4685 /* png_codec_unittest.cc */; }; 7B8505D90E5B445100730B43 /* libbase_gfx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 825403B10D92D2E50006B936 /* libbase_gfx.a */; }; 7B85062A0E5B556900730B43 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B165D5E0E55081400185273 /* libpng.a */; }; @@ -150,8 +149,6 @@ A5A0270B0E4A630D00498DA9 /* file_util_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5A0270A0E4A630D00498DA9 /* file_util_mac.mm */; }; A5CE1D2B0E55F4D800AD0606 /* file_util_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = A5A0282D0E4CFA8500498DA9 /* file_util_unittest.cc */; }; AB4C147D0EC0E3F600655FED /* time_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BEB81490D9B0F33009BA8DD /* time_mac.cc */; }; - AB956E030E5DDB7A00BBE9D8 /* image_operations.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48A06370E3F6C1F00172919 /* image_operations.cc */; }; - AB956E0A0E5DDC0900BBE9D8 /* image_operations_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48A063B0E3F6C3000172919 /* image_operations_unittest.cc */; }; ABE1BA2A0E7574D1009041DA /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABE1BA290E7574D1009041DA /* ApplicationServices.framework */; }; ABE1BA610E75757C009041DA /* skia_utils_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = ABE1BA600E75757C009041DA /* skia_utils_mac.cc */; }; ABF4B98F0DC2BA6900A6E319 /* base_paths_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABF4B98E0DC2BA6900A6E319 /* base_paths_mac.mm */; }; @@ -179,7 +176,6 @@ BA73AA330E5F614B00A20026 /* condition_variable_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = BA73AA320E5F614B00A20026 /* condition_variable_unittest.cc */; }; E45062A60E40A9BE0025A81A /* base_switches.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825402CB0D92D1390006B936 /* base_switches.cc */; }; E48A05F70E3F61B300172919 /* command_line.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4A133490E37A41D00110AA2 /* command_line.cc */; }; - E48A06710E3F70E200172919 /* convolver.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48A06680E3F70B500172919 /* convolver.cc */; }; E48FB9990EC4ED850052B72B /* process_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48FB9980EC4ED850052B72B /* process_posix.cc */; }; E48FB9EA0EC4F53B0052B72B /* process_util_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E48FB9E90EC4F53B0052B72B /* process_util_mac.mm */; }; E49115EF0E47B461001EE8C3 /* at_exit.cc in Sources */ = {isa = PBXBuildFile; fileRef = E49115EC0E47B461001EE8C3 /* at_exit.cc */; }; @@ -385,7 +381,6 @@ 536092F70ECE474500D1B91E /* dmg_fp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dmg_fp.h; path = third_party/dmg_fp/dmg_fp.h; sourceTree = "<group>"; }; 536092F80ECE474500D1B91E /* dtoa.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dtoa.cc; path = third_party/dmg_fp/dtoa.cc; sourceTree = "<group>"; }; 536092F90ECE474500D1B91E /* g_fmt.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = g_fmt.cc; path = third_party/dmg_fp/g_fmt.cc; sourceTree = "<group>"; }; - 7B1435DE0E78416400901940 /* skia_utils_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skia_utils_mac.h; sourceTree = "<group>"; }; 7B1435DF0E78419700901940 /* native_widget_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = native_widget_types.h; sourceTree = "<group>"; }; 7B26301F0E82F1E6001CE27F /* libevent.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libevent.xcodeproj; path = third_party/libevent/libevent.xcodeproj; sourceTree = "<group>"; }; 7B26302D0E82F218001CE27F /* message_pump_libevent.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = message_pump_libevent.cc; sourceTree = "<group>"; }; @@ -406,8 +401,6 @@ 7B8505A10E5B3FBE00730B43 /* img_resize_perftest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = img_resize_perftest.cc; sourceTree = "<group>"; }; 7B8505A20E5B3FBE00730B43 /* native_theme_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = native_theme_unittest.cc; sourceTree = "<group>"; }; 7B8505A40E5B3FBE00730B43 /* size.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = size.cc; sourceTree = "<group>"; }; - 7B8505A50E5B3FBE00730B43 /* skia_utils.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skia_utils.cc; sourceTree = "<group>"; }; - 7B8505A60E5B3FBE00730B43 /* skia_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skia_utils.h; sourceTree = "<group>"; }; 7BA355E90E898C100023C8B9 /* message_pump_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = message_pump_mac.h; sourceTree = "<group>"; }; 7BA355EA0E898C100023C8B9 /* message_pump_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = message_pump_mac.mm; sourceTree = "<group>"; }; 7BA3562B0E898F7B0023C8B9 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = "<group>"; }; @@ -606,7 +599,6 @@ A5A0282D0E4CFA8500498DA9 /* file_util_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_util_unittest.cc; sourceTree = "<group>"; }; AB14B6060EBFA74C00FB3807 /* time_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time_posix.cc; sourceTree = "<group>"; }; ABE1BA290E7574D1009041DA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<group>"; }; - ABE1BA600E75757C009041DA /* skia_utils_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skia_utils_mac.cc; sourceTree = "<group>"; }; ABF4B98E0DC2BA6900A6E319 /* base_paths_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = base_paths_mac.mm; sourceTree = "<group>"; }; ABF4B99D0DC2BB6000A6E319 /* clipboard_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = clipboard_mac.mm; sourceTree = "<group>"; }; ABF4B9B40DC2BC9F00A6E319 /* path_service.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = path_service.cc; sourceTree = "<group>"; }; @@ -637,12 +629,6 @@ E4562C680E2803C3005E4685 /* pickle_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pickle_unittest.cc; sourceTree = "<group>"; }; E45A2B5A0E479A1900DB1196 /* command_line_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = command_line_unittest.cc; sourceTree = "<group>"; }; E45A2C680E47AEFF00DB1196 /* gtest.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = gtest.xcodeproj; path = testing/gtest.xcodeproj; sourceTree = "<group>"; }; - E48A06370E3F6C1F00172919 /* image_operations.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = image_operations.cc; sourceTree = "<group>"; }; - E48A06380E3F6C1F00172919 /* image_operations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image_operations.h; sourceTree = "<group>"; }; - E48A063B0E3F6C3000172919 /* image_operations_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = image_operations_unittest.cc; sourceTree = "<group>"; }; - E48A06680E3F70B500172919 /* convolver.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = convolver.cc; sourceTree = "<group>"; }; - E48A06690E3F70B500172919 /* convolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = convolver.h; sourceTree = "<group>"; }; - E48A06790E3F714300172919 /* convolver_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = convolver_unittest.cc; sourceTree = "<group>"; }; E48FB9980EC4ED850052B72B /* process_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = process_posix.cc; sourceTree = "<group>"; }; E48FB9E90EC4F53B0052B72B /* process_util_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = process_util_mac.mm; sourceTree = "<group>"; }; E49115EB0E47B461001EE8C3 /* at_exit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = at_exit.h; sourceTree = "<group>"; }; @@ -1073,13 +1059,6 @@ 825403B40D92D2EC0006B936 /* gfx */ = { isa = PBXGroup; children = ( - E48A06680E3F70B500172919 /* convolver.cc */, - E48A06690E3F70B500172919 /* convolver.h */, - E48A06790E3F714300172919 /* convolver_unittest.cc */, - E48A06370E3F6C1F00172919 /* image_operations.cc */, - E48A06380E3F6C1F00172919 /* image_operations.h */, - E48A063B0E3F6C3000172919 /* image_operations_unittest.cc */, - 7B8505A10E5B3FBE00730B43 /* img_resize_perftest.cc */, 825403C80D92D31D0006B936 /* native_theme.cc */, 825403C90D92D31D0006B936 /* native_theme.h */, 7B8505A20E5B3FBE00730B43 /* native_theme_unittest.cc */, @@ -1096,10 +1075,6 @@ E45629E40E27C058005E4685 /* rect_unittest.cc */, 7B8505A40E5B3FBE00730B43 /* size.cc */, 825403D70D92D31D0006B936 /* size.h */, - 7B8505A50E5B3FBE00730B43 /* skia_utils.cc */, - 7B8505A60E5B3FBE00730B43 /* skia_utils.h */, - ABE1BA600E75757C009041DA /* skia_utils_mac.cc */, - 7B1435DE0E78416400901940 /* skia_utils_mac.h */, ); path = gfx; sourceTree = "<group>"; @@ -1433,8 +1408,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E48A06710E3F70E200172919 /* convolver.cc in Sources */, - AB956E030E5DDB7A00BBE9D8 /* image_operations.cc in Sources */, 825403EE0D92D31D0006B936 /* png_decoder.cc in Sources */, 825403F00D92D31D0006B936 /* png_encoder.cc in Sources */, 825403F20D92D31D0006B936 /* point.cc in Sources */, @@ -1453,7 +1426,6 @@ B52C916C0E9428F500208D01 /* clipboard_unittest.cc in Sources */, 7B78D38F0E54FE0100609465 /* command_line_unittest.cc in Sources */, BA73AA330E5F614B00A20026 /* condition_variable_unittest.cc in Sources */, - 7B8505D40E5B43FE00730B43 /* convolver_unittest.cc in Sources */, ABF68B2B0EB0F93E00E72835 /* field_trial_unittest.cc in Sources */, 4D11B89F0E929F0700EF7617 /* file_path_unittest.cc in Sources */, A5CE1D2B0E55F4D800AD0606 /* file_util_unittest.cc in Sources */, @@ -1461,7 +1433,6 @@ 93611B1A0E5A878400F9405D /* histogram_unittest.cc in Sources */, 7BAE392B0E6F4EF200C3F750 /* hmac_unittest.cc in Sources */, B57E4D780E9C26340090055D /* idletimer_unittest.cc in Sources */, - AB956E0A0E5DDC0900BBE9D8 /* image_operations_unittest.cc in Sources */, 7B78D3920E54FE0100609465 /* json_reader_unittest.cc in Sources */, 7B78D3930E54FE0100609465 /* json_writer_unittest.cc in Sources */, 7BF892E00E758883000BAF8A /* lazy_instance_unittest.cc in Sources */, diff --git a/base/build/base_gfx.vcproj b/base/build/base_gfx.vcproj index ef4b5de..355d19a 100644 --- a/base/build/base_gfx.vcproj +++ b/base/build/base_gfx.vcproj @@ -122,14 +122,6 @@ </References> <Files> <File - RelativePath="..\gfx\convolver.cc" - > - </File> - <File - RelativePath="..\gfx\convolver.h" - > - </File> - <File RelativePath="..\gfx\gdi_util.cc" > </File> @@ -138,14 +130,6 @@ > </File> <File - RelativePath="..\gfx\image_operations.cc" - > - </File> - <File - RelativePath="..\gfx\image_operations.h" - > - </File> - <File RelativePath="..\gfx\native_theme.cc" > </File> diff --git a/base/build/base_unittests.vcproj b/base/build/base_unittests.vcproj index 3c75166..e822992 100644 --- a/base/build/base_unittests.vcproj +++ b/base/build/base_unittests.vcproj @@ -396,14 +396,6 @@ Name="gfx_tests" > <File - RelativePath="..\gfx\convolver_unittest.cc" - > - </File> - <File - RelativePath="..\gfx\image_operations_unittest.cc" - > - </File> - <File RelativePath="..\gfx\png_codec_unittest.cc" > </File> diff --git a/base/gfx/base_gfx.scons b/base/gfx/base_gfx.scons index 7173340..e699344 100644 --- a/base/gfx/base_gfx.scons +++ b/base/gfx/base_gfx.scons @@ -25,9 +25,7 @@ if env['PLATFORM'] == 'win32': ) input_files = [ - 'convolver.cc', 'gdi_util.cc', - 'image_operations.cc', 'native_theme.cc', 'png_decoder.cc', 'png_encoder.cc', diff --git a/base/gfx/img_resize_perftest.cc b/base/gfx/img_resize_perftest.cc deleted file mode 100644 index 6a4b070..0000000 --- a/base/gfx/img_resize_perftest.cc +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include <stdlib.h> -#include <time.h> - -#include "base/perftimer.h" -#include "base/gfx/convolver.h" -#include "base/gfx/image_operations.h" -#include "base/gfx/image_resizer.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace { - -void FillRandomData(char* dest, int byte_count) { - srand(static_cast<unsigned>(time(NULL))); - for (int i = 0; i < byte_count; i++) - dest[i] = rand() * 255 / RAND_MAX; -} - -} // namespace - -// Old code gives [1521, 1519]ms for this, 4000x4000 -> 2100x2100 lanczos8 - -TEST(ImageResizePerf, BigFilter) { - static const int kSrcWidth = 4000; - static const int kSrcHeight = 4000; - static const int kSrcByteSize = kSrcWidth * kSrcHeight * 4; - - SkBitmap src_bmp; - src_bmp.setConfig(SkBitmap::kARGB_8888_Config, kSrcWidth, kSrcHeight); - src_bmp.allocPixels(); - FillRandomData(reinterpret_cast<char*>(src_bmp.getAddr32(0, 0)), - kSrcByteSize); - - // Make the dest size > 1/2 so the 50% optimization doesn't kick in. - static const int kDestWidth = 1400; - static const int kDestHeight = 1400; - - PerfTimeLogger resize_timer("resize"); - gfx::ImageResizer resizer(gfx::ImageResizer::LANCZOS3); - SkBitmap dest = resizer.Resize(src_bmp, kDestWidth, kDestHeight); -} - -// The original image filter we were using took 523ms for this test, while this -// one takes 857ms. -// TODO(brettw) make this at least 64% faster. -TEST(ImageOperationPerf, BigFilter) { - static const int kSrcWidth = 4000; - static const int kSrcHeight = 4000; - static const int kSrcByteSize = kSrcWidth * kSrcHeight * 4; - - SkBitmap src_bmp; - src_bmp.setConfig(SkBitmap::kARGB_8888_Config, kSrcWidth, kSrcHeight); - src_bmp.allocPixels(); - src_bmp.setIsOpaque(true); - FillRandomData(reinterpret_cast<char*>(src_bmp.getAddr32(0, 0)), - kSrcByteSize); - - // Make the dest size > 1/2 so the 50% optimization doesn't kick in. - static const int kDestWidth = 1400; - static const int kDestHeight = 1400; - - PerfTimeLogger resize_timer("resize"); - SkBitmap dest = gfx::ImageOperations::Resize(src_bmp, - gfx::ImageOperations::RESIZE_LANCZOS3, (float)kDestWidth / (float)kSrcWidth, - (float)kDestHeight / (float)kSrcHeight); -} - diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 262c507..5af7c47 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -11,7 +11,6 @@ #include "base/base_drag_source.h" #include "base/file_util.h" #include "base/scoped_clipboard_writer.h" -#include "base/gfx/image_operations.h" #include "base/string_util.h" #include "chrome/app/locales/locale_settings.h" #include "chrome/app/theme/theme_resources.h" @@ -25,6 +24,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/views/view.h" #include "generated_resources.h" +#include "skia/ext/image_operations.h" #include "SkPath.h" #include "SkShader.h" diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc index f77b05c..a2c23e4 100644 --- a/chrome/browser/fav_icon_helper.cc +++ b/chrome/browser/fav_icon_helper.cc @@ -4,7 +4,6 @@ #include "chrome/browser/fav_icon_helper.h" -#include "base/gfx/image_operations.h" #include "base/gfx/png_decoder.h" #include "base/gfx/png_encoder.h" #include "chrome/browser/navigation_entry.h" @@ -13,6 +12,7 @@ #include "chrome/browser/render_view_host.h" #include "chrome/browser/web_contents.h" #include "chrome/common/gfx/favicon_size.h" +#include "skia/ext/image_operations.h" FavIconHelper::FavIconHelper(WebContents* web_contents) : web_contents_(web_contents), diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 3ce8996..77711ac 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -8,7 +8,6 @@ #include <set> #include "base/file_util.h" -#include "base/gfx/image_operations.h" #include "base/gfx/png_encoder.h" #include "base/string_util.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -31,6 +30,7 @@ #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" #include "chrome/views/window.h" +#include "skia/ext/image_operations.h" #include "webkit/glue/image_decoder.h" #include "generated_resources.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index f1d00b3..6026b9e 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -6,7 +6,6 @@ #include "chrome/browser/views/tabs/tab_renderer.h" -#include "base/gfx/image_operations.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/tabs/tab_strip_model.h" @@ -17,6 +16,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "generated_resources.h" +#include "skia/ext/image_operations.h" static const int kLeftPadding = 16; static const int kTopPadding = 6; diff --git a/chrome/common/gfx/icon_util.cc b/chrome/common/gfx/icon_util.cc index e717c79..58c8020 100644 --- a/chrome/common/gfx/icon_util.cc +++ b/chrome/common/gfx/icon_util.cc @@ -4,10 +4,10 @@ #include "chrome/common/gfx/icon_util.h" #include "base/file_util.h" -#include "base/gfx/image_operations.h" #include "base/gfx/size.h" #include "base/logging.h" #include "chrome/common/win_util.h" +#include "skia/ext/image_operations.h" #include "skia/include/SkBitmap.h" // Defining the dimensions for the icon images. We store only one value because diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 23fab18..ec8bce5 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -10,7 +10,6 @@ #include "base/command_line.h" #include "base/gfx/gdi_util.h" -#include "base/gfx/image_operations.h" #include "base/gfx/native_theme.h" #include "base/gfx/png_encoder.h" #include "base/string_piece.h" @@ -38,6 +37,7 @@ #include "net/base/escape.h" #include "net/base/net_errors.h" #include "skia/ext/bitmap_platform_device.h" +#include "skia/ext/image_operations.h" #include "skia/ext/vector_canvas.h" #include "webkit/default_plugin/default_plugin_shared.h" #include "webkit/glue/dom_operations.h" diff --git a/chrome/views/button.cc b/chrome/views/button.cc index 93e2e3c..11dad29 100644 --- a/chrome/views/button.cc +++ b/chrome/views/button.cc @@ -7,12 +7,12 @@ #include <atlbase.h> #include <atlapp.h> -#include "base/gfx/image_operations.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/throb_animation.h" #include "chrome/views/event.h" +#include "skia/ext/image_operations.h" #include "generated_resources.h" diff --git a/base/gfx/convolver.cc b/skia/ext/convolver.cc index fd3503f..f5a429a 100644 --- a/base/gfx/convolver.cc +++ b/skia/ext/convolver.cc @@ -5,8 +5,8 @@ #include <algorithm> #include "base/basictypes.h" -#include "base/gfx/convolver.h" #include "base/logging.h" +#include "skia/ext/convolver.h" namespace gfx { diff --git a/base/gfx/convolver.h b/skia/ext/convolver.h index 12c9228..3ae84cd 100644 --- a/base/gfx/convolver.h +++ b/skia/ext/convolver.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_GFX_CONVOLVER_H__ -#define BASE_GFX_CONVOLVER_H__ +#ifndef SKIA_EXT_CONVOLVER_H_ +#define SKIA_EXT_CONVOLVER_H_ #include <vector> @@ -133,5 +133,5 @@ void BGRAConvolve2D(const uint8* source_data, } // namespace gfx -#endif // BASE_GFX_CONVOLVER_H__ +#endif // SKIA_EXT_CONVOLVER_H_ diff --git a/base/gfx/convolver_unittest.cc b/skia/ext/convolver_unittest.cc index 0a30a6b..6f85552 100644 --- a/base/gfx/convolver_unittest.cc +++ b/skia/ext/convolver_unittest.cc @@ -6,7 +6,7 @@ #include <time.h> #include <vector> -#include "base/gfx/convolver.h" +#include "skia/ext/convolver.h" #include "testing/gtest/include/gtest/gtest.h" namespace gfx { diff --git a/base/gfx/image_operations.cc b/skia/ext/image_operations.cc index a60d19e..5e6c3ab 100644 --- a/base/gfx/image_operations.cc +++ b/skia/ext/image_operations.cc @@ -7,14 +7,14 @@ #include <limits> #include <vector> -#include "base/gfx/image_operations.h" +#include "skia/ext/image_operations.h" -#include "base/gfx/convolver.h" #include "base/gfx/rect.h" #include "base/gfx/size.h" #include "base/logging.h" #include "base/stack_container.h" #include "SkBitmap.h" +#include "skia/ext/convolver.h" namespace gfx { diff --git a/base/gfx/image_operations.h b/skia/ext/image_operations.h index 826e651..73c6b53 100644 --- a/base/gfx/image_operations.h +++ b/skia/ext/image_operations.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_GFX_IMAGE_OPERATIONS_H__ -#define BASE_GFX_IMAGE_OPERATIONS_H__ +#ifndef SKIA_EXT_IMAGE_OPERATIONS_H_ +#define SKIA_EXT_IMAGE_OPERATIONS_H_ #include "base/basictypes.h" #include "base/gfx/rect.h" @@ -59,5 +59,5 @@ class ImageOperations { } // namespace gfx -#endif // BASE_GFX_IMAGE_OPERATIONS_H__ +#endif // SKIA_EXT_IMAGE_OPERATIONS_H__ diff --git a/base/gfx/image_operations_unittest.cc b/skia/ext/image_operations_unittest.cc index a15e648..e6ecda9 100644 --- a/base/gfx/image_operations_unittest.cc +++ b/skia/ext/image_operations_unittest.cc @@ -4,7 +4,7 @@ #include <stdlib.h> -#include "base/gfx/image_operations.h" +#include "skia/ext/image_operations.h" #include "testing/gtest/include/gtest/gtest.h" #include "SkBitmap.h" diff --git a/skia/skia.vcproj b/skia/skia.vcproj index 5e06d73..93988ad 100644 --- a/skia/skia.vcproj +++ b/skia/skia.vcproj @@ -1309,6 +1309,14 @@ Name="ext" > <File + RelativePath=".\ext\convolver.cc" + > + </File> + <File + RelativePath=".\ext\convolver.h" + > + </File> + <File RelativePath=".\ext\bitmap_platform_device.h" > </File> @@ -1321,6 +1329,14 @@ > </File> <File + RelativePath=".\ext\image_operations.cc" + > + </File> + <File + RelativePath=".\ext\image_operations.h" + > + </File> + <File RelativePath=".\ext\platform_canvas.h" > </File> diff --git a/skia/skia.xcodeproj/project.pbxproj b/skia/skia.xcodeproj/project.pbxproj index 7ecdb3b..67404c5 100644 --- a/skia/skia.xcodeproj/project.pbxproj +++ b/skia/skia.xcodeproj/project.pbxproj @@ -13,6 +13,8 @@ A70A3BAE0ED7385F00C31871 /* bitmap_platform_device_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BA80ED7385F00C31871 /* bitmap_platform_device_mac.cc */; }; A70A3BAF0ED7385F00C31871 /* platform_canvas_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BAA0ED7385F00C31871 /* platform_canvas_mac.cc */; }; A70A3BB00ED7385F00C31871 /* platform_device_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */; }; + A74368B90EE61BBF003562CC /* convolver.cc in Sources */ = {isa = PBXBuildFile; fileRef = A74368B70EE61BBF003562CC /* convolver.cc */; }; + A74368BA0EE61BBF003562CC /* image_operations.cc in Sources */ = {isa = PBXBuildFile; fileRef = A74368B80EE61BBF003562CC /* image_operations.cc */; }; E48EE4D20E34E873009DE966 /* Sk1DPathEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C46860DAE9C4F00FC0DB7 /* Sk1DPathEffect.cpp */; }; E48EE4D30E34E873009DE966 /* Sk2DPathEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C46870DAE9C4F00FC0DB7 /* Sk2DPathEffect.cpp */; }; E48EE4D40E34E873009DE966 /* Sk64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C465C0DAE9C4A00FC0DB7 /* Sk64.cpp */; }; @@ -153,6 +155,8 @@ A70A3BAB0ED7385F00C31871 /* platform_canvas_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform_canvas_mac.h; path = ext/platform_canvas_mac.h; sourceTree = "<group>"; }; A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = platform_device_mac.cc; path = ext/platform_device_mac.cc; sourceTree = "<group>"; }; A70A3BAD0ED7385F00C31871 /* platform_device_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform_device_mac.h; path = ext/platform_device_mac.h; sourceTree = "<group>"; }; + A74368B70EE61BBF003562CC /* convolver.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = convolver.cc; path = ext/convolver.cc; sourceTree = "<group>"; }; + A74368B80EE61BBF003562CC /* image_operations.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = image_operations.cc; path = ext/image_operations.cc; sourceTree = "<group>"; }; AB4C45B00DAE9C3700FC0DB7 /* SkTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkTime.cpp; sourceTree = "<group>"; }; AB4C465C0DAE9C4A00FC0DB7 /* Sk64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sk64.cpp; sourceTree = "<group>"; }; AB4C465D0DAE9C4A00FC0DB7 /* SkBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkBuffer.cpp; sourceTree = "<group>"; }; @@ -488,8 +492,10 @@ A70A3BA70ED7385100C31871 /* ext */ = { isa = PBXGroup; children = ( + A74368B70EE61BBF003562CC /* convolver.cc */, A70A3BA80ED7385F00C31871 /* bitmap_platform_device_mac.cc */, A70A3BA90ED7385F00C31871 /* bitmap_platform_device_mac.h */, + A74368B80EE61BBF003562CC /* image_operations.cc */, A70A3BAA0ED7385F00C31871 /* platform_canvas_mac.cc */, A70A3BAB0ED7385F00C31871 /* platform_canvas_mac.h */, A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */, @@ -1039,6 +1045,8 @@ E48EE5380E34E873009DE966 /* SkUtils.cpp in Sources */, E48EE5390E34E873009DE966 /* SkWriter32.cpp in Sources */, E48EE53A0E34E873009DE966 /* SkXfermode.cpp in Sources */, + A74368B90EE61BBF003562CC /* convolver.cc in Sources */, + A74368BA0EE61BBF003562CC /* image_operations.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj index df93fe1..8d51ffd 100644 --- a/webkit/build/port/port.vcproj +++ b/webkit/build/port/port.vcproj @@ -1164,6 +1164,14 @@ > </File> <File + RelativePath="..\..\port\platform\graphics\TransparencyHelperWin.cpp" + > + </File> + <File + RelativePath="..\..\port\platform\graphics\TransparencyHelperWin.h" + > + </File> + <File RelativePath="..\..\port\platform\graphics\ThemeHelperWin.cpp" > </File> diff --git a/webkit/port/platform/graphics/ImageSkia.cpp b/webkit/port/platform/graphics/ImageSkia.cpp index cfdc739..4936502 100644 --- a/webkit/port/platform/graphics/ImageSkia.cpp +++ b/webkit/port/platform/graphics/ImageSkia.cpp @@ -43,7 +43,7 @@ #include "SkiaUtils.h" #include "SkShader.h" -#include "base/gfx/image_operations.h" // TODO(brettw) remove this dependency. +#include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" namespace WebCore { diff --git a/webkit/port/platform/graphics/NativeImageSkia.cpp b/webkit/port/platform/graphics/NativeImageSkia.cpp index fb765eb..72bbcc4 100644 --- a/webkit/port/platform/graphics/NativeImageSkia.cpp +++ b/webkit/port/platform/graphics/NativeImageSkia.cpp @@ -29,7 +29,7 @@ #include "config.h" -#include "base/gfx/image_operations.h" +#include "skia/ext/image_operations.h" #include "NativeImageSkia.h" #include "SkiaUtils.h" diff --git a/webkit/port/platform/graphics/PlatformContextSkia.cpp b/webkit/port/platform/graphics/PlatformContextSkia.cpp index 06b3c0a..8933795 100644 --- a/webkit/port/platform/graphics/PlatformContextSkia.cpp +++ b/webkit/port/platform/graphics/PlatformContextSkia.cpp @@ -34,8 +34,8 @@ #include "SkiaUtils.h" #include "wtf/MathExtras.h" -#include "base/gfx/image_operations.h" // TODO(brettw) remove this depencency. #include "base/gfx/skia_utils.h" // TODO(brettw) remove this depencency. +#include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" #include "SkBitmap.h" |