Title: [140001] trunk/Source
Revision
140001
Author
timothy_hor...@apple.com
Date
2013-01-17 10:58:51 -0800 (Thu, 17 Jan 2013)

Log Message

Fix the Mac build sans ENABLE(CSS_FILTERS)

Reviewed by Darin Adler.

Include FloatRect in RemoteGraphicsLayer.mm; it's included by chance currently,
via something that must be compiled out without CSS_FILTERS (or SVG, or shaders, or something).

* WebProcess/WebPage/mac/RemoteGraphicsLayer.mm:

Move an export from a USE(ACCELERATED_COMPOSITING) block to a ENABLE(CSS_FILTERS)
block, to match the code that backs it.

* WebCore.exp.in:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (140000 => 140001)


--- trunk/Source/WebCore/ChangeLog	2013-01-17 18:56:28 UTC (rev 140000)
+++ trunk/Source/WebCore/ChangeLog	2013-01-17 18:58:51 UTC (rev 140001)
@@ -1,3 +1,14 @@
+2013-01-17  Tim Horton  <timothy_hor...@apple.com>
+
+        Fix the Mac build sans ENABLE(CSS_FILTERS)
+
+        Reviewed by Darin Adler.
+
+        Move an export from a USE(ACCELERATED_COMPOSITING) block to a ENABLE(CSS_FILTERS)
+        block, to match the code that backs it.
+
+        * WebCore.exp.in:
+
 2013-01-17  Shinya Kawanaka  <shin...@chromium.org>
 
         [Mac] svg/custom/text-use-click-crash.xhtml added by r139029 hits assertion in enclosingTextFormControl

Modified: trunk/Source/WebCore/WebCore.exp.in (140000 => 140001)


--- trunk/Source/WebCore/WebCore.exp.in	2013-01-17 18:56:28 UTC (rev 140000)
+++ trunk/Source/WebCore/WebCore.exp.in	2013-01-17 18:58:51 UTC (rev 140001)
@@ -2188,7 +2188,6 @@
 __ZN7WebCore13GraphicsLayer8addChildEPS0_
 __ZN7WebCore13GraphicsLayerC2EPNS_19GraphicsLayerClientE
 __ZN7WebCore13GraphicsLayerD2Ev
-__ZN7WebCore16FilterOperationsaSERKS0_
 __ZNK7WebCore13GraphicsLayer18accumulatedOpacityEv
 __ZNK7WebCore13GraphicsLayer18getDebugBorderInfoERNS_5ColorERf
 __ZNK7WebCore13GraphicsLayer26backingStoreMemoryEstimateEv
@@ -2196,6 +2195,10 @@
 __ZNK7WebCore18RenderLayerBacking20compositingLayerTypeEv
 #endif
 
+#if ENABLE(CSS_FILTERS)
+__ZN7WebCore16FilterOperationsaSERKS0_
+#endif
+
 #if USE(APPKIT)
 __ZN7WebCore6Editor13lowercaseWordEv
 __ZN7WebCore6Editor13uppercaseWordEv

Modified: trunk/Source/WebKit2/ChangeLog (140000 => 140001)


--- trunk/Source/WebKit2/ChangeLog	2013-01-17 18:56:28 UTC (rev 140000)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-17 18:58:51 UTC (rev 140001)
@@ -1,3 +1,14 @@
+2013-01-17  Tim Horton  <timothy_hor...@apple.com>
+
+        Fix the Mac build sans ENABLE(CSS_FILTERS)
+
+        Reviewed by Darin Adler.
+
+        Include FloatRect in RemoteGraphicsLayer.mm; it's included by chance currently,
+        via something that must be compiled out without CSS_FILTERS (or SVG, or shaders, or something).
+
+        * WebProcess/WebPage/mac/RemoteGraphicsLayer.mm:
+
 2013-01-16  Alexey Proskuryakov  <a...@apple.com>
 
         Don't use NSApplication run loop in NetworkProcess

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.mm (140000 => 140001)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.mm	2013-01-17 18:56:28 UTC (rev 140000)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.mm	2013-01-17 18:58:51 UTC (rev 140001)
@@ -29,6 +29,7 @@
 #include "RemoteLayerTreeContext.h"
 #include "RemoteLayerTreeTransaction.h"
 
+#include <WebCore/FloatRect.h>
 #include <wtf/text/CString.h>
 
 using namespace WebCore;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to