Changeset 165235 in webkit

Timestamp:

Mar 6, 2014 6:01:39 PM (10 years ago)

Author:

Simon Fraser

Message:

Send the fixed position rect to the WebProcess along with the other rects
​https://bugs.webkit.org/show_bug.cgi?id=129856

Reviewed by Benjamin Poulain.

Remove the functions that pass the custom fixed position rect through
the DrawingArea, and replace them by adding this rect to the
VisibleContentRectUpdateInfo, along with the "is stable" flag. We
then set the custom fixed position rect in the web process for
stable updates.

• Shared/VisibleContentRectUpdateInfo.cpp:

(WebKit::VisibleContentRectUpdateInfo::encode):
(WebKit::VisibleContentRectUpdateInfo::decode):

• Shared/VisibleContentRectUpdateInfo.h:

(WebKit::VisibleContentRectUpdateInfo::VisibleContentRectUpdateInfo):
(WebKit::VisibleContentRectUpdateInfo::customFixedPositionRect):
(WebKit::VisibleContentRectUpdateInfo::inStableState):
(WebKit::operator==):

• UIProcess/DrawingAreaProxy.cpp:
• UIProcess/ios/WKContentView.mm:

(-[WKContentView didUpdateVisibleRect:unobscuredRect:scale:inStableState:]):

• WebProcess/WebPage/DrawingArea.h:
• WebProcess/WebPage/DrawingArea.messages.in:
• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::updateVisibleContentRects):

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

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/VisibleContentRectUpdateInfo.cpp (modified) (2 diffs)
• Shared/VisibleContentRectUpdateInfo.h (modified) (3 diffs)
• UIProcess/DrawingAreaProxy.cpp (modified) (1 diff)
• UIProcess/ios/WKContentView.mm (modified) (1 diff)
• WebProcess/WebPage/DrawingArea.h (modified) (1 diff)
• WebProcess/WebPage/DrawingArea.messages.in (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)
• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (modified) (1 diff)
• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (modified) (1 diff)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Send the fixed position rect to the WebProcess along with the other rects
+        https://bugs.webkit.org/show_bug.cgi?id=129856
+
+        Reviewed by Benjamin Poulain.
+        
+        Remove the functions that pass the custom fixed position rect through
+        the DrawingArea, and replace them by adding this rect to the
+        VisibleContentRectUpdateInfo, along with the "is stable" flag. We
+        then set the custom fixed position rect in the web process for
+        stable updates.
+
+        * Shared/VisibleContentRectUpdateInfo.cpp:
+        (WebKit::VisibleContentRectUpdateInfo::encode):
+        (WebKit::VisibleContentRectUpdateInfo::decode):
+        * Shared/VisibleContentRectUpdateInfo.h:
+        (WebKit::VisibleContentRectUpdateInfo::VisibleContentRectUpdateInfo):
+        (WebKit::VisibleContentRectUpdateInfo::customFixedPositionRect):
+        (WebKit::VisibleContentRectUpdateInfo::inStableState):
+        (WebKit::operator==):
+        * UIProcess/DrawingAreaProxy.cpp:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView didUpdateVisibleRect:unobscuredRect:scale:inStableState:]):
+        * WebProcess/WebPage/DrawingArea.h:
+        * WebProcess/WebPage/DrawingArea.messages.in:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::updateVisibleContentRects):
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+
 2014-03-06  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp

@@ -35 +35 @@
     encoder << m_exposedRect;
     encoder << m_unobscuredRect;
+    encoder << m_customFixedPositionRect;
     encoder << m_scale;
+    encoder << m_inStableState;
 }
 
@@ -44 +46 @@
     if (!decoder.decode(result.m_unobscuredRect))
         return false;
+    if (!decoder.decode(result.m_customFixedPositionRect))
+        return false;
     if (!decoder.decode(result.m_scale))
+        return false;
+    if (!decoder.decode(result.m_inStableState))
         return false;
     return true;

trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h

@@ -43 +43 @@
     }
 
-    VisibleContentRectUpdateInfo(const WebCore::FloatRect& exposedRect, const WebCore::FloatRect& unobscuredRect, double scale)
+    VisibleContentRectUpdateInfo(const WebCore::FloatRect& exposedRect, const WebCore::FloatRect& unobscuredRect, const WebCore::FloatRect& customFixedPositionRect, double scale, bool inStableState)
         : m_exposedRect(exposedRect)
         , m_unobscuredRect(unobscuredRect)
+        , m_customFixedPositionRect(customFixedPositionRect)
         , m_scale(scale)
+        , m_inStableState(inStableState)
     {
     }
@@ -52 +54 @@
     const WebCore::FloatRect& exposedRect() const { return m_exposedRect; }
     const WebCore::FloatRect& unobscuredRect() const { return m_unobscuredRect; }
+    const WebCore::FloatRect& customFixedPositionRect() const { return m_customFixedPositionRect; }
     double scale() const { return m_scale; }
