diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 19:56:45 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 19:56:45 +0000 |
| commit | afb59f5fd23a2392761e8be2e4a23bcc63b4a1fd (patch) | |
| tree | 86be51026d615480678bb75b9f1e894e7b845d63 /android_webview/renderer | |
| parent | 4b6bff3ea78537b5e8cd3811bf6c131a506fc7ea (diff) | |
| download | chromium_src-afb59f5fd23a2392761e8be2e4a23bcc63b4a1fd.zip chromium_src-afb59f5fd23a2392761e8be2e4a23bcc63b4a1fd.tar.gz chromium_src-afb59f5fd23a2392761e8be2e4a23bcc63b4a1fd.tar.bz2 | |
[android_webview] Fixes for wrap_content layouts.
This changes AwContents to work correctly when in a WRAP_CONTENT
layout mode.
TBR=danakj@chromium.org
BUG=246621
Review URL: https://chromiumcodereview.appspot.com/23478022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/renderer')
| -rw-r--r-- | android_webview/renderer/DEPS | 1 | ||||
| -rw-r--r-- | android_webview/renderer/aw_render_view_ext.cc | 8 | ||||
| -rw-r--r-- | android_webview/renderer/aw_render_view_ext.h | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/android_webview/renderer/DEPS b/android_webview/renderer/DEPS index 41dc519..d786dba 100644 --- a/android_webview/renderer/DEPS +++ b/android_webview/renderer/DEPS @@ -11,5 +11,6 @@ include_rules = [ "+third_party/WebKit/public/platform", "+third_party/WebKit/public/web", + "+ui/gfx/size.h", "+ui/gl/gpu_memory_buffer.h", ] diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc index 14cbb17..c925425 100644 --- a/android_webview/renderer/aw_render_view_ext.cc +++ b/android_webview/renderer/aw_render_view_ext.cc @@ -164,6 +164,7 @@ bool AwRenderViewExt::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(AwViewMsg_ResetScrollAndScaleState, OnResetScrollAndScaleState) IPC_MESSAGE_HANDLER(AwViewMsg_SetInitialPageScale, OnSetInitialPageScale) + IPC_MESSAGE_HANDLER(AwViewMsg_SetFixedLayoutSize, OnSetFixedLayoutSize) IPC_MESSAGE_HANDLER(AwViewMsg_SetBackgroundColor, OnSetBackgroundColor) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -304,6 +305,13 @@ void AwRenderViewExt::OnSetInitialPageScale(double page_scale_factor) { page_scale_factor); } +void AwRenderViewExt::OnSetFixedLayoutSize(const gfx::Size& size) { + if (!render_view() || !render_view()->GetWebView()) + return; + DCHECK(render_view()->GetWebView()->isFixedLayoutModeEnabled()); + render_view()->GetWebView()->setFixedLayoutSize(size); +} + void AwRenderViewExt::OnSetBackgroundColor(SkColor c) { 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 031d513..8969ec2 100644 --- a/android_webview/renderer/aw_render_view_ext.h +++ b/android_webview/renderer/aw_render_view_ext.h @@ -10,6 +10,7 @@ #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/public/web/WebPermissionClient.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/gfx/size.h" namespace WebKit { @@ -49,6 +50,9 @@ class AwRenderViewExt : public content::RenderViewObserver, void OnResetScrollAndScaleState(); void OnSetInitialPageScale(double page_scale_factor); + + void OnSetFixedLayoutSize(const gfx::Size& size); + void OnSetBackgroundColor(SkColor c); void UpdatePageScaleFactor(); |