Commit 46cd6d0f authored by jocelyn.turcotte@nokia.com's avatar jocelyn.turcotte@nokia.com
Browse files

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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@111735 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 39997812
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>
 
Added fast/events/drag-link.html to the Mac WebKit2 skip list, because running it has
......@@ -530,14 +530,6 @@ compositing/visibility/visibility-simple-video-layer.html
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
......
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>
 
Make Length Calculation functions non-inline
......@@ -166,9 +166,14 @@ void TiledBackingStore::paint(GraphicsContext* context, const IntRect& rect)
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 @@ float TiledBackingStore::coverageRatio(const WebCore::IntRect& contentsRect) con
bool TiledBackingStore::visibleAreaIsCovered() const
{
return coverageRatio(m_client->tiledBackingStoreVisibleRect()) == 1.0f;
return coverageRatio(visibleContentsRect()) == 1.0f;
}
void TiledBackingStore::createTiles()
......
......@@ -100,6 +100,7 @@ private:
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment