Changeset 107237 in webkit

Timestamp:

Feb 9, 2012 6:40:47 AM (12 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

[Qt] Fetch the visible rect from LayerTreeHost instead of keeping a copy in each layer.
​https://bugs.webkit.org/show_bug.cgi?id=78009

Reviewed by Noam Rosenthal.

Since WebGraphicsLayers are now accessed directly from LayerTreeHost, they don't
need to keep the visible rect to pass it down their child layers anymore.

• WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:

(WebCore::WebGraphicsLayer::setContentsScale):
(WebCore::WebGraphicsLayer::tiledBackingStoreVisibleRect):
(WebCore::WebGraphicsLayer::adjustVisibleRect):
(WebCore):

• WebProcess/WebCoreSupport/WebGraphicsLayer.h:

(WebGraphicsLayerClient):
(WebGraphicsLayer):

• WebProcess/WebPage/qt/LayerTreeHostQt.cpp:

(WebKit::LayerTreeHostQt::registerLayer):
(WebKit::LayerTreeHostQt::visibleContentsRect):
(WebKit):
(WebKit::LayerTreeHostQt::setVisibleContentRectAndScale):

• WebProcess/WebPage/qt/LayerTreeHostQt.h:

(LayerTreeHostQt):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (modified) (3 diffs)
• WebProcess/WebCoreSupport/WebGraphicsLayer.h (modified) (4 diffs)
• WebProcess/WebPage/qt/LayerTreeHostQt.cpp (modified) (3 diffs)
• WebProcess/WebPage/qt/LayerTreeHostQt.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-07  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        [Qt] Fetch the visible rect from LayerTreeHost instead of keeping a copy in each layer.
+        https://bugs.webkit.org/show_bug.cgi?id=78009
+
+        Reviewed by Noam Rosenthal.
+
+        Since WebGraphicsLayers are now accessed directly from LayerTreeHost, they don't
+        need to keep the visible rect to pass it down their child layers anymore.
+
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+        (WebCore::WebGraphicsLayer::setContentsScale):
+        (WebCore::WebGraphicsLayer::tiledBackingStoreVisibleRect):
+        (WebCore::WebGraphicsLayer::adjustVisibleRect):
+        (WebCore):
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.h:
+        (WebGraphicsLayerClient):
+        (WebGraphicsLayer):
+        * WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
+        (WebKit::LayerTreeHostQt::registerLayer):
+        (WebKit::LayerTreeHostQt::visibleContentsRect):
+        (WebKit):
+        (WebKit::LayerTreeHostQt::setVisibleContentRectAndScale):
+        * WebProcess/WebPage/qt/LayerTreeHostQt.h:
+        (LayerTreeHostQt):
+
 2012-02-09  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

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

@@ -484 +484 @@
 }
 
-void WebGraphicsLayer::setVisibleContentRectAndScale(const IntRect& pageVisibleRect, float scale)
-{
-    if (m_pageVisibleRect == pageVisibleRect && m_contentsScale == scale)
-        return;
-
-    m_pageVisibleRect = pageVisibleRect;
+void WebGraphicsLayer::setContentsScale(float scale)
+{
     m_contentsScale = scale;
-
-    if (!m_mainBackingStore || m_mainBackingStore->contentsScale() != scale) {
+    if (m_mainBackingStore && m_mainBackingStore->contentsScale() != scale) {
         m_previousBackingStore = m_mainBackingStore.release();
         m_mainBackingStore = adoptPtr(new TiledBackingStore(this, TiledBackingStoreRemoteTileBackend::create(this)));
         m_mainBackingStore->setContentsScale(scale);
-    } else
-        m_mainBackingStore->adjustVisibleRect();
+    }
 }
 
@@ -538 +532 @@
     // The resulting quad might be squewed and the visible rect is the bounding box of this quad,
     // so it might spread further than the real visible area (and then even more amplified by the cover rect multiplier).
-    return m_layerTransform.combined().inverse().clampedBoundsOfProjectedQuad(FloatQuad(FloatRect(m_pageVisibleRect)));
+    return m_layerTransform.combined().inverse().clampedBoundsOfProjectedQuad(FloatQuad(FloatRect(m_webGraphicsLayerClient->visibleContentsRect())));
 }
 
@@ -624 +618 @@
     if (client)
         client->attachLayer(this);
+}
+
+void WebGraphicsLayer::adjustVisibleRect()
+{
+    if (m_mainBackingStore)
+        m_mainBackingStore->adjustVisibleRect();
 }
 

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

@@ -53 +53 @@
     virtual void removeTile(WebLayerID, int tileID) = 0;
 
+    virtual WebCore::IntRect visibleContentsRect() const = 0;
     virtual bool layerTreeTileUpdatesAllowed() const = 0;
     virtual int64_t adoptImageBackingStore(WebCore::Image*) = 0;
@@ -103 +104 @@
     void setNeedsDisplayInRect(const FloatRect&);
     void setContentsNeedsDisplay();
-    void setVisibleContentRectAndScale(const IntRect&, float scale);
+    void setContentsScale(float);
     void setVisibleContentRectTrajectoryVector(const FloatPoint&);
     virtual void syncCompositingState(const FloatRect&);
@@ -138 +139 @@
     void setWebGraphicsLayerClient(WebKit::WebGraphicsLayerClient*);
 
+    void adjustVisibleRect();
     bool isReadyForTileBufferSwap() const;
     void updateContentBuffers();
@@ -148 +150 @@
     GraphicsLayer* m_maskTarget;
     FloatRect m_needsDisplayRect;
-    IntRect m_pageVisibleRect;
     LayerTransform m_layerTransform;
     bool m_needsDisplay : 1;

trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp

@@ -241 +241 @@
     m_registeredLayers.add(layer);
 
-    layer->setVisibleContentRectAndScale(m_visibleContentsRect, m_contentsScale);
+    layer->setContentsScale(m_contentsScale);
+    layer->adjustVisibleRect();
 }
 
@@ -415 +416 @@
 }
 
+WebCore::IntRect LayerTreeHostQt::visibleContentsRect() const
+{
+    return m_visibleContentsRect;
+}
+
 void LayerTreeHostQt::setVisibleContentRectAndScale(const IntRect& rect, float scale)
 {
@@ -423 +429 @@
 
     HashSet<WebCore::WebGraphicsLayer*>::iterator end = m_registeredLayers.end();
-    for (HashSet<WebCore::WebGraphicsLayer*>::iterator it = m_registeredLayers.begin(); it != end; ++it)
-        (*it)->setVisibleContentRectAndScale(rect, scale);
+    for (HashSet<WebCore::WebGraphicsLayer*>::iterator it = m_registeredLayers.begin(); it != end; ++it) {
+        (*it)->setContentsScale(scale);
+        (*it)->adjustVisibleRect();
+    }
     scheduleLayerFlush();
 }

trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.h

@@ -70 +70 @@
     virtual void updateTile(WebLayerID, int tileID, const UpdateInfo&);
     virtual void removeTile(WebLayerID, int tileID);
+    virtual WebCore::IntRect visibleContentsRect() const;
     virtual void renderNextFrame();
     virtual void purgeBackingStores();