Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1648)

Unified Diff: content/renderer/render_view_impl.cc

Issue 9517010: Change panels to be able to turn off autoresize. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix assert at the end of RenderWidget::Resize which fixes the tests on OSX. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 2bdb7458c91a5f21b06726de60797c0acd6ba941..7329426510e88d64e8284d34afac3eb610813ed4 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -780,6 +780,7 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(ViewMsg_EnablePreferredSizeChangedMode,
OnEnablePreferredSizeChangedMode)
IPC_MESSAGE_HANDLER(ViewMsg_EnableAutoResize, OnEnableAutoResize)
+ IPC_MESSAGE_HANDLER(ViewMsg_DisableAutoResize, OnDisableAutoResize)
IPC_MESSAGE_HANDLER(ViewMsg_DisableScrollbarsForSmallWindows,
OnDisableScrollbarsForSmallWindows)
IPC_MESSAGE_HANDLER(ViewMsg_SetRendererPrefs, OnSetRendererPrefs)
@@ -4163,7 +4164,16 @@ void RenderViewImpl::OnEnableAutoResize(const gfx::Size& min_size,
DCHECK(disable_scrollbars_size_limit_.IsEmpty());
if (!webview())
return;
- webview()->enableAutoResizeMode(true, min_size, max_size);
+ webview()->enableAutoResizeMode(min_size, max_size);
+}
+
+void RenderViewImpl::OnDisableAutoResize(const gfx::Size& new_size) {
+ DCHECK(disable_scrollbars_size_limit_.IsEmpty());
+ if (!webview())
+ return;
+ webview()->disableAutoResizeMode();
+
+ Resize(new_size, resizer_rect_, is_fullscreen_, NO_RESIZE_ACK);
}
void RenderViewImpl::OnEnablePreferredSizeChangedMode() {
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698