diff options
| author | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-30 19:22:52 +0000 |
|---|---|---|
| committer | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-30 19:22:52 +0000 |
| commit | 1aba390ce0ae355c82a3eb0e468926ad29e27484 (patch) | |
| tree | 2d1f8c0ef5de64b02aff41db335206ce227433d6 /chrome/common | |
| parent | a8f79a369a42fea9c211192b5271a77349763d8c (diff) | |
| download | chromium_src-1aba390ce0ae355c82a3eb0e468926ad29e27484.zip chromium_src-1aba390ce0ae355c82a3eb0e468926ad29e27484.tar.gz chromium_src-1aba390ce0ae355c82a3eb0e468926ad29e27484.tar.bz2 | |
Adding ifdef to remove Skia dependency in IPC code for testing.
Review URL: http://codereview.chromium.org/99219
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/common.vsprops | 2 | ||||
| -rw-r--r-- | chrome/common/extra_defines.vsprops | 7 | ||||
| -rw-r--r-- | chrome/common/ipc_message_utils.cc | 6 |
3 files changed, 13 insertions, 2 deletions
diff --git a/chrome/common/common.vsprops b/chrome/common/common.vsprops index faa2e6c..05a4809 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\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;$(SolutionDir)\common\extra_defines.vsprops" > </VisualStudioPropertySheet> diff --git a/chrome/common/extra_defines.vsprops b/chrome/common/extra_defines.vsprops new file mode 100644 index 0000000..963972f --- /dev/null +++ b/chrome/common/extra_defines.vsprops @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="extra"
+ >
+</VisualStudioPropertySheet>
diff --git a/chrome/common/ipc_message_utils.cc b/chrome/common/ipc_message_utils.cc index 8ce3f4f..c14c4a8 100644 --- a/chrome/common/ipc_message_utils.cc +++ b/chrome/common/ipc_message_utils.cc @@ -6,11 +6,15 @@ #include "base/gfx/rect.h" #include "googleurl/src/gurl.h" +#ifndef EXCLUDE_SKIA_DEPENDENCIES #include "SkBitmap.h" +#endif #include "webkit/glue/dom_operations.h" namespace IPC { +#ifndef EXCLUDE_SKIA_DEPENDENCIES + namespace { struct SkBitmap_Data { @@ -90,6 +94,7 @@ void ParamTraits<SkBitmap>::Log(const SkBitmap& p, std::wstring* l) { l->append(StringPrintf(L"<SkBitmap>")); } +#endif // EXCLUDE_SKIA_DEPENDENCIES void ParamTraits<GURL>::Write(Message* m, const GURL& p) { m->WriteString(p.possibly_invalid_spec()); @@ -110,7 +115,6 @@ void ParamTraits<GURL>::Log(const GURL& p, std::wstring* l) { l->append(UTF8ToWide(p.spec())); } - void ParamTraits<gfx::Point>::Write(Message* m, const gfx::Point& p) { m->WriteInt(p.x()); m->WriteInt(p.y()); |