Merge r120507 to chromium 1132 branch.

WebCore/WebCore.gypi

 {
     'variables': {
         'project_dir': ['.'],
         # These headers are part of WebCore's private API in the Apple Mac build.
         'webcore_privateheader_files': [
             'Modules/geolocation/Geolocation.h',
             'Modules/geolocation/GeolocationController.h',
             'Modules/geolocation/GeolocationError.h',
             'Modules/geolocation/GeolocationPosition.h',
             'Modules/geolocation/Geoposition.h',
@@ skipping 3562 matching lines @@
             'platform/graphics/chromium/LayerTextureSubImage.cpp',
             'platform/graphics/chromium/LayerTextureSubImage.h',
             'platform/graphics/chromium/LayerTextureUpdater.h',
             'platform/graphics/chromium/ManagedTexture.cpp',
             'platform/graphics/chromium/ManagedTexture.h',
             'platform/graphics/chromium/MediaPlayerPrivateChromium.h',
             'platform/graphics/chromium/PlatformCanvas.cpp',
             'platform/graphics/chromium/PlatformCanvas.h',
             'platform/graphics/chromium/PlatformColor.h',
             'platform/graphics/chromium/PlatformIcon.h',
-            'platform/graphics/chromium/PlatformImage.cpp',
-            'platform/graphics/chromium/PlatformImage.h',
             'platform/graphics/chromium/ProgramBinding.cpp',
             'platform/graphics/chromium/ProgramBinding.h',
             'platform/graphics/chromium/RateLimiter.cpp',
             'platform/graphics/chromium/RateLimiter.h',
             'platform/graphics/chromium/RenderSurfaceChromium.cpp',
             'platform/graphics/chromium/RenderSurfaceChromium.h',
             'platform/graphics/chromium/ScrollbarLayerChromium.cpp',
             'platform/graphics/chromium/ScrollbarLayerChromium.h',
             'platform/graphics/chromium/ShaderChromium.cpp',
             'platform/graphics/chromium/ShaderChromium.h',
@@ skipping 4683 matching lines @@
             'platform/chromium/support/WebURLResponse.cpp',
             'platform/chromium/support/WebURLResponsePrivate.h',
             'platform/chromium/support/WrappedResourceRequest.h',
             'platform/chromium/support/WrappedResourceResponse.h',
         ],
         'export_file_generator_files': [
             '<(PRODUCT_DIR)/DerivedSources/WebCore/ExportFileGenerator.cpp',
         ],
     }
 }