Changeset 91180 in webkit

Timestamp:

Jul 18, 2011 6:43:12 AM (13 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

TiledDrawingArea: map the visibleArea rect from page to tiles coordinates.
​https://bugs.webkit.org/show_bug.cgi?id=64538

Reviewed by Benjamin Poulain.

TiledDrawingAreaProxy expects its coordinates to be scaled according to
contentsScale. This patch keep the pushed visibleArea as page coordinates
and convert it each time to scaled coordinates in case the contents scale was
changed afterward.
This is a regression introduced in r90750.
Also:

• Rename visibleArea to visibleContentRect
• Remove an unnecessary mapToContents in QTouchWebPageProxy::setVisibleContentRect

• UIProcess/API/qt/qtouchwebpage.cpp:

(QTouchWebPagePrivate::setViewportRect):

• UIProcess/TiledDrawingAreaProxy.cpp:

(WebKit::TiledDrawingAreaProxy::invalidate):
(WebKit::TiledDrawingAreaProxy::setVisibleContentRect):
(WebKit::TiledDrawingAreaProxy::createTiles):
(WebKit::TiledDrawingAreaProxy::visibleRect):

• UIProcess/TiledDrawingAreaProxy.h:
• UIProcess/qt/qtouchwebpageproxy.cpp:

(QTouchWebPageProxy::setVisibleContentRect):

• UIProcess/qt/qtouchwebpageproxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qtouchwebpage.cpp (modified) (1 diff)
• UIProcess/TiledDrawingAreaProxy.cpp (modified) (6 diffs)
• UIProcess/TiledDrawingAreaProxy.h (modified) (3 diffs)
• UIProcess/qt/qtouchwebpageproxy.cpp (modified) (1 diff)
• UIProcess/qt/qtouchwebpageproxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-15  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        TiledDrawingArea: map the visibleArea rect from page to tiles coordinates.
+        https://bugs.webkit.org/show_bug.cgi?id=64538
+
+        Reviewed by Benjamin Poulain.
+
+        TiledDrawingAreaProxy expects its coordinates to be scaled according to
+        contentsScale. This patch keep the pushed visibleArea as page coordinates
+        and convert it each time to scaled coordinates in case the contents scale was
+        changed afterward.
+        This is a regression introduced in r90750.
+        Also:
+        - Rename visibleArea to visibleContentRect
+        - Remove an unnecessary mapToContents in QTouchWebPageProxy::setVisibleContentRect
+
+        * UIProcess/API/qt/qtouchwebpage.cpp:
+        (QTouchWebPagePrivate::setViewportRect):
+        * UIProcess/TiledDrawingAreaProxy.cpp:
+        (WebKit::TiledDrawingAreaProxy::invalidate):
+        (WebKit::TiledDrawingAreaProxy::setVisibleContentRect):
+        (WebKit::TiledDrawingAreaProxy::createTiles):
+        (WebKit::TiledDrawingAreaProxy::visibleRect):
+        * UIProcess/TiledDrawingAreaProxy.h:
+        * UIProcess/qt/qtouchwebpageproxy.cpp:
+        (QTouchWebPageProxy::setVisibleContentRect):
+        * UIProcess/qt/qtouchwebpageproxy.h:
+
 2011-07-17  Amruth Raj  <amruthraj@motorola.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp

@@ -142 +142 @@
 void QTouchWebPagePrivate::setViewportRect(const QRectF& viewportRect)
 {
-    const QRectF visibleArea = q->boundingRect().intersected(viewportRect);
-    page->setVisibleArea(visibleArea);
+    const QRectF visibleContentRect = q->boundingRect().intersected(viewportRect);
+    page->setVisibleContentRect(visibleContentRect);
 }
 

trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp

@@ -182 +182 @@
     TiledDrawingAreaTile::Coordinate bottomRight = tileCoordinateForPoint(innerBottomRight(dirtyRect));
 
-    IntRect coverRect = calculateCoverRect(m_visibleArea);
+    IntRect coverRect = calculateCoverRect(visibleRect());
 
     Vector<TiledDrawingAreaTile::Coordinate> tilesToRemove;
@@ -291 +291 @@
 }
 
