summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/platform/graphics/android/BaseTile.cpp4
-rw-r--r--WebCore/platform/graphics/android/BaseTile.h2
-rw-r--r--WebCore/platform/graphics/android/TiledPage.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/android/BaseTile.cpp b/WebCore/platform/graphics/android/BaseTile.cpp
index 5968bd9..d58c549 100644
--- a/WebCore/platform/graphics/android/BaseTile.cpp
+++ b/WebCore/platform/graphics/android/BaseTile.cpp
@@ -172,9 +172,9 @@ void BaseTile::setUsedLevel(int usedLevel)
m_texture->setUsedLevel(usedLevel);
}
-void BaseTile::draw(float transparency, SkRect& rect)
+void BaseTile::draw(float transparency, SkRect& rect, float scale)
{
- if (m_x < 0 || m_y < 0)
+ if (m_x < 0 || m_y < 0 || m_scale != scale)
return;
// No need to mutex protect reads of m_texture as it is only written to by
diff --git a/WebCore/platform/graphics/android/BaseTile.h b/WebCore/platform/graphics/android/BaseTile.h
index c50f6f5..b832eee 100644
--- a/WebCore/platform/graphics/android/BaseTile.h
+++ b/WebCore/platform/graphics/android/BaseTile.h
@@ -73,7 +73,7 @@ public:
void reserveTexture();
void setUsedLevel(int);
bool isTileReady();
- void draw(float transparency, SkRect& rect);
+ void draw(float transparency, SkRect& rect, float scale);
// the only thread-safe function called by the background thread
void paintBitmap();
diff --git a/WebCore/platform/graphics/android/TiledPage.cpp b/WebCore/platform/graphics/android/TiledPage.cpp
index 21afe24..6f910a3 100644
--- a/WebCore/platform/graphics/android/TiledPage.cpp
+++ b/WebCore/platform/graphics/android/TiledPage.cpp
@@ -341,7 +341,7 @@ void TiledPage::draw(float transparency, const SkIRect& tileBounds)
rect.fRight = rect.fLeft + tileWidth;
rect.fBottom = rect.fTop + tileHeight;
- tile.draw(transparency, rect);
+ tile.draw(transparency, rect, m_scale);
}
}