Title: [190627] trunk/Source/WebCore
- Revision
- 190627
- Author
- za...@apple.com
- Date
- 2015-10-06 11:06:34 -0700 (Tue, 06 Oct 2015)
Log Message
Remove redundant isComposited() function and replace
hasLayer() && layer()->isComposited() with RenderObject::isComposited().
https://bugs.webkit.org/show_bug.cgi?id=149846
Reviewed by Simon Fraser.
No change in functionality.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingForPlugin):
(WebCore::RenderLayerCompositor::requiresCompositingForFrame):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::repaintUsingContainer):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintSnapshottedPluginOverlay):
* rendering/RenderView.cpp:
(WebCore::rendererObscuresBackground):
(WebCore::isComposited): Deleted.
* rendering/RenderWidget.cpp:
(WebCore::RenderWidget::setWidgetGeometry):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (190626 => 190627)
--- trunk/Source/WebCore/ChangeLog 2015-10-06 17:36:44 UTC (rev 190626)
+++ trunk/Source/WebCore/ChangeLog 2015-10-06 18:06:34 UTC (rev 190627)
@@ -1,3 +1,26 @@
+2015-10-06 Zalan Bujtas <za...@apple.com>
+
+ Remove redundant isComposited() function and replace
+ hasLayer() && layer()->isComposited() with RenderObject::isComposited().
+ https://bugs.webkit.org/show_bug.cgi?id=149846
+
+ Reviewed by Simon Fraser.
+
+ No change in functionality.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForPlugin):
+ (WebCore::RenderLayerCompositor::requiresCompositingForFrame):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::repaintUsingContainer):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintSnapshottedPluginOverlay):
+ * rendering/RenderView.cpp:
+ (WebCore::rendererObscuresBackground):
+ (WebCore::isComposited): Deleted.
+ * rendering/RenderWidget.cpp:
+ (WebCore::RenderWidget::setWidgetGeometry):
+
2015-10-06 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r190619.
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (190626 => 190627)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-10-06 17:36:44 UTC (rev 190626)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-10-06 18:06:34 UTC (rev 190627)
@@ -2579,7 +2579,7 @@
RenderWidget& pluginRenderer = downcast<RenderWidget>(renderer);
// If we can't reliably know the size of the plugin yet, don't change compositing state.
if (pluginRenderer.needsLayout())
- return pluginRenderer.hasLayer() && pluginRenderer.layer()->isComposited();
+ return pluginRenderer.isComposited();
// Don't go into compositing mode if height or width are zero, or size is 1x1.
IntRect contentBox = snappedIntRect(pluginRenderer.contentBoxRect());
@@ -2599,7 +2599,7 @@
// If we can't reliably know the size of the iframe yet, don't change compositing state.
if (!frameRenderer.parent() || frameRenderer.needsLayout())
- return frameRenderer.hasLayer() && frameRenderer.layer()->isComposited();
+ return frameRenderer.isComposited();
// Don't go into compositing mode if height or width are zero.
return !snappedIntRect(frameRenderer.contentBoxRect()).isEmpty();
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (190626 => 190627)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-10-06 17:36:44 UTC (rev 190626)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-10-06 18:06:34 UTC (rev 190627)
@@ -900,7 +900,7 @@
RenderView& v = view();
if (repaintContainer->isRenderView()) {
ASSERT(repaintContainer == &v);
- bool viewHasCompositedLayer = v.hasLayer() && v.layer()->isComposited();
+ bool viewHasCompositedLayer = v.isComposited();
if (!viewHasCompositedLayer || v.layer()->backing()->paintsIntoWindow()) {
v.repaintViewRectangle(viewHasCompositedLayer && v.layer()->transform() ? LayoutRect(v.layer()->transform()->mapRect(snapRectToDevicePixels(r, document().deviceScaleFactor()))) : r);
return;
@@ -908,7 +908,7 @@
}
if (v.usesCompositing()) {
- ASSERT(repaintContainer->hasLayer() && repaintContainer->layer()->isComposited());
+ ASSERT(repaintContainer->isComposited());
repaintContainer->layer()->setBackingNeedsRepaintInRect(r, shouldClipToLayer ? GraphicsLayer::ClipToLayer : GraphicsLayer::DoNotClipToLayer);
}
}
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (190626 => 190627)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-10-06 17:36:44 UTC (rev 190626)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-10-06 18:06:34 UTC (rev 190627)
@@ -1891,7 +1891,7 @@
// We could draw the snapshot with that coordinates, but we need to make sure there
// isn't a composited layer between us and the plugInRenderer.
for (auto* renderBox = &downcast<RenderBox>(renderer); renderBox != &plugInRenderer; renderBox = renderBox->parentBox()) {
- if (renderBox->hasLayer() && renderBox->layer() && renderBox->layer()->isComposited()) {
+ if (renderBox->isComposited()) {
snapshotAbsPos = -renderBox->location();
break;
}
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (190626 => 190627)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2015-10-06 17:36:44 UTC (rev 190626)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2015-10-06 18:06:34 UTC (rev 190627)
@@ -522,11 +522,6 @@
paintObject(paintInfo, paintOffset);
}
-static inline bool isComposited(RenderElement* object)
-{
- return object->hasLayer() && downcast<RenderLayerModelObject>(*object).layer()->isComposited();
-}
-
static inline bool rendererObscuresBackground(RenderElement* rootObject)
{
if (!rootObject)
@@ -538,7 +533,7 @@
|| style.hasTransform())
return false;
- if (isComposited(rootObject))
+ if (rootObject->isComposited())
return false;
if (rootObject->rendererForRootBackground().style().backgroundClip() == TextFillBox)
Modified: trunk/Source/WebCore/rendering/RenderWidget.cpp (190626 => 190627)
--- trunk/Source/WebCore/rendering/RenderWidget.cpp 2015-10-06 17:36:44 UTC (rev 190626)
+++ trunk/Source/WebCore/rendering/RenderWidget.cpp 2015-10-06 18:06:34 UTC (rev 190627)
@@ -140,7 +140,7 @@
if (!weakThis)
return true;
- if (boundsChanged && hasLayer() && layer()->isComposited())
+ if (boundsChanged && isComposited())
layer()->backing()->updateAfterWidgetResize();
return oldFrameRect.size() != newFrameRect.size();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes