Changeset 111735 in webkit

Timestamp:

Mar 22, 2012 11:32:49 AM (12 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

TiledBackingStore: Fix test regressions that appeared with r111560.
​https://bugs.webkit.org/show_bug.cgi?id=81519

Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

The visible rect wasn't intersected with the contents rect anymore which
could lead to an astronomical layer size to check for intersecting tiles.

Add a visibleContentsRect that doesn't do the conversion and use it
in visibleAreaIsCovered.

• platform/graphics/TiledBackingStore.cpp:

(WebCore::TiledBackingStore::visibleContentsRect):
(WebCore):
(WebCore::TiledBackingStore::visibleRect):
(WebCore::TiledBackingStore::visibleAreaIsCovered):

• platform/graphics/TiledBackingStore.h:

(TiledBackingStore):

LayoutTests:

• platform/qt-5.0-wk2/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-5.0-wk2/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/TiledBackingStore.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/TiledBackingStore.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-22  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        TiledBackingStore: Fix test regressions that appeared with r111560.
+        https://bugs.webkit.org/show_bug.cgi?id=81519
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * platform/qt-5.0-wk2/Skipped:
+
 2012-03-22  Dan Bernstein  <mitz@apple.com>
 

trunk/LayoutTests/platform/qt-5.0-wk2/Skipped

@@ -531 +531 @@
 compositing/geometry/tall-page-composited.html
 
-# REGRESSION(r111560): compositing/geometry/preserve-3d-switching.html timeout.
-# https://bugs.webkit.org/show_bug.cgi?id=81519
-compositing/geometry/preserve-3d-switching.html
-# REGRESSION(r111560): The following tests are crashing.
-# https://bugs.webkit.org/show_bug.cgi?id=81519
-compositing/geometry/layer-due-to-layer-children.html
-compositing/geometry/repaint-foreground-layer.html
-
 # Boxes are not showing the correct perspective.
 transforms/3d/general/perspective-units.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-22  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        TiledBackingStore: Fix test regressions that appeared with r111560.
+        https://bugs.webkit.org/show_bug.cgi?id=81519
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        The visible rect wasn't intersected with the contents rect anymore which
+        could lead to an astronomical layer size to check for intersecting tiles.
+
+        Add a visibleContentsRect that doesn't do the conversion and use it
+        in visibleAreaIsCovered.
+
+        * platform/graphics/TiledBackingStore.cpp:
+        (WebCore::TiledBackingStore::visibleContentsRect):
+        (WebCore):
+        (WebCore::TiledBackingStore::visibleRect):
+        (WebCore::TiledBackingStore::visibleAreaIsCovered):
+        * platform/graphics/TiledBackingStore.h:
+        (TiledBackingStore):
+
 2012-03-22  Joe Thomas  <joethomas@motorola.com>
 

trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp

@@ -167 +167 @@
 }
 
+IntRect TiledBackingStore::visibleContentsRect() const
+{
+    return intersection(m_client->tiledBackingStoreVisibleRect(), m_client->tiledBackingStoreContentsRect());
+}
+
 IntRect TiledBackingStore::visibleRect() const
 {
-    return mapFromContents(intersection(m_client->tiledBackingStoreVisibleRect(), m_client->tiledBackingStoreContentsRect()));
+    return mapFromContents(visibleContentsRect());
 }
 
@@ -228 +233 @@
 bool TiledBackingStore::visibleAreaIsCovered() const
 {
-    return coverageRatio(m_client->tiledBackingStoreVisibleRect()) == 1.0f;
+    return coverageRatio(visibleContentsRect()) == 1.0f;
 }
 

trunk/Source/WebCore/platform/graphics/TiledBackingStore.h

@@ -101 +101 @@
     void removeTile(const Tile::Coordinate& coordinate);
 
+    IntRect visibleContentsRect() const;
     IntRect visibleRect() const;