Title: [130331] trunk/Source/WebCore
- Revision
- 130331
- Author
- commit-qu...@webkit.org
- Date
- 2012-10-03 15:29:04 -0700 (Wed, 03 Oct 2012)
Log Message
Build failure with css filters enabled and accelerated compositing disabled
https://bugs.webkit.org/show_bug.cgi?id=95908
Patch by Arnaud Renevier <a.renev...@sisa.samsung.com> on 2012-10-03
Reviewed by Tony Chang.
Do not try to setBackingNeedsRepaint when building without accelerated
compositing.
Also, allow painting with filter (paintsWithFilters returns true if
renderer has filter) when accelerated compositing is not enabled.
No functional change, so no new tests.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::styleChanged):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (130330 => 130331)
--- trunk/Source/WebCore/ChangeLog 2012-10-03 22:16:26 UTC (rev 130330)
+++ trunk/Source/WebCore/ChangeLog 2012-10-03 22:29:04 UTC (rev 130331)
@@ -1,3 +1,21 @@
+2012-10-03 Arnaud Renevier <a.renev...@sisa.samsung.com>
+
+ Build failure with css filters enabled and accelerated compositing disabled
+ https://bugs.webkit.org/show_bug.cgi?id=95908
+
+ Reviewed by Tony Chang.
+
+ Do not try to setBackingNeedsRepaint when building without accelerated
+ compositing.
+
+ Also, allow painting with filter (paintsWithFilters returns true if
+ renderer has filter) when accelerated compositing is not enabled.
+
+ No functional change, so no new tests.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::styleChanged):
+
2012-10-03 Emil A Eklund <e...@chromium.org>
Round image sizes when zooming
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (130330 => 130331)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-10-03 22:16:26 UTC (rev 130330)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-10-03 22:29:04 UTC (rev 130331)
@@ -4885,10 +4885,6 @@
updateScrollCornerStyle();
updateResizerStyle();
-#if ENABLE(CSS_FILTERS)
- bool backingDidCompositeLayers = isComposited() && backing()->canCompositeFilters();
-#endif
-
updateDescendantDependentFlags();
updateTransform();
#if ENABLE(CSS_COMPOSITING)
@@ -4910,12 +4906,15 @@
#if ENABLE(CSS_FILTERS)
updateOrRemoveFilterEffect();
+#if USE(ACCELERATED_COMPOSITING)
+ bool backingDidCompositeLayers = isComposited() && backing()->canCompositeFilters();
if (isComposited() && backingDidCompositeLayers && !backing()->canCompositeFilters()) {
// The filters used to be drawn by platform code, but now the platform cannot draw them anymore.
// Fallback to drawing them in software.
setBackingNeedsRepaint();
}
#endif
+#endif
}
void RenderLayer::updateScrollableAreaSet(bool hasOverflow)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
