summaryrefslogtreecommitdiffstats
path: root/android_webview/browser/browser_view_renderer.h
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 13:49:11 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 13:49:11 +0000
commit68fe60ff51e006b604f2884e76ea5d91861b30d7 (patch)
tree54fc076177fdeb6149392357c364553770ae18cd /android_webview/browser/browser_view_renderer.h
parent6ccd58c92931257602cdfa2bde06c02944570760 (diff)
downloadchromium_src-68fe60ff51e006b604f2884e76ea5d91861b30d7.zip
chromium_src-68fe60ff51e006b604f2884e76ea5d91861b30d7.tar.gz
chromium_src-68fe60ff51e006b604f2884e76ea5d91861b30d7.tar.bz2
Fix the cause of AwZoomTest#testMagnification... tests flakiness
AwContents maintains its own page scale value, which it receives synchronously from the compositor. However, it was still using page scale limits values from ContentViewCore, where they are updated async-ly. This was causing spurious wrong 'canZoomOut' results. Fixed by propagating page scale limits to AwContents together with page scale updates. It would be great to eliminate duplication of page scale values between ContentViewCore and AwContents though. Re-applied changes to the tests from https://codereview.chromium.org/143683005 as they still make sense. BUG=340327,340648 Review URL: https://codereview.chromium.org/156233005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser/browser_view_renderer.h')
-rw-r--r--android_webview/browser/browser_view_renderer.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h
index 4261f2b..951e5cc 100644
--- a/android_webview/browser/browser_view_renderer.h
+++ b/android_webview/browser/browser_view_renderer.h
@@ -54,8 +54,11 @@ class BrowserViewRenderer {
// Is a WebView-managed fling in progress?
virtual bool IsFlingActive() const = 0;
- // Set the current page scale to |page_scale_factor|.
- virtual void SetPageScaleFactor(float page_scale_factor) = 0;
+ // Set the current page scale to |page_scale_factor| and page scale limits
+ // to |min_page_scale_factor|..|max_page_scale_factor|.
+ virtual void SetPageScaleFactorAndLimits(float page_scale_factor,
+ float min_page_scale_factor,
+ float max_page_scale_factor) = 0;
// Set the current contents_size to |contents_size_dip|.
virtual void SetContentsSize(gfx::SizeF contents_size_dip) = 0;