summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/GLWebViewState.h
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2010-11-22 19:48:11 -0800
committerNicolas Roard <nicolas@android.com>2010-11-24 13:42:16 -0800
commit7a661f000fc142aec9e4f88b04d0a0ee20a0151e (patch)
treebebb79f89eea3e9dc9f2ad974f5b1fcf89db40dd /WebCore/platform/graphics/android/GLWebViewState.h
parenteabb311cd2b57ff80b4cf632078cf078d789b563 (diff)
downloadexternal_webkit-7a661f000fc142aec9e4f88b04d0a0ee20a0151e.zip
external_webkit-7a661f000fc142aec9e4f88b04d0a0ee20a0151e.tar.gz
external_webkit-7a661f000fc142aec9e4f88b04d0a0ee20a0151e.tar.bz2
Refactoring the zoom
Change-Id: I84d44b6aab2222b52d21a65ceb74e390c677fe72
Diffstat (limited to 'WebCore/platform/graphics/android/GLWebViewState.h')
-rw-r--r--WebCore/platform/graphics/android/GLWebViewState.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/GLWebViewState.h b/WebCore/platform/graphics/android/GLWebViewState.h
index e50c5f4..698eb4a 100644
--- a/WebCore/platform/graphics/android/GLWebViewState.h
+++ b/WebCore/platform/graphics/android/GLWebViewState.h
@@ -160,6 +160,8 @@ public:
void setCurrentScale(float scale) { m_currentScale = scale; }
float futureScale() const { return m_futureScale; }
void setFutureScale(float scale) { m_futureScale = scale; }
+ const SkIRect& futureViewport() const { return m_futureViewportTileBounds; }
+ void setFutureViewport(const SkIRect& viewport) { m_futureViewportTileBounds = viewport; }
double updateTime() const { return m_updateTime; }
void setUpdateTime(double value) { m_updateTime = value; }
double transitionTime(double currentTime);
@@ -169,7 +171,7 @@ public:
unsigned int paintBaseLayerContent(SkCanvas* canvas);
void setBaseLayer(BaseLayerAndroid* layer, const IntRect& rect);
void setExtra(BaseLayerAndroid* , SkPicture& , const IntRect& );
- void scheduleUpdate(const double& currentTime, float scale);
+ void scheduleUpdate(const double& currentTime, const SkIRect& viewport, float scale);
TiledPage* frontPage();
TiledPage* backPage();
@@ -213,6 +215,7 @@ private:
android::Mutex m_tiledPageLock;
SkRect m_viewport;
SkIRect m_viewportTileBounds;
+ SkIRect m_futureViewportTileBounds;
SkIRect m_preZoomBounds;
android::Mutex m_baseLayerLock;
BaseLayerAndroid* m_baseLayer;