Index: third_party/WebKit/Source/web/WebViewImpl.h |
diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h |
index 26e93e70cab528ef4957290ae5bffb546eab2d11..d96c6e46c15342ad08da6f5bcfabe6c61961ceba 100644 |
--- a/third_party/WebKit/Source/web/WebViewImpl.h |
+++ b/third_party/WebKit/Source/web/WebViewImpl.h |
@@ -303,7 +303,8 @@ public: |
void setBackgroundColorOverride(WebColor); |
void setZoomFactorOverride(float); |
void setCompositorDeviceScaleFactorOverride(float); |
- void setRootLayerTransform(const WebSize& offset, float scale); |
+ void setRootLayerTransform(const TransformationMatrix&); |
+ TransformationMatrix getRootLayerTransformForTesting() const; |
Color baseBackgroundColor() const { return m_baseBackgroundColor; } |
@@ -385,6 +386,7 @@ public: |
void didChangeContentsSize(); |
void pageScaleFactorChanged(); |
+ void mainFrameScrollOffsetChanged(); |
// Returns true if popup menus should be rendered by the browser, false if |
// they should be rendered by WebKit (which is the default). |
@@ -688,8 +690,7 @@ private: |
bool m_ignoreInputEvents; |
float m_compositorDeviceScaleFactorOverride; |
- WebSize m_rootLayerOffset; |
- float m_rootLayerScale; |
+ TransformationMatrix m_rootLayerTransform; |
// Webkit expects keyPress events to be suppressed if the associated keyDown |
// event was handled. Safari implements this behavior by peeking out the |