diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 23:26:29 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 23:26:29 +0000 |
| commit | b96fc5dc177d311db220dc4039e74a9c0d871558 (patch) | |
| tree | 9bbc6ea3af7c0da75d4b6025d4b475dd62eec0b2 /webkit/SConscript.port | |
| parent | db8635032b1f83436a072be14e425076a7bd8164 (diff) | |
| download | chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.zip chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.tar.gz chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.tar.bz2 | |
Convert from using env['PLATFORM'] directly to using the more flexible
and better-thought-out Hammer env.Bits() idioms:
* env['PLATFORM'] == 'win32' => env.Bit('windows')
* env['PLATFORM'] == 'posix' => env.Bit('linux')
* env['PLATFORM'] == 'darwin' => env.Bit('mac')
New idioms:
* env.Bit('posix') => really does mean "any POSIX platform"
* env.AnyBits('mac', 'linux') => specifically mac or linux, excluding
other POSIX platforms
Where we were using compound conditionals (e.g., "env['PLATFORM'] in
('posix', 'darwin')") I tried to take my best shot at translating
the intent (i.e., "env.Bits('posix')" for something POSIX, "not
env.Bits('mac')" for something not yet ported to Mac, etc.)
Review URL: http://codereview.chromium.org/15051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript.port')
| -rw-r--r-- | webkit/SConscript.port | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/webkit/SConscript.port b/webkit/SConscript.port index 37c24f2..73a7d92 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -6,7 +6,7 @@ Import('env') env = env.Clone() -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CCFLAGS = [ '/TP', @@ -17,7 +17,7 @@ if env['PLATFORM'] == 'win32': '/wd4521', '/wd4800', ],) -elif env['PLATFORM'] == 'posix': +elif env.Bit('linux'): env.Append( # For the image readers and decoders: CXXFLAGS = ["-Wno-sign-compare"], @@ -110,7 +110,7 @@ input_files = [ '$PORT_DIR/plugins/chromium/PluginDataChromium.cpp', ] -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # Windows specific implementations. input_files.extend([ '$PORT_DIR/platform/chromium/FileSystemChromiumWin.cpp', @@ -131,7 +131,7 @@ if env['PLATFORM'] == 'win32': '$PORT_DIR/rendering/RenderThemeWin.cpp', ]) -if env['PLATFORM'] == 'posix': +if env.Bit('linux'): # Linux specific implementations. input_files.extend([ '$PORT_DIR/platform/chromium/FileSystemChromiumLinux.cpp', @@ -157,7 +157,7 @@ if env['PLATFORM'] == 'posix': ] input_files = list(set(input_files) - set(to_be_ported_files)) -if env['PLATFORM'] == 'darwin': +if env.Bit('mac'): # Mac specific implementations. input_files.extend([ '$PORT_DIR/bridge/mac/FrameMac.mm', @@ -167,6 +167,8 @@ if env['PLATFORM'] == 'darwin': '$PORT_DIR/platform/PluginStubsMac.cpp', '$PORT_DIR/platform/mac/DragDataMac.mm', '$PORT_DIR/platform/graphics/mac/FontCacheMacPending.cpp', + '$PORT_DIR/platform/graphics/skia/public/PlatformCanvasMac.cpp', + '$PORT_DIR/platform/graphics/skia/public/PlatformDeviceMac.cpp', '$PORT_DIR/rendering/RenderThemeMac.mm', ]) |