Changeset 170557 in webkit

Timestamp:

Jun 27, 2014, 2:58:06 PM (11 years ago)

Author:

Antti Koivisto

Message:

Flush throttling with remote layers
​https://bugs.webkit.org/show_bug.cgi?id=134398

Reviewed by Darin Adler.

Source/WebCore:
With remote layer trees the flush scheduling lives in the WebKit2 layer. The throttling code
needs to live there as well.

Add the required callbacks and disable the existing throttling code in RenderLayerCompositor
when remote layers are in use. Later we can get rid of the RenderLayerCompositor throttling code.

• WebCore.xcodeproj/project.pbxproj:
• loader/FrameLoader.cpp:

(WebCore::FrameLoader::loadProgressingStatusChanged):

• page/ChromeClient.h:

(WebCore::ChromeClient::adjustLayerFlushThrottling):

• page/FrameView.cpp:

(WebCore::FrameView::disableLayerFlushThrottlingTemporarilyForInteraction):
(WebCore::FrameView::loadProgressingStatusChanged):

Factor the progress status change activities to a function.

(WebCore::FrameView::updateLayerFlushThrottling):
(WebCore::FrameView::setExposedRect):

Move the call to adjustTiledBackingCoverage from WebKit to here.

(WebCore::FrameView::updateLayerFlushThrottlingInAllFrames): Deleted.

• page/FrameView.h:
• page/LayerFlushThrottleState.h: Added.
• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::RenderLayerCompositor):

Source/WebKit2:

• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::adjustLayerFlushThrottling):

• WebProcess/WebCoreSupport/WebChromeClient.h:
• WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
• WebProcess/WebPage/DrawingArea.h:

(WebKit::DrawingArea::adjustLayerFlushThrottling):

• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:

(WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea):
(WebKit::RemoteLayerTreeDrawingArea::updateScrolledExposedRect):
(WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush):

Delay layer flushes during page loading.
If use interacts with the page the next flush in unthrottled even if loading is in progress.

(WebKit::RemoteLayerTreeDrawingArea::adjustLayerFlushThrottling):

Compute the new delay. The first visual flush uses a shorter delay.
Flush immediately when we are no longer throttling.

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::updateScrolledExposedRect):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• WebCore/page/ChromeClient.h (modified) (2 diffs)
• WebCore/page/FrameView.cpp (modified) (2 diffs)
• WebCore/page/FrameView.h (modified) (2 diffs)
• WebCore/page/LayerFlushThrottleState.h (added)
• WebCore/rendering/RenderLayerCompositor.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm (modified) (1 diff)
• WebKit2/WebProcess/WebPage/DrawingArea.h (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (modified) (3 diffs)
• WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2014-06-27  Antti Koivisto  <antti@apple.com>
+
+        Flush throttling with remote layers
+        https://bugs.webkit.org/show_bug.cgi?id=134398
+
+        Reviewed by Darin Adler.
+
+        With remote layer trees the flush scheduling lives in the WebKit2 layer. The throttling code
+        needs to live there as well.
+        
+        Add the required callbacks and disable the existing throttling code in RenderLayerCompositor
+        when remote layers are in use. Later we can get rid of the RenderLayerCompositor throttling code.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadProgressingStatusChanged):
+        * page/ChromeClient.h:
+        (WebCore::ChromeClient::adjustLayerFlushThrottling):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::disableLayerFlushThrottlingTemporarilyForInteraction):
+        (WebCore::FrameView::loadProgressingStatusChanged):
+        
+            Factor the progress status change activities to a function.
+
+        (WebCore::FrameView::updateLayerFlushThrottling):
+        (WebCore::FrameView::setExposedRect):
+        
+            Move the call to adjustTiledBackingCoverage from WebKit to here.
+
+        (WebCore::FrameView::updateLayerFlushThrottlingInAllFrames): Deleted.
+        * page/FrameView.h:
+        * page/LayerFlushThrottleState.h: Added.
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::RenderLayerCompositor):
+
 2014-06-27  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj ¶

