Title: [240407] trunk/Source/WebCore
- Revision
- 240407
- Author
- [email protected]
- Date
- 2019-01-23 22:10:54 -0800 (Wed, 23 Jan 2019)
Log Message
Change some RenderLayerCompositor functions to use references
https://bugs.webkit.org/show_bug.cgi?id=193760
Reviewed by Zalan Bujtas.
RenderWidget* -> RenderWidget&
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateAfterWidgetResize):
(WebCore::RenderLayerBacking::updateConfiguration):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateBackingAndHierarchy):
(WebCore::RenderLayerCompositor::updateBacking):
(WebCore::RenderLayerCompositor::frameContentsCompositor):
(WebCore::RenderLayerCompositor::parentFrameContentLayers):
* rendering/RenderLayerCompositor.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (240406 => 240407)
--- trunk/Source/WebCore/ChangeLog 2019-01-24 05:29:36 UTC (rev 240406)
+++ trunk/Source/WebCore/ChangeLog 2019-01-24 06:10:54 UTC (rev 240407)
@@ -1,3 +1,22 @@
+2019-01-23 Simon Fraser <[email protected]>
+
+ Change some RenderLayerCompositor functions to use references
+ https://bugs.webkit.org/show_bug.cgi?id=193760
+
+ Reviewed by Zalan Bujtas.
+
+ RenderWidget* -> RenderWidget&
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateAfterWidgetResize):
+ (WebCore::RenderLayerBacking::updateConfiguration):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateBackingAndHierarchy):
+ (WebCore::RenderLayerCompositor::updateBacking):
+ (WebCore::RenderLayerCompositor::frameContentsCompositor):
+ (WebCore::RenderLayerCompositor::parentFrameContentLayers):
+ * rendering/RenderLayerCompositor.h:
+
2019-01-23 Benjamin Poulain <[email protected]>
<rdar://problem/27686430> Revert workaround AVPlayer.setMuted bug on macOS
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (240406 => 240407)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-01-24 05:29:36 UTC (rev 240406)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-01-24 06:10:54 UTC (rev 240407)
@@ -634,7 +634,7 @@
if (!is<RenderWidget>(renderer()))
return;
- if (auto* innerCompositor = RenderLayerCompositor::frameContentsCompositor(&downcast<RenderWidget>(renderer()))) {
+ if (auto* innerCompositor = RenderLayerCompositor::frameContentsCompositor(downcast<RenderWidget>(renderer()))) {
innerCompositor->frameViewDidChangeSize();
innerCompositor->frameViewDidChangeLocation(flooredIntPoint(contentsBox().location()));
}
@@ -783,7 +783,7 @@
layerConfigChanged = true;
}
#endif
- if (is<RenderWidget>(renderer()) && RenderLayerCompositor::parentFrameContentLayers(&downcast<RenderWidget>(renderer()))) {
+ if (is<RenderWidget>(renderer()) && RenderLayerCompositor::parentFrameContentLayers(downcast<RenderWidget>(renderer()))) {
m_owningLayer.setNeedsCompositingGeometryUpdate();
layerConfigChanged = true;
}
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (240406 => 240407)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-01-24 05:29:36 UTC (rev 240406)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-01-24 06:10:54 UTC (rev 240407)
@@ -1194,7 +1194,7 @@
if (requireDescendantTraversal || requiresChildRebuild) {
bool parented = false;
if (is<RenderWidget>(layer.renderer()))
- parented = parentFrameContentLayers(&downcast<RenderWidget>(layer.renderer()));
+ parented = parentFrameContentLayers(downcast<RenderWidget>(layer.renderer()));
if (!parented)
layerBacking->parentForSublayers()->setChildren(WTFMove(layerChildren));
@@ -1557,7 +1557,7 @@
#endif
if (layerChanged && is<RenderWidget>(layer.renderer())) {
- auto* innerCompositor = frameContentsCompositor(&downcast<RenderWidget>(layer.renderer()));
+ auto* innerCompositor = frameContentsCompositor(downcast<RenderWidget>(layer.renderer()));
if (innerCompositor && innerCompositor->usesCompositing())
innerCompositor->updateRootLayerAttachment();
}
@@ -1928,9 +1928,9 @@
return layerTreeText;
}
-RenderLayerCompositor* RenderLayerCompositor::frameContentsCompositor(RenderWidget* renderer)
+RenderLayerCompositor* RenderLayerCompositor::frameContentsCompositor(RenderWidget& renderer)
{
- if (auto* contentDocument = renderer->frameOwnerElement().contentDocument()) {
+ if (auto* contentDocument = renderer.frameOwnerElement().contentDocument()) {
if (auto* view = contentDocument->renderView())
return &view->compositor();
}
@@ -1937,13 +1937,13 @@
return nullptr;
}
-bool RenderLayerCompositor::parentFrameContentLayers(RenderWidget* renderer)
+bool RenderLayerCompositor::parentFrameContentLayers(RenderWidget& renderer)
{
auto* innerCompositor = frameContentsCompositor(renderer);
if (!innerCompositor || !innerCompositor->usesCompositing() || innerCompositor->rootLayerAttachment() != RootLayerAttachedViaEnclosingFrame)
return false;
- auto* layer = renderer->layer();
+ auto* layer = renderer.layer();
if (!layer->isComposited())
return false;
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (240406 => 240407)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2019-01-24 05:29:36 UTC (rev 240406)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2019-01-24 06:10:54 UTC (rev 240407)
@@ -269,9 +269,9 @@
// to know if there is non-affine content, e.g. for drawing into an image.
bool has3DContent() const;
- static RenderLayerCompositor* frameContentsCompositor(RenderWidget*);
+ static RenderLayerCompositor* frameContentsCompositor(RenderWidget&);
// Return true if the layers changed.
- static bool parentFrameContentLayers(RenderWidget*);
+ static bool parentFrameContentLayers(RenderWidget&);
// Update the geometry of the layers used for clipping and scrolling in frames.
void frameViewDidChangeLocation(const IntPoint& contentsOffset);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
