Changeset 167303 in webkit

Timestamp:

Apr 15, 2014 12:32:10 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r167298.
​https://bugs.webkit.org/show_bug.cgi?id=131670

Broke CSS filters (17 test crashes) (Requested by ap on
#webkit).

Reverted changeset:

"[iOS WK2] Pages often blank on first load if page loaded by
typing the URL"
​https://bugs.webkit.org/show_bug.cgi?id=131665
​http://trac.webkit.org/changeset/167298

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/page/ChromeClient.h (modified) (1 diff)
• WebCore/rendering/RenderLayerCompositor.cpp (modified) (7 diffs)
• WebCore/rendering/RenderLayerCompositor.h (modified) (3 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-15  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167298.
+        https://bugs.webkit.org/show_bug.cgi?id=131670
+
+        Broke CSS filters (17 test crashes) (Requested by ap on
+        #webkit).
+
+        Reverted changeset:
+
+        "[iOS WK2] Pages often blank on first load if page loaded by
+        typing the URL"
+        https://bugs.webkit.org/show_bug.cgi?id=131665
+        http://trac.webkit.org/changeset/167298
+
 2014-04-14  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -872 +872 @@
 __ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS_13PlatformEvent4TypeEb
 __ZN7WebCore21RemoteCommandListener6createERNS_27RemoteCommandListenerClientE
+__ZN7WebCore21RenderLayerCompositor27setDocumentOverlayRootLayerEPNS_13GraphicsLayerE
 __ZN7WebCore21ResourceLoadScheduler20servePendingRequestsENS_20ResourceLoadPriorityE
 __ZN7WebCore21ResourceLoadScheduler20servePendingRequestsEPNS0_15HostInformationENS_20ResourceLoadPriorityE

trunk/Source/WebCore/page/ChromeClient.h

@@ -291 +291 @@
     // regardless of the settings.
     virtual bool allowsAcceleratedCompositing() const { return true; }
-    // Supply a layer that will added as an overlay over other document layers (scrolling with the document).
-    virtual GraphicsLayer* documentOverlayLayerForFrame(Frame&) { return nullptr; }
 
     enum CompositingTrigger {

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -256 +256 @@
     , m_layersWithTiledBackingCount(0)
     , m_rootLayerAttachment(RootLayerUnattached)
+    , m_documentOverlayRootLayer(nullptr)
     , m_layerFlushTimer(this, &RenderLayerCompositor::layerFlushTimerFired)
     , m_layerFlushThrottlingEnabled(page() && page()->progress().isMainLoadProgressing())
@@ -430 +431 @@
         double horizontalMargin = defaultTileWidth / pageScaleFactor();
         double verticalMargin = defaultTileHeight / pageScaleFactor();
-        FloatRect visibleRect = frameView.computeCoverageRect(horizontalMargin, verticalMargin);
-        rootLayer->flushCompositingState(visibleRect);
+        rootLayer->flushCompositingState(frameView.computeCoverageRect(horizontalMargin, verticalMargin));
 #else
         // Having a m_clipLayer indicates that we're doing scrolling via GraphicsLayers.
@@ -598 +598 @@
 {
     m_updateCompositingLayersTimer.stop();
-
-    ASSERT(!m_renderView.document().inPageCache());
     
     // Compositing layers will be updated in Document::implicitClose() if suppressed here.
@@ -692 +690 @@
         // Host the document layer in the RenderView's root layer.
         if (isFullUpdate) {
-            appendOverlayLayers(childList);
             // Even when childList is empty, 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).
@@ -723 +720 @@
     // Inform the inspector that the layer tree has changed.
     InspectorInstrumentation::layerTreeDidChange(page());
-}
-
-void RenderLayerCompositor::appendOverlayLayers(Vector<GraphicsLayer*>& childList)
-{
-    Frame& frame = m_renderView.frameView().frame();
-    Page* page = frame.page();
-    if (!page)
-        return;
-
-    if (GraphicsLayer* overlayLayer = page->chrome().client().documentOverlayLayerForFrame(frame))
-        childList.append(overlayLayer);
 }
 
@@ -1476 +1462 @@
         childLayersOfEnclosingLayer.append(layerBacking->childForSuperlayers());
     }
+
+    if (m_documentOverlayRootLayer)
+        childLayersOfEnclosingLayer.append(m_documentOverlayRootLayer);
 }
 
@@ -3831 +3820 @@
 }
 
+void RenderLayerCompositor::setDocumentOverlayRootLayer(GraphicsLayer* documentOverlayRootLayer)
+{
+    if (m_documentOverlayRootLayer)
+        m_documentOverlayRootLayer->removeFromParent();
+    m_documentOverlayRootLayer = documentOverlayRootLayer;
+    setCompositingLayersNeedRebuild(true);
+    scheduleCompositingLayerUpdate();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -305 +305 @@
     Color rootExtendedBackgroundColor() const { return m_rootExtendedBackgroundColor; }
 
+    void setDocumentOverlayRootLayer(GraphicsLayer*);
+
 private:
     class OverlapMap;
@@ -365 +367 @@
     bool isRunningAcceleratedTransformAnimation(RenderLayerModelObject&) const;
 
-    void appendOverlayLayers(Vector<GraphicsLayer*>&);
     bool hasAnyAdditionalCompositedLayers(const RenderLayer& rootLayer) const;
 
@@ -508 +509 @@
 #endif
 
+    GraphicsLayer* m_documentOverlayRootLayer;
+
     std::unique_ptr<GraphicsLayerUpdater> m_layerUpdater; // Updates tiled layer visible area periodically while animations are running.
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-15  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167298.
+        https://bugs.webkit.org/show_bug.cgi?id=131670
+
+        Broke CSS filters (17 test crashes) (Requested by ap on
+        #webkit).
+
+        Reverted changeset:
+
+        "[iOS WK2] Pages often blank on first load if page loaded by
+        typing the URL"
+        https://bugs.webkit.org/show_bug.cgi?id=131665
+        http://trac.webkit.org/changeset/167298
+
 2014-04-14  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -772 +772 @@
 }
 
-GraphicsLayer* WebChromeClient::documentOverlayLayerForFrame(Frame& frame)
-{
-    if (&frame == &m_page->corePage()->mainFrame())
-        return m_page->pageOverlayController().documentOverlayRootLayer();
-
-    return nullptr;
-}
-
 void WebChromeClient::setNeedsOneShotDrawingSynchronization()
 {

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

@@ -203 +203 @@
     virtual void setNeedsOneShotDrawingSynchronization() override;
     virtual void scheduleCompositingLayerFlush() override;
-    virtual WebCore::GraphicsLayer* documentOverlayLayerForFrame(WebCore::Frame&) override;
 
     virtual CompositingTriggerFlags allowedCompositingTriggers() const

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

@@ -95 +95 @@
     }
     m_rootLayer->setChildren(children);
+
+    m_webPage->mainFrameView()->renderView()->compositor().setDocumentOverlayRootLayer(m_webPage->pageOverlayController().documentOverlayRootLayer());
 }
 

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

@@ -450 +450 @@
     [m_hostingLayer setSublayers:layer ? @[ layer, m_webPage->pageOverlayController().viewOverlayRootLayer()->platformLayer() ] : @[ ]];
 
+    m_webPage->mainFrameView()->renderView()->compositor().setDocumentOverlayRootLayer(m_webPage->pageOverlayController().documentOverlayRootLayer());
+
     bool hadRootLayer = !!m_rootLayer;
     m_rootLayer = layer;