-void TiledDrawingAreaProxy::setVisibleArea(const WebCore::IntRect& visibleArea)
-{
-    if (m_visibleArea != visibleArea) {
-        m_visibleArea = visibleArea;
+void TiledDrawingAreaProxy::setVisibleContentRect(const WebCore::IntRect& visibleContentRect)
+{
+    if (m_visibleContentRect != visibleContentRect) {
+        m_visibleContentRect = visibleContentRect;
         startTileCreationTimer();
     }
@@ -352 +352 @@
 void TiledDrawingAreaProxy::createTiles()
 {
-    if (m_visibleArea.isEmpty())
+    IntRect visibleRect = this->visibleRect();
+    if (visibleRect.isEmpty())
         return;
 
@@ -359 +360 @@
 
     // Remove tiles outside out current maximum keep rect.
-    dropTilesOutsideRect(calculateKeepRect(m_visibleArea));
+    dropTilesOutsideRect(calculateKeepRect(visibleRect));
 
     // Search for the tile position closest to the viewport center that does not yet contain a tile.
@@ -367 +368 @@
     unsigned requiredTileCount = 0;
     bool hasVisibleCheckers = false;
-    TiledDrawingAreaTile::Coordinate topLeft = tileCoordinateForPoint(m_visibleArea.location());
-    TiledDrawingAreaTile::Coordinate bottomRight = tileCoordinateForPoint(innerBottomRight(m_visibleArea));
+    TiledDrawingAreaTile::Coordinate topLeft = tileCoordinateForPoint(visibleRect.location());
+    TiledDrawingAreaTile::Coordinate bottomRight = tileCoordinateForPoint(innerBottomRight(visibleRect));
     for (unsigned yCoordinate = topLeft.y(); yCoordinate <= bottomRight.y(); ++yCoordinate) {
         for (unsigned xCoordinate = topLeft.x(); xCoordinate <= bottomRight.x(); ++xCoordinate) {
             TiledDrawingAreaTile::Coordinate currentCoordinate(xCoordinate, yCoordinate);
             // Distance is 0 for all currently visible tiles.
-            double distance = tileDistance(m_visibleArea, currentCoordinate);
+            double distance = tileDistance(visibleRect, currentCoordinate);
 
             RefPtr<TiledDrawingAreaTile> tile = tileAt(currentCoordinate);
@@ -497 +498 @@
 }
 
+IntRect TiledDrawingAreaProxy::visibleRect() const
+{
+    return mapFromContents(m_visibleContentRect);
+}
+
 IntRect TiledDrawingAreaProxy::tileRectForCoordinate(const TiledDrawingAreaTile::Coordinate& coordinate) const
 {

trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.h

@@ -68 +68 @@
     virtual ~TiledDrawingAreaProxy();
 
-    void setVisibleArea(const WebCore::IntRect& visibleRect);
+    void setVisibleContentRect(const WebCore::IntRect&);
     float contentsScale() const { return m_contentsScale; }
     void setContentsScale(float);
@@ -136 +136 @@
 
     WebCore::IntRect contentsRect() const;
+    WebCore::IntRect visibleRect() const;
 
     WebCore::IntRect calculateKeepRect(const WebCore::IntRect& visibleRect) const;
@@ -167 +168 @@
     WebCore::FloatSize m_coverAreaMultiplier;
 
-    WebCore::IntRect m_visibleArea;
+    WebCore::IntRect m_visibleContentRect;
     float m_contentsScale;
 

trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp

@@ -86 +86 @@
 }
 
-void QTouchWebPageProxy::setVisibleArea(const QRectF& visibleArea)
+void QTouchWebPageProxy::setVisibleContentRect(const QRectF& visibleContentRect)
 {
     TiledDrawingAreaProxy* tiledDrawingArea = static_cast<TiledDrawingAreaProxy*>(m_webPageProxy->drawingArea());
-    QRect alignedVisibleArea = visibleArea.toAlignedRect();
-    tiledDrawingArea->setVisibleArea(alignedVisibleArea);
+    QRect alignedVisibleContentRect = visibleContentRect.toAlignedRect();
+    tiledDrawingArea->setVisibleContentRect(alignedVisibleContentRect);
 
     // FIXME: Once we support suspend and resume, this should be delayed until the page is active if the page is suspended.
-    IntRect contentVisibleArea = tiledDrawingArea->mapToContents(alignedVisibleArea);
-    m_webPageProxy->setFixedVisibleContentRect(contentVisibleArea);
+    m_webPageProxy->setFixedVisibleContentRect(alignedVisibleContentRect);
 }
 

trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h

@@ -40 +40 @@
     virtual bool handleEvent(QEvent*);
 
-    void setVisibleArea(const QRectF&);
+    void setVisibleContentRect(const QRectF&);
     void setResizesToContentsUsingLayoutSize(const QSize& targetLayoutSize);
     void findZoomableAreaForPoint(const QPoint&);