diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 20:21:45 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 20:21:45 +0000 |
| commit | 3f93980d6f500aef8e587445db50934e85244774 (patch) | |
| tree | 3c8e4e7adc1b594bc8aba166da1d702ea2588b85 /android_webview/renderer | |
| parent | bfb88ec71c6cd955694024e2e57c9dca04ef6cba (diff) | |
| download | chromium_src-3f93980d6f500aef8e587445db50934e85244774.zip chromium_src-3f93980d6f500aef8e587445db50934e85244774.tar.gz chromium_src-3f93980d6f500aef8e587445db50934e85244774.tar.bz2 | |
[Android WebView] Update WebView.EnableFixedLayoutMode in sync with ViewportEnabled
After WebKit http://trac.webkit.org/changeset/143735,
WebView.EnableFixedLayoutMode must be updated together with
WebSettings.ViewportEnabled. This is a temporary state of
affairs, one of these settings will be removed in future.
Only Android WebView needs to switch thid mode dynamically,
thus the change is implemented in the android_webview layer.
BUG=177684
Review URL: https://chromiumcodereview.appspot.com/12317071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/renderer')
| -rw-r--r-- | android_webview/renderer/aw_render_view_ext.cc | 8 | ||||
| -rw-r--r-- | android_webview/renderer/aw_render_view_ext.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc index bcc2c20..b9b82dc 100644 --- a/android_webview/renderer/aw_render_view_ext.cc +++ b/android_webview/renderer/aw_render_view_ext.cc @@ -144,6 +144,8 @@ bool AwRenderViewExt::OnMessageReceived(const IPC::Message& message) { IPC_BEGIN_MESSAGE_MAP(AwRenderViewExt, message) IPC_MESSAGE_HANDLER(AwViewMsg_DocumentHasImages, OnDocumentHasImagesRequest) IPC_MESSAGE_HANDLER(AwViewMsg_DoHitTest, OnDoHitTest) + IPC_MESSAGE_HANDLER(AwViewMsg_SetEnableFixedLayoutMode, + OnSetEnableFixedLayoutMode) IPC_MESSAGE_HANDLER(AwViewMsg_SetTextZoomLevel, OnSetTextZoomLevel) IPC_MESSAGE_HANDLER(AwViewMsg_ResetScrollAndScaleState, OnResetScrollAndScaleState) @@ -241,6 +243,12 @@ void AwRenderViewExt::OnDoHitTest(int view_x, int view_y) { Send(new AwViewHostMsg_UpdateHitTestData(routing_id(), data)); } +void AwRenderViewExt::OnSetEnableFixedLayoutMode(bool enabled) { + if (!render_view() || !render_view()->GetWebView()) + return; + render_view()->GetWebView()->enableFixedLayoutMode(enabled); +} + void AwRenderViewExt::OnSetTextZoomLevel(double zoom_level) { if (!render_view() || !render_view()->GetWebView()) return; diff --git a/android_webview/renderer/aw_render_view_ext.h b/android_webview/renderer/aw_render_view_ext.h index 88f9338..3583ac5 100644 --- a/android_webview/renderer/aw_render_view_ext.h +++ b/android_webview/renderer/aw_render_view_ext.h @@ -41,6 +41,8 @@ class AwRenderViewExt : public content::RenderViewObserver, void OnDoHitTest(int view_x, int view_y); + void OnSetEnableFixedLayoutMode(bool enabled); + void OnSetTextZoomLevel(double zoom_level); void OnResetScrollAndScaleState(); |