+    bool inStableState() const { return m_inStableState; }
 
     void encode(IPC::ArgumentEncoder&) const;
@@ -60 +64 @@
     WebCore::FloatRect m_exposedRect;
     WebCore::FloatRect m_unobscuredRect;
+    WebCore::FloatRect m_customFixedPositionRect;
     double m_scale;
+    bool m_inStableState;
 };
 
 inline bool operator==(const VisibleContentRectUpdateInfo& a, const VisibleContentRectUpdateInfo& b)
 {
-    return a.scale() == b.scale() && a.exposedRect() == b.exposedRect() && a.unobscuredRect() == b.unobscuredRect();
+    return a.scale() == b.scale()
+        && a.exposedRect() == b.exposedRect()
+        && a.unobscuredRect() == b.unobscuredRect()
+        && a.customFixedPositionRect() == b.customFixedPositionRect()
+        && a.inStableState() == b.inStableState();
 }
 

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp

@@ -88 +88 @@
 #endif // PLATFORM(MAC)
 
-#if PLATFORM(COCOA)
-void DrawingAreaProxy::setCustomFixedPositionRect(const FloatRect& fixedPositionRect)
-{
-    if (!m_webPageProxy->isValid())
-        return;
-
-    m_webPageProxy->process().send(Messages::DrawingArea::SetCustomFixedPositionRect(fixedPositionRect), m_webPageProxy->pageID());
-}
-#endif
-
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm

@@ -172 +172 @@
         scale = _page->displayedContentScale();
     }
-    
-    _page->updateVisibleContentRects(VisibleContentRectUpdateInfo(visibleRect, unobscuredRect, scale));
+
+    FloatRect fixedPosRect = [self fixedPositionRectFromExposedRect:unobscuredRect scale:scale];
+    _page->updateVisibleContentRects(VisibleContentRectUpdateInfo(visibleRect, unobscuredRect, fixedPosRect, scale, isStableState));
 
     RemoteScrollingCoordinatorProxy* scrollingCoordinator = _page->scrollingCoordinatorProxy();
     scrollingCoordinator->scrollPositionChangedViaDelegatedScrolling(scrollingCoordinator->rootScrollingNodeID(), unobscuredRect.origin);
 
-    if (auto drawingArea = _page->drawingArea()) {
-        if (isStableState) {
-            FloatRect fixedPosRect = [self fixedPositionRectFromExposedRect:unobscuredRect scale:scale];
-            drawingArea->setCustomFixedPositionRect(fixedPosRect);
-        }
+    if (auto drawingArea = _page->drawingArea())
         drawingArea->updateDebugIndicator();
-    }
 }
 

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

@@ -92 +92 @@
     virtual void setExposedRect(const WebCore::FloatRect&) = 0;
     virtual WebCore::FloatRect exposedRect() const = 0;
-    virtual void setCustomFixedPositionRect(const WebCore::FloatRect&) = 0;
 #endif
 #if PLATFORM(IOS)

trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in

@@ -31 +31 @@
     SetColorSpace(WebKit::ColorSpaceData colorSpace)
     SetExposedRect(WebCore::FloatRect exposedRect)
-    SetCustomFixedPositionRect(WebCore::FloatRect fixedPositionRect)
 
     AdjustTransientZoom(double scale, WebCore::FloatPoint origin)

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -1747 +1747 @@
 
     m_page->mainFrame().view()->setScrollOffset(scrollPosition);
+    
+    if (visibleContentRectUpdateInfo.inStableState())
+        m_page->mainFrame().view()->setCustomFixedPositionLayoutRect(enclosingIntRect(visibleContentRectUpdateInfo.customFixedPositionRect()));
+
     // FIXME: we should also update the frame view from unobscured rect. Altenatively, we can have it pull the values from ScrollView.
 }

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

@@ -80 +80 @@
 #endif
 
-    virtual void setCustomFixedPositionRect(const WebCore::FloatRect&) override;
-
     // WebCore::GraphicsLayerClient
     virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time) override { }

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

@@ -284 +284 @@
 }
 
-void RemoteLayerTreeDrawingArea::setCustomFixedPositionRect(const FloatRect& fixedPositionRect)
-{
-#if PLATFORM(IOS)
-    FrameView* frameView = m_webPage->corePage()->mainFrame().view();
-    if (!frameView)
-        return;
-
-    frameView->setCustomFixedPositionLayoutRect(enclosingIntRect(fixedPositionRect));
-#endif
-}
-
 TiledBacking* RemoteLayerTreeDrawingArea::mainFrameTiledBacking() const
 {

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

@@ -83 +83 @@
     virtual WebCore::FloatRect exposedRect() const override { return m_scrolledExposedRect; }
 
-    virtual void setCustomFixedPositionRect(const WebCore::FloatRect&) override { }
-
     virtual bool supportsAsyncScrolling() override { return true; }