@@ -6151 +6151 @@
                 E48944A2180B57D800F165D8 /* SimpleLineLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E48944A0180B57D800F165D8 /* SimpleLineLayout.cpp */; };
                 E48944A3180B57D800F165D8 /* SimpleLineLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = E48944A1180B57D800F165D8 /* SimpleLineLayout.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                E4916FF7195DF6A0005AB349 /* LayerFlushThrottleState.h in Headers */ = {isa = PBXBuildFile; fileRef = E4916FF6195DF6A0005AB349 /* LayerFlushThrottleState.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E4946EAE156E64DD00D3297F /* StyleRuleImport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4946EAC156E64DD00D3297F /* StyleRuleImport.cpp */; };
                 E4946EAF156E64DD00D3297F /* StyleRuleImport.h in Headers */ = {isa = PBXBuildFile; fileRef = E4946EAD156E64DD00D3297F /* StyleRuleImport.h */; };
@@ -13648 +13649 @@
                 E48944A0180B57D800F165D8 /* SimpleLineLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleLineLayout.cpp; sourceTree = "<group>"; };
                 E48944A1180B57D800F165D8 /* SimpleLineLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleLineLayout.h; sourceTree = "<group>"; };
+                E4916FF6195DF6A0005AB349 /* LayerFlushThrottleState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerFlushThrottleState.h; sourceTree = "<group>"; };
                 E4946EAC156E64DD00D3297F /* StyleRuleImport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleRuleImport.cpp; sourceTree = "<group>"; };
                 E4946EAD156E64DD00D3297F /* StyleRuleImport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleRuleImport.h; sourceTree = "<group>"; };
@@ -16573 +16575 @@
                                 BC94D1510C275C8B006BC617 /* History.h */,
                                 BC94D1520C275C8B006BC617 /* History.idl */,
+                                E4916FF6195DF6A0005AB349 /* LayerFlushThrottleState.h */,
                                 931D72F515FE695300C4C07E /* LayoutMilestones.h */,
                                 BCE1C41A0D982980003B02F2 /* Location.cpp */,
@@ -24363 +24366 @@
                                 B562DB6017D3CD630010AF96 /* HTMLElementTypeHelpers.h in Headers */,
                                 A871D45C0A127CBC00B12A68 /* HTMLEmbedElement.h in Headers */,
+                                E4916FF7195DF6A0005AB349 /* LayerFlushThrottleState.h in Headers */,
                                 977B386A122883E900B81FF8 /* HTMLEntityParser.h in Headers */,
                                 977B386C122883E900B81FF8 /* HTMLEntitySearch.h in Headers */,

trunk/Source/WebCore/loader/FrameLoader.cpp ¶

@@ -3409 +3409 @@
 void FrameLoader::loadProgressingStatusChanged()
 {
-    FrameView* view = m_frame.mainFrame().view();
-    if (!view)
-        return;
-
-    view->updateLayerFlushThrottlingInAllFrames();
-    view->adjustTiledBackingCoverage();
+    if (auto* view = m_frame.mainFrame().view())
+        view->loadProgressingStatusChanged();
 }
 

trunk/Source/WebCore/page/ChromeClient.h ¶

@@ -30 +30 @@
 #include "GraphicsContext.h"
 #include "HostWindow.h"
+#include "LayerFlushThrottleState.h"
 #include "PopupMenu.h"
 #include "PopupMenuClient.h"
@@ -328 +329 @@
     virtual bool layerTreeStateIsFrozen() const { return false; }
 
+    virtual bool adjustLayerFlushThrottling(LayerFlushThrottleState::Flags) { return false; }
+
     virtual PassRefPtr<ScrollingCoordinator> createScrollingCoordinator(Page*) const { return nullptr; }
 

trunk/Source/WebCore/page/FrameView.cpp ¶

@@ -2254 +2254 @@
 void FrameView::disableLayerFlushThrottlingTemporarilyForInteraction()
 {
+    bool mainLoadProgressing = frame().page()->progress().isMainLoadProgressing();
+
+    LayerFlushThrottleState::Flags flags = LayerFlushThrottleState::UserIsInteracting | (mainLoadProgressing ? LayerFlushThrottleState::MainLoadProgressing : 0);
+    if (frame().page()->chrome().client().adjustLayerFlushThrottling(flags))
+        return;
+
     if (RenderView* view = renderView())
         view->compositor().disableLayerFlushThrottlingTemporarilyForInteraction();
 }
 
