Title: [156146] trunk/Source/WebCore
Revision
156146
Author
par...@webkit.org
Date
2013-09-20 02:52:13 -0700 (Fri, 20 Sep 2013)

Log Message

Buildfix for ENABLE(CSS_FILTERS) && !ENABLE(ACCELERATED_COMPOSITING) after r155131.

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::enclosingFilterRepaintLayer):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (156145 => 156146)


--- trunk/Source/WebCore/ChangeLog	2013-09-20 09:51:53 UTC (rev 156145)
+++ trunk/Source/WebCore/ChangeLog	2013-09-20 09:52:13 UTC (rev 156146)
@@ -1,5 +1,12 @@
 2013-09-20  Patrick Gansterer  <par...@webkit.org>
 
+        Buildfix for ENABLE(CSS_FILTERS) && !ENABLE(ACCELERATED_COMPOSITING) after r155131.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::enclosingFilterRepaintLayer):
+
+2013-09-20  Patrick Gansterer  <par...@webkit.org>
+
         [WIN] Fix build without precompiled header after r154146.
 
         * platform/win/WebCoreBundleWin.cpp:

Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (156145 => 156146)


--- trunk/Source/WebCore/rendering/RenderLayer.cpp	2013-09-20 09:51:53 UTC (rev 156145)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp	2013-09-20 09:52:13 UTC (rev 156146)
@@ -1484,7 +1484,12 @@
 RenderLayer* RenderLayer::enclosingFilterRepaintLayer() const
 {
     for (const RenderLayer* curr = this; curr; curr = curr->parent()) {
-        if ((curr != this && curr->requiresFullLayerImageForFilters()) || compositedWithOwnBackingStore(curr) || curr->isRootLayer())
+        if ((curr != this && curr->requiresFullLayerImageForFilters())
+#if USE(ACCELERATED_COMPOSITING)
+            || compositedWithOwnBackingStore(curr)
+#endif
+            || curr->isRootLayer()
+        )
             return const_cast<RenderLayer*>(curr);
     }
     return 0;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to