WebKit Bugzilla
Attachment 359992 Details for
Bug 193760
: Change some RenderLayerCompositor functions to use references
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-193760-20190123213031.patch (text/plain), 5.87 KB, created by
Simon Fraser (smfr)
on 2019-01-23 21:30:32 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Simon Fraser (smfr)
Created:
2019-01-23 21:30:32 PST
Size:
5.87 KB
patch
obsolete
>Subversion Revision: 240403 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 366e4bbfe4da0582be83234a9159bb81eba0a393..5d0963e08f95612d0f25284a812a18d12c434dbd 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,22 @@ >+2019-01-23 Simon Fraser <simon.fraser@apple.com> >+ >+ Change some RenderLayerCompositor functions to use references >+ https://bugs.webkit.org/show_bug.cgi?id=193760 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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 <benjamin@webkit.org> > > <rdar://problem/27686430> Revert workaround AVPlayer.setMuted bug on macOS >diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp >index 9cf8c686560cf6497eac25161cf03e5a1a2ccbf4..18ddc67ff78517276776b8194d605d35497da00a 100644 >--- a/Source/WebCore/rendering/RenderLayerBacking.cpp >+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp >@@ -634,7 +634,7 @@ void RenderLayerBacking::updateAfterWidgetResize() > 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 @@ bool RenderLayerBacking::updateConfiguration() > 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; > } >diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp >index 9a783dc16c451b3bd3d400349565072d0f81c8d5..12949e6be5fc2d993e526239ff28fcdbcae32308 100644 >--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp >+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp >@@ -1194,7 +1194,7 @@ void RenderLayerCompositor::updateBackingAndHierarchy(RenderLayer& layer, Vector > 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 @@ bool RenderLayerCompositor::updateBacking(RenderLayer& layer, RequiresCompositin > #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,22 +1928,22 @@ String RenderLayerCompositor::layerTreeAsText(LayerTreeFlags flags) > 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(); > } > 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; > >diff --git a/Source/WebCore/rendering/RenderLayerCompositor.h b/Source/WebCore/rendering/RenderLayerCompositor.h >index d73fe1b9a98c08e5d6313eca6afe77e73688714a..783fed7239a932f8bc0be337d82f9a291829e237 100644 >--- a/Source/WebCore/rendering/RenderLayerCompositor.h >+++ b/Source/WebCore/rendering/RenderLayerCompositor.h >@@ -269,9 +269,9 @@ public: > // 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);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193760
: 359992