Title: [111735] trunk
- Revision
- 111735
- Author
- jocelyn.turco...@nokia.com
- Date
- 2012-03-22 11:32:49 -0700 (Thu, 22 Mar 2012)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (111734 => 111735)
--- trunk/LayoutTests/ChangeLog 2012-03-22 18:23:16 UTC (rev 111734)
+++ trunk/LayoutTests/ChangeLog 2012-03-22 18:32:49 UTC (rev 111735)
@@ -1,3 +1,12 @@
+2012-03-22 Jocelyn Turcotte <jocelyn.turco...@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 <m...@apple.com>
Added fast/events/drag-link.html to the Mac WebKit2 skip list, because running it has
Modified: trunk/LayoutTests/platform/qt-5.0-wk2/Skipped (111734 => 111735)
--- trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-03-22 18:23:16 UTC (rev 111734)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-03-22 18:32:49 UTC (rev 111735)
@@ -530,14 +530,6 @@
compositing/geometry/ancestor-overflow-change.html
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
Modified: trunk/Source/WebCore/ChangeLog (111734 => 111735)
--- trunk/Source/WebCore/ChangeLog 2012-03-22 18:23:16 UTC (rev 111734)
+++ trunk/Source/WebCore/ChangeLog 2012-03-22 18:32:49 UTC (rev 111735)
@@ -1,3 +1,24 @@
+2012-03-22 Jocelyn Turcotte <jocelyn.turco...@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 <joetho...@motorola.com>
Make Length Calculation functions non-inline
Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp (111734 => 111735)
--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2012-03-22 18:23:16 UTC (rev 111734)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2012-03-22 18:32:49 UTC (rev 111735)
@@ -166,9 +166,14 @@
context->restore();
}
+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());
}
void TiledBackingStore::setContentsScale(float scale)
@@ -227,7 +232,7 @@
bool TiledBackingStore::visibleAreaIsCovered() const
{
- return coverageRatio(m_client->tiledBackingStoreVisibleRect()) == 1.0f;
+ return coverageRatio(visibleContentsRect()) == 1.0f;
}
void TiledBackingStore::createTiles()
Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.h (111734 => 111735)
--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.h 2012-03-22 18:23:16 UTC (rev 111734)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.h 2012-03-22 18:32:49 UTC (rev 111735)
@@ -100,6 +100,7 @@
void setTile(const Tile::Coordinate& coordinate, PassRefPtr<Tile> tile);
void removeTile(const Tile::Coordinate& coordinate);
+ IntRect visibleContentsRect() const;
IntRect visibleRect() const;
float coverageRatio(const IntRect&) const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