-void FrameView::updateLayerFlushThrottlingInAllFrames()
-{
+void FrameView::loadProgressingStatusChanged()
+{
+    updateLayerFlushThrottling();
+    adjustTiledBackingCoverage();
+}
+
+void FrameView::updateLayerFlushThrottling()
+{
+    ASSERT(frame().isMainFrame());
+
     bool isMainLoadProgressing = frame().page()->progress().isMainLoadProgressing();
+
+    // See if the client is handling throttling.
+    LayerFlushThrottleState::Flags flags = isMainLoadProgressing ? LayerFlushThrottleState::MainLoadProgressing : 0;
+    if (frame().page()->chrome().client().adjustLayerFlushThrottling(flags))
+        return;
+
     for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
         if (RenderView* renderView = frame->contentRenderer())
@@ -4421 +4441 @@
     if (!m_frame->isMainFrame())
         return;
-    if (TiledBacking* tiledBacking = this->tiledBacking())
+    if (TiledBacking* tiledBacking = this->tiledBacking()) {
+        adjustTiledBackingCoverage();
         tiledBacking->setTiledScrollingIndicatorPosition(exposedRect.location());
+    }
 
     if (auto* view = renderView())

trunk/Source/WebCore/page/FrameView.h ¶

@@ -291 +291 @@
 
     void disableLayerFlushThrottlingTemporarilyForInteraction();
-    void updateLayerFlushThrottlingInAllFrames();
-    void adjustTiledBackingCoverage();
     bool speculativeTilingEnabled() const { return m_speculativeTilingEnabled; }
+    void loadProgressingStatusChanged();
 
 #if ENABLE(DASHBOARD_SUPPORT)
@@ -545 +544 @@
     void autoSizeIfEnabled();
 
+    void updateLayerFlushThrottling();
+    void adjustTiledBackingCoverage();
+
     virtual void repaintContentRectangle(const IntRect&) override;
     virtual void contentsResized() override;

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp ¶

@@ -46 +46 @@
 #include "NodeList.h"
 #include "Page.h"
-#include "ProgressTracker.h"
 #include "RenderEmbeddedObject.h"
 #include "RenderFlowThread.h"
@@ -285 +284 @@
     , m_rootLayerAttachment(RootLayerUnattached)
     , m_layerFlushTimer(this, &RenderLayerCompositor::layerFlushTimerFired)
-    , m_layerFlushThrottlingEnabled(page() && page()->progress().isMainLoadProgressing())
+    , m_layerFlushThrottlingEnabled(false)
     , m_layerFlushThrottlingTemporarilyDisabledForInteraction(false)
     , m_hasPendingLayerFlush(false)

trunk/Source/WebKit2/ChangeLog ¶

@@ +1 @@
+2014-06-27  Antti Koivisto  <antti@apple.com>
+
+        Flush throttling with remote layers
+        https://bugs.webkit.org/show_bug.cgi?id=134398
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::adjustLayerFlushThrottling):
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+        * WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
+        * WebProcess/WebPage/DrawingArea.h:
+        (WebKit::DrawingArea::adjustLayerFlushThrottling):
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea):
+        (WebKit::RemoteLayerTreeDrawingArea::updateScrolledExposedRect):
+        (WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush):
+
+            Delay layer flushes during page loading.
+            If use interacts with the page the next flush in unthrottled even if loading is in progress.
+
+        (WebKit::RemoteLayerTreeDrawingArea::adjustLayerFlushThrottling):
+        
+            Compute the new delay. The first visual flush uses a shorter delay.
+            Flush immediately when we are no longer throttling.
+
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::updateScrolledExposedRect):
+
 2014-06-27  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp ¶

@@ -844 +844 @@
 }
 
+bool WebChromeClient::adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags flags)
+{
+    return m_page->drawingArea() && m_page->drawingArea()->adjustLayerFlushThrottling(flags);
+}
 
 bool WebChromeClient::layerTreeStateIsFrozen() const

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h ¶

@@ -211 +211 @@
     virtual void setNeedsOneShotDrawingSynchronization() override;
     virtual void scheduleCompositingLayerFlush() override;
+    virtual bool adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags) override;
     virtual WebCore::GraphicsLayer* documentOverlayLayerForFrame(WebCore::Frame&) override;
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm ¶

@@ -29 +29 @@
 #if PLATFORM(IOS)
 
