diff options
21 files changed, 74 insertions, 39 deletions
diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj index e5ef83a..ece0285 100644 --- a/base/base.xcodeproj/project.pbxproj +++ b/base/base.xcodeproj/project.pbxproj @@ -37,6 +37,9 @@ /* Begin PBXBuildFile section */ 141593B80EA63EBE00E32418 /* thread_collision_warner_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 146C6A6E0EA63D970029E7B6 /* thread_collision_warner_unittest.cc */; }; 146C6A6B0EA63D4F0029E7B6 /* thread_collision_warner.cc in Sources */ = {isa = PBXBuildFile; fileRef = 146C6A620EA63CAE0029E7B6 /* thread_collision_warner.cc */; }; + 32AC71B80F2E5321002BDDC8 /* jpeg_codec_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 32AC71B50F2E52FC002BDDC8 /* jpeg_codec_unittest.cc */; }; + 32AC71BF0F2E5421002BDDC8 /* jpeg_codec.cc in Sources */ = {isa = PBXBuildFile; fileRef = 32AC71B60F2E530F002BDDC8 /* jpeg_codec.cc */; }; + 32AC72300F2E64F7002BDDC8 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 32AC718E0F2E4F62002BDDC8 /* libjpeg.a */; }; 4D11B59A0E91730200EF7617 /* rand_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B5940E9172F800EF7617 /* rand_util.cc */; }; 4D11B59B0E91730200EF7617 /* rand_util_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B5960E9172F800EF7617 /* rand_util_posix.cc */; }; 4D11B59C0E91730500EF7617 /* rand_util_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B5970E9172F800EF7617 /* rand_util_unittest.cc */; }; @@ -194,6 +197,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 32AC718D0F2E4F62002BDDC8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 32AC71890F2E4F62002BDDC8 /* libjpeg.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D2AAC046055464E500DB518D /* libjpeg.a */; + remoteInfo = libjpeg; + }; 7B165D2F0E55081000185273 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E45A2C680E47AEFF00DB1196 /* gtest.xcodeproj */; @@ -382,6 +392,10 @@ 146C6A610EA63C9F0029E7B6 /* thread_collision_warner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thread_collision_warner.h; sourceTree = "<group>"; }; 146C6A620EA63CAE0029E7B6 /* thread_collision_warner.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_collision_warner.cc; sourceTree = "<group>"; }; 146C6A6E0EA63D970029E7B6 /* thread_collision_warner_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_collision_warner_unittest.cc; sourceTree = "<group>"; }; + 32AC71890F2E4F62002BDDC8 /* libjpeg.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libjpeg.xcodeproj; path = third_party/libjpeg/libjpeg.xcodeproj; sourceTree = "<group>"; }; + 32AC71B50F2E52FC002BDDC8 /* jpeg_codec_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jpeg_codec_unittest.cc; sourceTree = "<group>"; }; + 32AC71B60F2E530F002BDDC8 /* jpeg_codec.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jpeg_codec.cc; sourceTree = "<group>"; }; + 32AC71B70F2E530F002BDDC8 /* jpeg_codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jpeg_codec.h; sourceTree = "<group>"; }; 38246046390EAED65BB7C380 /* waitable_event_watcher_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = waitable_event_watcher_posix.cc; sourceTree = "<group>"; }; 4D11B5940E9172F800EF7617 /* rand_util.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rand_util.cc; sourceTree = "<group>"; }; 4D11B5950E9172F800EF7617 /* rand_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rand_util.h; sourceTree = "<group>"; }; @@ -704,6 +718,7 @@ 7B836E180E55CE5B00F6AD31 /* libicudata.a in Frameworks */, 7B836ADE0E55097000F6AD31 /* libicui18n.a in Frameworks */, 7B836ADD0E55097000F6AD31 /* libicuuc.a in Frameworks */, + 32AC72300F2E64F7002BDDC8 /* libjpeg.a in Frameworks */, 7B85062A0E5B556900730B43 /* libpng.a in Frameworks */, 7B4DF5350E5B6A66004D7619 /* libskia.a in Frameworks */, 7B85062F0E5B559A00730B43 /* libzlib.a in Frameworks */, @@ -713,6 +728,14 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 32AC718A0F2E4F62002BDDC8 /* Products */ = { + isa = PBXGroup; + children = ( + 32AC718E0F2E4F62002BDDC8 /* libjpeg.a */, + ); + name = Products; + sourceTree = "<group>"; + }; 7B165D2C0E55081000185273 /* Products */ = { isa = PBXGroup; children = ( @@ -773,6 +796,7 @@ E45A2C680E47AEFF00DB1196 /* gtest.xcodeproj */, E4562AF30E27E428005E4685 /* icu.xcodeproj */, 7B26301F0E82F1E6001CE27F /* libevent.xcodeproj */, + 32AC71890F2E4F62002BDDC8 /* libjpeg.xcodeproj */, E4562A2A0E27CA2F005E4685 /* libpng.xcodeproj */, 829E30D60DBFD8ED00819EBF /* skia.xcodeproj */, E4562A3B0E27CAB6005E4685 /* zlib.xcodeproj */, @@ -1087,6 +1111,9 @@ 825403B40D92D2EC0006B936 /* gfx */ = { isa = PBXGroup; children = ( + 32AC71B60F2E530F002BDDC8 /* jpeg_codec.cc */, + 32AC71B70F2E530F002BDDC8 /* jpeg_codec.h */, + 32AC71B50F2E52FC002BDDC8 /* jpeg_codec_unittest.cc */, 825403C80D92D31D0006B936 /* native_theme.cc */, 825403C90D92D31D0006B936 /* native_theme.h */, 7B8505A20E5B3FBE00730B43 /* native_theme_unittest.cc */, @@ -1204,6 +1231,10 @@ ProjectRef = 7B26301F0E82F1E6001CE27F /* libevent.xcodeproj */; }, { + ProductGroup = 32AC718A0F2E4F62002BDDC8 /* Products */; + ProjectRef = 32AC71890F2E4F62002BDDC8 /* libjpeg.xcodeproj */; + }, + { ProductGroup = 7B165D5A0E55081400185273 /* Products */; ProjectRef = E4562A2A0E27CA2F005E4685 /* libpng.xcodeproj */; }, @@ -1228,6 +1259,13 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 32AC718E0F2E4F62002BDDC8 /* libjpeg.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libjpeg.a; + remoteRef = 32AC718D0F2E4F62002BDDC8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 7B165D300E55081000185273 /* libgtest.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1442,6 +1480,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 32AC71BF0F2E5421002BDDC8 /* jpeg_codec.cc in Sources */, 825403EE0D92D31D0006B936 /* png_decoder.cc in Sources */, 825403F00D92D31D0006B936 /* png_encoder.cc in Sources */, 825403F20D92D31D0006B936 /* point.cc in Sources */, @@ -1466,6 +1505,7 @@ 93611B1A0E5A878400F9405D /* histogram_unittest.cc in Sources */, 7BAE392B0E6F4EF200C3F750 /* hmac_unittest.cc in Sources */, B57E4D780E9C26340090055D /* idletimer_unittest.cc in Sources */, + 32AC71B80F2E5321002BDDC8 /* jpeg_codec_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 */, @@ -1637,6 +1677,7 @@ .., ../skia/include, ../skia/include/corecg, + ../third_party/libjpeg, ../third_party/libpng, ); PRODUCT_NAME = base_gfx; diff --git a/base/base_unittests.scons b/base/base_unittests.scons index a7ea02f..48eaef8 100644 --- a/base/base_unittests.scons +++ b/base/base_unittests.scons @@ -15,6 +15,7 @@ env.ApplySConscript([ '$BASE_DIR/gfx/using_base_gfx.scons', '$GTEST_DIR/../using_gtest.scons', '$ICU38_DIR/using_icu38.scons', + '$LIBJPEG_DIR/using_libjpeg.scons', '$LIBPNG_DIR/using_libpng.scons', '$SKIA_DIR/using_skia.scons', '$ZLIB_DIR/using_zlib.scons', @@ -120,6 +121,7 @@ input_files = ChromeFileList([ ]), MSVSFilter('gfx_tests', [ + 'gfx/jpeg_codec_unittest.cc', 'gfx/png_codec_unittest.cc', ]), ]) diff --git a/base/build/base_gfx.vcproj b/base/build/base_gfx.vcproj index 70875a9..b19945a 100644 --- a/base/build/base_gfx.vcproj +++ b/base/build/base_gfx.vcproj @@ -122,6 +122,14 @@ </References> <Files> <File + RelativePath="..\gfx\jpeg_codec.cc" + > + </File> + <File + RelativePath="..\gfx\jpeg_codec.h" + > + </File> + <File RelativePath="..\gfx\gdi_util.cc" > </File> diff --git a/base/build/base_gfx.vsprops b/base/build/base_gfx.vsprops index 9dc5341..2ddeb0a 100644 --- a/base/build/base_gfx.vsprops +++ b/base/build/base_gfx.vsprops @@ -3,6 +3,6 @@ ProjectType="Visual C++" Version="8.00" Name="base_gfx" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;..\..\skia\using_skia.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libjpeg\using_libjpeg.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;..\..\skia\using_skia.vsprops" > </VisualStudioPropertySheet> diff --git a/base/build/base_unittests.vcproj b/base/build/base_unittests.vcproj index a35fcc4..22df2c8 100644 --- a/base/build/base_unittests.vcproj +++ b/base/build/base_unittests.vcproj @@ -412,6 +412,10 @@ Name="gfx_tests" > <File + RelativePath="..\gfx\jpeg_codec_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 ceb663b..4c93190 100644 --- a/base/gfx/base_gfx.scons +++ b/base/gfx/base_gfx.scons @@ -12,6 +12,7 @@ env = env.Clone() env.ApplySConscript([ '$ICU38_DIR/using_icu38.scons', + '$LIBJPEG_DIR/using_libjpeg.scons', '$LIBPNG_DIR/using_libpng.scons', '$SKIA_DIR/using_skia.scons', '$ZLIB_DIR/using_zlib.scons', @@ -25,6 +26,8 @@ if env.Bit('windows'): ) input_files = ChromeFileList([ + 'jpeg_codec.cc', + 'jpeg_codec.h', 'gdi_util.cc', 'gdi_util.h', 'native_theme.cc', diff --git a/chrome/common/jpeg_codec.cc b/base/gfx/jpeg_codec.cc index 08d5d45..f78d5af 100644 --- a/chrome/common/jpeg_codec.cc +++ b/base/gfx/jpeg_codec.cc @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/gfx/jpeg_codec.h" + #include <setjmp.h> -#include "chrome/common/jpeg_codec.h" #include "base/logging.h" #include "base/scoped_ptr.h" -#include "SkBitmap.h" +#include "skia/include/SkBitmap.h" extern "C" { #include "jpeglib.h" diff --git a/chrome/common/jpeg_codec.h b/base/gfx/jpeg_codec.h index 0ced106..141c00e 100644 --- a/chrome/common/jpeg_codec.h +++ b/base/gfx/jpeg_codec.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 CHROME_COMMON_JPEG_CODEC_H__ -#define CHROME_COMMON_JPEG_CODEC_H__ +#ifndef BASE_GFX_JPEG_CODEC_H_ +#define BASE_GFX_JPEG_CODEC_H_ #include <vector> @@ -56,5 +56,5 @@ class JPEGCodec { static SkBitmap* Decode(const unsigned char* input, size_t input_size); }; -#endif // CHROME_COMMON_JPEG_CODEC_H__ +#endif // BASE_GFX_JPEG_CODEC_H_ diff --git a/chrome/common/jpeg_codec_unittest.cc b/base/gfx/jpeg_codec_unittest.cc index 35beed8..0a58630 100644 --- a/chrome/common/jpeg_codec_unittest.cc +++ b/base/gfx/jpeg_codec_unittest.cc @@ -4,7 +4,7 @@ #include <math.h> -#include "chrome/common/jpeg_codec.h" +#include "base/gfx/jpeg_codec.h" #include "testing/gtest/include/gtest/gtest.h" // out of 100, this indicates how compressed it will be, this should be changed diff --git a/chrome/browser/base_history_model.cc b/chrome/browser/base_history_model.cc index cce4923..f1aa980 100644 --- a/chrome/browser/base_history_model.cc +++ b/chrome/browser/base_history_model.cc @@ -4,10 +4,10 @@ #include "chrome/browser/base_history_model.h" +#include "base/gfx/jpeg_codec.h" #include "base/gfx/png_decoder.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/profile.h" -#include "chrome/common/jpeg_codec.h" #include "chrome/common/resource_bundle.h" #include "SkBitmap.h" diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index f3e6a8b..305a094 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -5,6 +5,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/file_util.h" +#include "base/gfx/jpeg_codec.h" #include "base/path_service.h" #include "base/scoped_ptr.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -13,7 +14,6 @@ #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/text_database_manager.h" #include "chrome/browser/history/thumbnail_database.h" -#include "chrome/common/jpeg_codec.h" #include "chrome/common/notification_service.h" #include "chrome/common/thumbnail_score.h" #include "chrome/tools/profiles/thumbnail-inl.h" diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index ea86d2e..c8aa28c 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -3,13 +3,13 @@ // found in the LICENSE file. #include "base/file_util.h" +#include "base/gfx/jpeg_codec.h" #include "base/path_service.h" #include "base/scoped_ptr.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/in_memory_history_backend.h" #include "chrome/browser/history/in_memory_database.h" -#include "chrome/common/jpeg_codec.h" #include "chrome/common/thumbnail_score.h" #include "chrome/tools/profiles/thumbnail-inl.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 2f10adb..3018f25 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -22,6 +22,7 @@ #include "base/basictypes.h" #include "base/file_util.h" +#include "base/gfx/jpeg_codec.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" @@ -35,7 +36,6 @@ #include "chrome/browser/history/in_memory_history_backend.h" #include "chrome/browser/history/page_usage_data.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/jpeg_codec.h" #include "chrome/common/notification_service.h" #include "chrome/common/sqlite_utils.h" #include "chrome/common/scoped_vector.h" diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc index d493b56..3f60561 100644 --- a/chrome/browser/history/thumbnail_database.cc +++ b/chrome/browser/history/thumbnail_database.cc @@ -5,11 +5,11 @@ #include "chrome/browser/history/thumbnail_database.h" #include "base/file_util.h" +#include "base/gfx/jpeg_codec.h" #include "base/time.h" #include "base/string_util.h" #include "chrome/browser/history/history_publisher.h" #include "chrome/browser/history/url_database.h" -#include "chrome/common/jpeg_codec.h" #include "chrome/common/sqlite_utils.h" #include "chrome/common/thumbnail_score.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc index c8ad456..cc51477 100644 --- a/chrome/browser/history/thumbnail_database_unittest.cc +++ b/chrome/browser/history/thumbnail_database_unittest.cc @@ -4,10 +4,10 @@ #include "base/basictypes.h" #include "base/file_util.h" +#include "base/gfx/jpeg_codec.h" #include "base/path_service.h" #include "chrome/browser/history/thumbnail_database.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/jpeg_codec.h" #include "chrome/common/thumbnail_score.h" #include "chrome/tools/profiles/thumbnail-inl.h" #include "googleurl/src/gurl.h" diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index 499b205..309ae19 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -148,7 +148,6 @@ 4D7BFC380E9D4CFF009A6919 /* ipc_message.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBB00E9D4C9F009A6919 /* ipc_message.cc */; }; 4D7BFC4B0E9D4D06009A6919 /* json_value_serializer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBC30E9D4C9F009A6919 /* json_value_serializer.cc */; }; 4D7BFC540E9D4D09009A6919 /* libxml_utils.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBCC0E9D4C9F009A6919 /* libxml_utils.cc */; }; - 4D7BFC580E9D4D0E009A6919 /* jpeg_codec.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBC00E9D4C9F009A6919 /* jpeg_codec.cc */; }; 4D7BFC5C0E9D4D24009A6919 /* notification_service.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBD90E9D4C9F009A6919 /* notification_service.cc */; }; 4D7BFC710E9D4D28009A6919 /* pref_member.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBE50E9D4C9F009A6919 /* pref_member.cc */; }; 4D7BFC7A0E9D4D2B009A6919 /* pref_names.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBE80E9D4C9F009A6919 /* pref_names.cc */; }; @@ -163,7 +162,6 @@ 4D7BFCCE0E9D4D7A009A6919 /* cookie_monster_sqlite.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFCBF0E9D4D6B009A6919 /* cookie_monster_sqlite.cc */; }; 4D7BFCDF0E9D4DC4009A6919 /* animation_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFB870E9D4C9F009A6919 /* animation_unittest.cc */; }; 4D7BFCE10E9D4DC8009A6919 /* bzip2_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFB880E9D4C9F009A6919 /* bzip2_unittest.cc */; }; - 4D7BFCE30E9D4DCE009A6919 /* jpeg_codec_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBC20E9D4C9F009A6919 /* jpeg_codec_unittest.cc */; }; 4D7BFCE70E9D4DD4009A6919 /* json_value_serializer_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBC60E9D4C9F009A6919 /* json_value_serializer_unittest.cc */; }; 4D7BFCF30E9D4E07009A6919 /* run_all_unittests.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFCEF0E9D4DFE009A6919 /* run_all_unittests.cc */; }; 4D7BFD960E9D5223009A6919 /* libbrowser.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7BF3060E9D477E009A6919 /* libbrowser.a */; }; @@ -1540,9 +1538,6 @@ 4D7BFBBD0E9D4C9F009A6919 /* ipc_sync_message_unittest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ipc_sync_message_unittest.h; sourceTree = "<group>"; }; 4D7BFBBE0E9D4C9F009A6919 /* ipc_tests.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ipc_tests.cc; sourceTree = "<group>"; }; 4D7BFBBF0E9D4C9F009A6919 /* ipc_tests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ipc_tests.h; sourceTree = "<group>"; }; - 4D7BFBC00E9D4C9F009A6919 /* jpeg_codec.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jpeg_codec.cc; sourceTree = "<group>"; }; - 4D7BFBC10E9D4C9F009A6919 /* jpeg_codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jpeg_codec.h; sourceTree = "<group>"; }; - 4D7BFBC20E9D4C9F009A6919 /* jpeg_codec_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jpeg_codec_unittest.cc; sourceTree = "<group>"; }; 4D7BFBC30E9D4C9F009A6919 /* json_value_serializer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = json_value_serializer.cc; sourceTree = "<group>"; }; 4D7BFBC40E9D4C9F009A6919 /* json_value_serializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_value_serializer.h; sourceTree = "<group>"; }; 4D7BFBC50E9D4C9F009A6919 /* json_value_serializer_perftest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = json_value_serializer_perftest.cc; sourceTree = "<group>"; }; @@ -2770,9 +2765,6 @@ 4D7BFBBD0E9D4C9F009A6919 /* ipc_sync_message_unittest.h */, 4D7BFBBE0E9D4C9F009A6919 /* ipc_tests.cc */, 4D7BFBBF0E9D4C9F009A6919 /* ipc_tests.h */, - 4D7BFBC00E9D4C9F009A6919 /* jpeg_codec.cc */, - 4D7BFBC10E9D4C9F009A6919 /* jpeg_codec.h */, - 4D7BFBC20E9D4C9F009A6919 /* jpeg_codec_unittest.cc */, 4D7BFBC30E9D4C9F009A6919 /* json_value_serializer.cc */, 4D7BFBC40E9D4C9F009A6919 /* json_value_serializer.h */, 4D7BFBC50E9D4C9F009A6919 /* json_value_serializer_perftest.cc */, @@ -4200,7 +4192,6 @@ B503E0FC0F01764800547DC6 /* user_script_slave_unittest.cc in Sources */, 4D7BFB3C0E9D4C25009A6919 /* history_types_unittest.cc in Sources */, B507AC440F004B610060FEE8 /* ipc_sync_message_unittest.cc in Sources */, - 4D7BFCE30E9D4DCE009A6919 /* jpeg_codec_unittest.cc in Sources */, 4D7BFCE70E9D4DD4009A6919 /* json_value_serializer_unittest.cc in Sources */, B52E29BE0F0AA333008AD1C8 /* l10n_util_unittest.cc in Sources */, E450775F0F154036003BE099 /* mru_cache_unittest.cc in Sources */, @@ -4241,7 +4232,6 @@ 4D7BFC380E9D4CFF009A6919 /* ipc_message.cc in Sources */, E4F3257D0EE83679002533CE /* ipc_message_utils.cc in Sources */, B507AC1F0F0048E10060FEE8 /* ipc_sync_message.cc in Sources */, - 4D7BFC580E9D4D0E009A6919 /* jpeg_codec.cc in Sources */, 4D7BFC4B0E9D4D06009A6919 /* json_value_serializer.cc in Sources */, B502DA520F098888005BE90C /* l10n_util.cc in Sources */, 4D7BFC540E9D4D09009A6919 /* libxml_utils.cc in Sources */, diff --git a/chrome/common/common.scons b/chrome/common/common.scons index aa65c66..3965ebb 100644 --- a/chrome/common/common.scons +++ b/chrome/common/common.scons @@ -129,8 +129,6 @@ input_files = ChromeFileList([ 'env_vars.h', 'filter_policy.h', 'gears_api.h', - 'jpeg_codec.cc', - 'jpeg_codec.h', 'json_value_serializer.cc', 'json_value_serializer.h', 'jstemplate_builder.cc', diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj index c41b135..48fe00b 100644 --- a/chrome/common/common.vcproj +++ b/chrome/common/common.vcproj @@ -438,14 +438,6 @@ > </File> <File - RelativePath=".\jpeg_codec.cc" - > - </File> - <File - RelativePath=".\jpeg_codec.h" - > - </File> - <File RelativePath=".\json_value_serializer.cc" > </File> diff --git a/chrome/common/common.vsprops b/chrome/common/common.vsprops index 3e611fc..faa2e6c 100644 --- a/chrome/common/common.vsprops +++ b/chrome/common/common.vsprops @@ -3,6 +3,6 @@ ProjectType="Visual C++" Version="8.00" Name="common (chrome)" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libjpeg\using_libjpeg.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops" > </VisualStudioPropertySheet> diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index 817c1c7..048cdf1 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -843,10 +843,6 @@ > </File> <File - RelativePath="..\..\common\jpeg_codec_unittest.cc" - > - </File> - <File RelativePath="..\..\common\json_value_serializer_unittest.cc" > </File> diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc index 42685a9..0971879 100644 --- a/chrome/tools/profiles/generate_profile.cc +++ b/chrome/tools/profiles/generate_profile.cc @@ -8,6 +8,7 @@ #include "chrome/tools/profiles/thumbnail-inl.h" #include "base/at_exit.h" +#include "base/gfx/jpeg_codec.h" #include "base/icu_util.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -15,7 +16,6 @@ #include "base/string_util.h" #include "base/time.h" #include "chrome/browser/history/history.h" -#include "chrome/common/jpeg_codec.h" #include "chrome/common/thumbnail_score.h" #include "SkBitmap.h" |