Changeset 147418 in webkit

Timestamp:

Apr 2, 2013 5:16:41 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Implement ScrollingCoordinator::frameViewLayoutUpdated()
​https://bugs.webkit.org/show_bug.cgi?id=113763

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2013-04-02
Reviewed by Rob Buis.

PR 318945
Internally reviewed by Jakob Petsovits.

And remove the BlackBerry specific methods
frameViewFrameRectDidChange and frameViewContentsSizeDidChange.

• page/scrolling/blackberry/ScrollingCoordinatorBlackBerry.cpp:

(WebCore::ScrollingCoordinatorBlackBerry::frameViewLayoutUpdated):
Called when the frame view has been laid out. Update the contents
rectangle and visible area of the scroll layer for the given frame
view.

• page/scrolling/blackberry/ScrollingCoordinatorBlackBerry.h:

(ScrollingCoordinatorBlackBerry):

• platform/graphics/blackberry/LayerWebKitThread.h:

(WebCore::LayerWebKitThread::setFrameVisibleRect): Return early if
value hasn't changed.
(WebCore::LayerWebKitThread::setFrameContentsSize): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/blackberry/ScrollingCoordinatorBlackBerry.cpp (modified) (1 diff)
• page/scrolling/blackberry/ScrollingCoordinatorBlackBerry.h (modified) (2 diffs)
• platform/graphics/blackberry/LayerWebKitThread.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-02  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [BlackBerry] Implement ScrollingCoordinator::frameViewLayoutUpdated()
+        https://bugs.webkit.org/show_bug.cgi?id=113763
+
+        Reviewed by Rob Buis.
+
+        PR 318945
+        Internally reviewed by Jakob Petsovits.
+
+        And remove the BlackBerry specific methods
+        frameViewFrameRectDidChange and frameViewContentsSizeDidChange.
+
+        * page/scrolling/blackberry/ScrollingCoordinatorBlackBerry.cpp:
+        (WebCore::ScrollingCoordinatorBlackBerry::frameViewLayoutUpdated):
+        Called when the frame view has been laid out. Update the contents
+        rectangle and visible area of the scroll layer for the given frame
+        view.
+        * page/scrolling/blackberry/ScrollingCoordinatorBlackBerry.h:
+        (ScrollingCoordinatorBlackBerry):
+        * platform/graphics/blackberry/LayerWebKitThread.h:
+        (WebCore::LayerWebKitThread::setFrameVisibleRect): Return early if
+        value hasn't changed.
+        (WebCore::LayerWebKitThread::setFrameContentsSize): Ditto.
+
 2013-04-02  Andrey Lushnikov  <lushnikov@chromium.org>
 

trunk/Source/WebCore/page/scrolling/blackberry/ScrollingCoordinatorBlackBerry.cpp

@@ -68 +68 @@
 }
 
-void ScrollingCoordinatorBlackBerry::frameViewFrameRectDidChange(FrameView* view)
+void ScrollingCoordinatorBlackBerry::frameViewLayoutUpdated(FrameView* frameView)
 {
-    if (GraphicsLayer* scrollLayer = scrollLayerForFrameView(view))
-        scrollLayer->platformLayer()->setFrameVisibleRect(view->visibleContentRect());
-}
-
-void ScrollingCoordinatorBlackBerry::frameViewContentsSizeDidChange(FrameView* view)
-{
-    if (GraphicsLayer* scrollLayer = scrollLayerForFrameView(view))
-        scrollLayer->platformLayer()->setFrameContentsSize(view->contentsSize());
+    if (GraphicsLayer* scrollLayer = scrollLayerForFrameView(frameView)) {
+        scrollLayer->platformLayer()->setFrameContentsSize(frameView->contentsSize());
+        scrollLayer->platformLayer()->setFrameVisibleRect(frameView->visibleContentRect());
+    }
 }
 

trunk/Source/WebCore/page/scrolling/blackberry/ScrollingCoordinatorBlackBerry.h

@@ -35 +35 @@
     explicit ScrollingCoordinatorBlackBerry(Page*);
 
+    // Should be called whenever the given frame view has been laid out.
+    virtual void frameViewLayoutUpdated(FrameView*);
+
     // Return whether this scrolling coordinator can keep fixed position layers fixed to their
     // containers while scrolling.
@@ -47 +50 @@
     // Whether the layer is fixed the top or bottom edge, left or right edge.
     void setLayerFixedToContainerLayerEdge(GraphicsLayer*, bool fixedToTop, bool fixedToLeft);
-
-    virtual void frameViewFrameRectDidChange(FrameView*);
-    virtual void frameViewContentsSizeDidChange(FrameView*);
 };
 

trunk/Source/WebCore/platform/graphics/blackberry/LayerWebKitThread.h

@@ -161 +161 @@
     }
 
-    void setFrameVisibleRect(const IntRect& rect) { m_frameVisibleRect = rect; setNeedsCommit(); }
-    void setFrameContentsSize(const IntSize& size) { m_frameContentsSize = size; setNeedsCommit(); }
+    void setFrameVisibleRect(const IntRect& rect)
+    {
+        if (m_frameVisibleRect == rect)
+            return;
+        m_frameVisibleRect = rect;
+        setNeedsCommit();
+    }
+
+    void setFrameContentsSize(const IntSize& size)
+    {
+        if (m_frameContentsSize == size)
+            return;
+        m_frameContentsSize = size;
+        setNeedsCommit();
+    }
 
     void setContents(Image*);