-#import <WebCore/NotImplemented.h>
+#import "DrawingArea.h"
 #import "WebCoreArgumentCoders.h"
 #import "WebFrame.h"
 #import "WebPage.h"
 #import "WebPageProxyMessages.h"
+#import <WebCore/NotImplemented.h>
 
 namespace WebKit {

trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h ¶

@@ -31 +31 @@
 #include <WebCore/FloatRect.h>
 #include <WebCore/IntRect.h>
+#include <WebCore/LayerFlushThrottleState.h>
 #include <WebCore/PlatformScreen.h>
 #include <WebCore/ViewState.h>
@@ -120 +121 @@
     virtual bool markLayersVolatileImmediatelyIfPossible() { return true; }
 
+    virtual bool adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags) { return false; }
+
 protected:
     DrawingArea(DrawingAreaType, WebPage&);

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h ¶

@@ -100 +100 @@
     virtual void viewStateDidChange(WebCore::ViewState::Flags changed, bool wantsDidUpdateViewState) override;
 
+    virtual bool adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags) override;
+
     // GraphicsLayerClient
     virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time) override { }
@@ -144 +146 @@
     bool m_isFlushingSuspended;
     bool m_hasDeferredFlush;
+    bool m_isThrottlingLayerFlushes;
+    bool m_isLayerFlushThrottlingTemporarilyDisabledForInteraction;
+    bool m_isInitialThrottledLayerFlush;
 
     bool m_waitingForBackingStoreSwap;

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm ¶

@@ -60 +60 @@
     , m_isFlushingSuspended(false)
     , m_hasDeferredFlush(false)
+    , m_isThrottlingLayerFlushes(false)
+    , m_isLayerFlushThrottlingTemporarilyDisabledForInteraction(false)
+    , m_isInitialThrottledLayerFlush(false)
     , m_waitingForBackingStoreSwap(false)
     , m_hadFlushDeferredWhileWaitingForBackingStoreSwap(false)
@@ -227 +230 @@
 
     frameView->setExposedRect(m_scrolledExposedRect);
-    frameView->adjustTiledBackingCoverage();
 
     m_webPage.pageOverlayController().didChangeExposedRect();
@@ -240 +242 @@
 void RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush()
 {
+    if (m_isFlushingSuspended) {
+        m_isLayerFlushThrottlingTemporarilyDisabledForInteraction = false;
+        m_hasDeferredFlush = true;
+        return;
+    }
+    if (m_isLayerFlushThrottlingTemporarilyDisabledForInteraction) {
+        m_isLayerFlushThrottlingTemporarilyDisabledForInteraction = false;
+        m_layerFlushTimer.startOneShot(0_ms);
+        return;
+    }
+
     if (m_layerFlushTimer.isActive())
         return;
 
-    m_layerFlushTimer.startOneShot(0);
+    const auto initialFlushDelay = 500_ms;
+    const auto flushDelay = 1500_ms;
+    auto throttleDelay = m_isThrottlingLayerFlushes ? (m_isInitialThrottledLayerFlush ? initialFlushDelay : flushDelay) : 0_ms;
+    m_isInitialThrottledLayerFlush = false;
+
+    m_layerFlushTimer.startOneShot(throttleDelay);
+}
+
+bool RemoteLayerTreeDrawingArea::adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags flags)
+{
+    if (flags & WebCore::LayerFlushThrottleState::UserIsInteracting)
+        m_isLayerFlushThrottlingTemporarilyDisabledForInteraction = true;
+
+    bool wasThrottlingLayerFlushes = m_isThrottlingLayerFlushes;
+    m_isThrottlingLayerFlushes = flags & WebCore::LayerFlushThrottleState::MainLoadProgressing;
+
+    if (!wasThrottlingLayerFlushes && m_isThrottlingLayerFlushes)
+        m_isInitialThrottledLayerFlush = true;
+
+    // Re-schedule the flush if we stopped throttling.
+    if (wasThrottlingLayerFlushes && !m_isThrottlingLayerFlushes && m_layerFlushTimer.isActive()) {
+        m_layerFlushTimer.stop();
+        scheduleCompositingLayerFlush();
+    }
+    return true;
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm ¶

@@ -359 +359 @@
 
     frameView->setExposedRect(m_scrolledExposedRect);
-    frameView->adjustTiledBackingCoverage();
 
     m_webPage.pageOverlayController().didChangeExposedRect();