Attachment 346572 Details for Bug 188326 – Patch

[patch] Patch

bug-188326-20180803182222.patch (text/plain), 6.92 KB, created by Alex Christensen on 2018-08-03 18:22:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-03 18:22:23 PDT

Size: 6.92 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 234569)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-08-03  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove forceCompositingMode
>+        https://bugs.webkit.org/show_bug.cgi?id=188326
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        It's always false.
>+
>+        * page/Settings.yaml:
>+        * rendering/RenderLayerCompositor.cpp:
>+        (WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
>+        (WebCore::RenderLayerCompositor::updateCompositingLayers):
>+        (WebCore::RenderLayerCompositor::computeCompositingRequirements):
>+        (WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlagsAfterLayout): Deleted.
>+        * rendering/RenderLayerCompositor.h:
>+
> 2018-08-03  Ben Richards  <benton_richards@apple.com>
> 
>         We should cache the compiled sandbox profile in a data vault
>Index: Source/WebCore/page/Settings.yaml
>===================================================================
>--- Source/WebCore/page/Settings.yaml	(revision 234514)
>+++ Source/WebCore/page/Settings.yaml	(working copy)
>@@ -256,8 +256,6 @@ hyperlinkAuditingEnabled:
>   initial: false
> crossOriginCheckInGetMatchedCSSRulesDisabled:
>   initial: false
>-forceCompositingMode:
>-  initial: false
> shouldInjectUserScriptsInInitialEmptyDocument:
>   initial: false
> fixedElementsLayoutRelativeToFrame:
>Index: Source/WebCore/rendering/RenderLayerCompositor.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderLayerCompositor.cpp	(revision 234514)
>+++ Source/WebCore/rendering/RenderLayerCompositor.cpp	(working copy)
>@@ -319,19 +319,13 @@ void RenderLayerCompositor::cacheAcceler
>     bool acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled();
>     bool displayListDrawingEnabled = settings.displayListDrawingEnabled();
> 
>-    // forceCompositingMode for subframes can only be computed after layout.
>-    bool forceCompositingMode = m_forceCompositingMode;
>-    if (isMainFrameCompositor())
>-        forceCompositingMode = m_renderView.settings().forceCompositingMode() && hasAcceleratedCompositing; 
>-    
>-    if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showDebugBorders != m_showDebugBorders || showRepaintCounter != m_showRepaintCounter || forceCompositingMode != m_forceCompositingMode) {
>+    if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showDebugBorders != m_showDebugBorders || showRepaintCounter != m_showRepaintCounter) {
>         setCompositingLayersNeedRebuild();
>         m_layerNeedsCompositingUpdate = true;
>     }
> 
>     bool debugBordersChanged = m_showDebugBorders != showDebugBorders;
>     m_hasAcceleratedCompositing = hasAcceleratedCompositing;
>-    m_forceCompositingMode = forceCompositingMode;
>     m_showDebugBorders = showDebugBorders;
>     m_showRepaintCounter = showRepaintCounter;
>     m_acceleratedDrawingEnabled = acceleratedDrawingEnabled;
>@@ -352,20 +346,6 @@ void RenderLayerCompositor::cacheAcceler
>         setCompositingLayersNeedRebuild();
> }
> 
>-void RenderLayerCompositor::cacheAcceleratedCompositingFlagsAfterLayout()
>-{
>-    cacheAcceleratedCompositingFlags();
>-
>-    if (isMainFrameCompositor())
>-        return;
>-
>-    bool forceCompositingMode = m_hasAcceleratedCompositing && m_renderView.settings().forceCompositingMode() && requiresCompositingForScrollableFrame();
>-    if (forceCompositingMode != m_forceCompositingMode) {
>-        m_forceCompositingMode = forceCompositingMode;
>-        setCompositingLayersNeedRebuild();
>-    }
>-}
>-
> bool RenderLayerCompositor::updateCompositingPolicy()
> {
>     auto currentPolicy = m_compositingPolicy;
>@@ -662,7 +642,7 @@ bool RenderLayerCompositor::updateCompos
>     LOG_WITH_STREAM(Compositing, stream << "RenderLayerCompositor " << this << " updateCompositingLayers " << updateType << " root " << updateRoot);
> 
>     if (updateType == CompositingUpdateType::AfterStyleChange || updateType == CompositingUpdateType::AfterLayout)
>-        cacheAcceleratedCompositingFlagsAfterLayout(); // Some flags (e.g. forceCompositingMode) depend on layout.
>+        cacheAcceleratedCompositingFlags();
> 
>     m_updateCompositingLayersTimer.stop();
> 
>@@ -676,7 +656,7 @@ bool RenderLayerCompositor::updateCompos
>     if (m_renderView.needsLayout())
>         return false;
> 
>-    if (!m_compositing && (m_forceCompositingMode || (isMainFrameCompositor() && page().pageOverlayController().overlayCount())))
>+    if (!m_compositing && isMainFrameCompositor() && page().pageOverlayController().overlayCount())
>         enableCompositingMode(true);
> 
>     if (!m_reevaluateCompositingAfterLayout && !m_compositing)
>@@ -1483,7 +1463,7 @@ void RenderLayerCompositor::computeCompo
>     // If we're back at the root, and no other layers need to be composited, and the root layer itself doesn't need
>     // to be composited, then we can drop out of compositing mode altogether. However, don't drop out of compositing mode
>     // if there are composited layers that we didn't hit in our traversal (e.g. because of visibility:hidden).
>-    if (layer.isRenderViewLayer() && !childState.subtreeIsCompositing && !requiresCompositingLayer(layer) && !m_forceCompositingMode && !hasAnyAdditionalCompositedLayers(layer)) {
>+    if (layer.isRenderViewLayer() && !childState.subtreeIsCompositing && !requiresCompositingLayer(layer) && !hasAnyAdditionalCompositedLayers(layer)) {
>         // Don't drop out of compositing on iOS, because we may flash. See <rdar://problem/8348337>.
> #if !PLATFORM(IOS)
>         enableCompositingMode(false);
>Index: Source/WebCore/rendering/RenderLayerCompositor.h
>===================================================================
>--- Source/WebCore/rendering/RenderLayerCompositor.h	(revision 234514)
>+++ Source/WebCore/rendering/RenderLayerCompositor.h	(working copy)
>@@ -103,8 +103,6 @@ public:
>     // the native view/window system.
>     void enableCompositingMode(bool enable = true);
> 
>-    bool inForcedCompositingMode() const { return m_forceCompositingMode; }
>-
>     // Returns true if the accelerated compositing is enabled
>     bool hasAcceleratedCompositing() const { return m_hasAcceleratedCompositing; }
> 
>@@ -347,7 +345,6 @@ private:
> 
>     // Copy the accelerated compositing related flags from Settings
>     void cacheAcceleratedCompositingFlags();
>-    void cacheAcceleratedCompositingFlagsAfterLayout();
> 
>     // Whether the given RL needs a compositing layer.
>     bool needsToBeComposited(const RenderLayer&, RenderLayer::ViewportConstrainedNotCompositedReason* = nullptr) const;
>@@ -510,7 +507,6 @@ private:
>     bool m_rootLayerConfigurationNeedsUpdate { false };
>     bool m_flushingLayers { false };
>     bool m_shouldFlushOnReattach { false };
>-    bool m_forceCompositingMode { false };
>     bool m_inPostLayoutUpdate { false }; // true when it's OK to trust layout information (e.g. layer sizes and positions)
>     bool m_subframeScrollLayersNeedReattach { false };
>

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 188326: 346572 | 346600