Title: [101073] trunk/Source/WebCore
Revision
101073
Author
[email protected]
Date
2011-11-23 05:45:31 -0800 (Wed, 23 Nov 2011)

Log Message

[Skia] fix duplicate symbol __ZN7WebCore11BitmapImage16initPlatformDataEv error
https://bugs.webkit.org/show_bug.cgi?id=72954

Patch by Elliot Poger <[email protected]> on 2011-11-23
Reviewed by Adam Barth.

* WebCore.gyp/WebCore.gyp:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (101072 => 101073)


--- trunk/Source/WebCore/ChangeLog	2011-11-23 13:38:49 UTC (rev 101072)
+++ trunk/Source/WebCore/ChangeLog	2011-11-23 13:45:31 UTC (rev 101073)
@@ -1,3 +1,12 @@
+2011-11-23  Elliot Poger  <[email protected]>
+
+        [Skia] fix duplicate symbol __ZN7WebCore11BitmapImage16initPlatformDataEv error
+        https://bugs.webkit.org/show_bug.cgi?id=72954
+
+        Reviewed by Adam Barth.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2011-11-18  Pavel Podivilov  <[email protected]>
 
         Web Inspector: add integration test for compiler source maps.

Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (101072 => 101073)


--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp	2011-11-23 13:38:49 UTC (rev 101072)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp	2011-11-23 13:45:31 UTC (rev 101073)
@@ -1598,6 +1598,7 @@
             ['include', 'platform/graphics/cg/IntPointCG\\.cpp$'],
             ['include', 'platform/graphics/cg/IntRectCG\\.cpp$'],
             ['include', 'platform/graphics/cg/IntSizeCG\\.cpp$'],
+            ['exclude', 'platform/graphics/chromium/ImageChromiumMac\\.mm$'],
             ['exclude', 'platform/graphics/mac/FontMac\\.mm$'],
             ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'],
             ['exclude', 'platform/chromium/DragImageChromiumMac\\.cpp$'],
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to