summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--content/browser/renderer_host/render_view_host.cc10
-rw-r--r--content/browser/renderer_host/render_view_host.h5
-rw-r--r--content/browser/renderer_host/render_widget_host.cc33
-rw-r--r--content/browser/renderer_host/render_widget_host.h11
-rw-r--r--content/common/view_messages.h6
-rw-r--r--content/renderer/render_view_impl.cc9
-rw-r--r--content/renderer/render_view_impl.h1
-rw-r--r--content/renderer/render_widget.cc4
-rw-r--r--content/renderer/render_widget.h1
9 files changed, 74 insertions, 6 deletions
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index 69bdae5..e03b6fa 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -1023,6 +1023,10 @@ void RenderViewHost::OnMsgDidContentsPreferredSizeChange(
delegate_->UpdatePreferredSize(new_size);
}
+void RenderViewHost::OnRenderAutoResized(const gfx::Size& new_size) {
+ delegate_->UpdatePreferredSize(new_size);
+}
+
void RenderViewHost::OnMsgDidChangeScrollbarsForMainFrame(
bool has_horizontal_scrollbar, bool has_vertical_scrollbar) {
if (view())
@@ -1339,6 +1343,12 @@ void RenderViewHost::EnablePreferredSizeMode() {
Send(new ViewMsg_EnablePreferredSizeChangedMode(routing_id()));
}
+void RenderViewHost::EnableAutoResize(const gfx::Size& min_size,
+ const gfx::Size& max_size) {
+ SetShouldAutoResize(true);
+ Send(new ViewMsg_EnableAutoResize(routing_id(), min_size, max_size));
+}
+
void RenderViewHost::ExecuteCustomContextMenuCommand(
int action, const webkit_glue::CustomContextMenuContext& context) {
Send(new ViewMsg_CustomContextMenuAction(routing_id(), context, action));
diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h
index 468688e..8d62b8f 100644
--- a/content/browser/renderer_host/render_view_host.h
+++ b/content/browser/renderer_host/render_view_host.h
@@ -442,6 +442,10 @@ class CONTENT_EXPORT RenderViewHost : public RenderWidgetHost {
// Instructs the RenderView to send back updates to the preferred size.
void EnablePreferredSizeMode();
+ // Instructs the RenderView to automatically resize and send back updates
+ // for the new size.
+ void EnableAutoResize(const gfx::Size& min_size, const gfx::Size& max_size);
+
// Executes custom context menu action that was provided from WebKit.
void ExecuteCustomContextMenuCommand(
int action, const webkit_glue::CustomContextMenuContext& context);
@@ -495,6 +499,7 @@ class CONTENT_EXPORT RenderViewHost : public RenderWidgetHost {
virtual void OnUserGesture() OVERRIDE;
virtual void NotifyRendererUnresponsive() OVERRIDE;
virtual void NotifyRendererResponsive() OVERRIDE;
+ virtual void OnRenderAutoResized(const gfx::Size& size) OVERRIDE;
virtual void RequestToLockMouse() OVERRIDE;
virtual bool IsFullscreen() const OVERRIDE;
virtual void OnMsgFocus() OVERRIDE;
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index f636de3..295b90b 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -89,6 +89,7 @@ RenderWidgetHost::RenderWidgetHost(content::RenderProcessHost* process,
is_accelerated_compositing_active_(false),
repaint_ack_pending_(false),
resize_ack_pending_(false),
+ should_auto_resize_(false),
mouse_move_pending_(false),
mouse_wheel_pending_(false),
touch_move_pending_(false),
@@ -332,7 +333,7 @@ void RenderWidgetHost::WasRestored() {
void RenderWidgetHost::WasResized() {
if (resize_ack_pending_ || !process_->HasConnection() || !view_ ||
- !renderer_initialized_) {
+ !renderer_initialized_ || should_auto_resize_) {
return;
}
@@ -868,6 +869,20 @@ bool RenderWidgetHost::IsFullscreen() const {
return false;
}
+void RenderWidgetHost::SetShouldAutoResize(bool enable) {
+ // Note if this switches from true to false then one has to verify that the
+ // mechanics about all the messaging works. For example, what happens to a
+ // update message rect that was in progress from the render widget. Perhaps,
+ // on a transition to false, this should do a WasResized, but what if that
+ // will not trigger a resize message...etc. Due to these complications it is
+ // fitting that this method doesn't look like a simple set method.
+ DCHECK(enable);
+
+ // TODO: Change this to enable instead of true when this supports turning
+ // off auto-resize.
+ should_auto_resize_ = true;
+}
+
void RenderWidgetHost::Destroy() {
content::NotificationService::current()->Notify(
content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
@@ -991,11 +1006,13 @@ void RenderWidgetHost::OnMsgUpdateRect(
// resize_ack_pending_ needs to be cleared before we call DidPaintRect, since
// that will end up reaching GetBackingStore.
- if (is_resize_ack) {
- DCHECK(resize_ack_pending_);
- resize_ack_pending_ = false;
- in_flight_size_.SetSize(0, 0);
- in_flight_reserved_rect_.SetRect(0, 0, 0, 0);
+ if (is_resize_ack || should_auto_resize_) {
+ if (is_resize_ack) {
+ DCHECK(resize_ack_pending_);
+ resize_ack_pending_ = false;
+ in_flight_size_.SetSize(0, 0);
+ in_flight_reserved_rect_.SetRect(0, 0, 0, 0);
+ }
// Update our knowledge of the RenderWidget's resizer rect.
// ViewMsg_Resize is acknowledged only when view size is actually changed,
// otherwise current_reserved_rect_ is updated immediately after sending
@@ -1056,6 +1073,10 @@ void RenderWidgetHost::OnMsgUpdateRect(
DidUpdateBackingStore(params, paint_start);
}
+ if (should_auto_resize_) {
+ OnRenderAutoResized(params.view_size);
+ }
+
// Log the time delta for processing a paint message. On platforms that don't
// support asynchronous painting, this is equivalent to
// MPArch.RWH_TotalPaintTime.
diff --git a/content/browser/renderer_host/render_widget_host.h b/content/browser/renderer_host/render_widget_host.h
index be4d693..3383b97 100644
--- a/content/browser/renderer_host/render_widget_host.h
+++ b/content/browser/renderer_host/render_widget_host.h
@@ -496,6 +496,9 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Channel::Listener,
virtual void NotifyRendererUnresponsive() {}
virtual void NotifyRendererResponsive() {}
+ // Called when auto-resize resulted in the renderer size changing.
+ virtual void OnRenderAutoResized(const gfx::Size& new_size) {}
+
// ---------------------------------------------------------------------------
// RenderViewHost overrides this method to impose further restrictions on when
@@ -510,6 +513,10 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Channel::Listener,
// RenderViewHost overrides this method to report when in fullscreen mode.
virtual bool IsFullscreen() const;
+ // Indicates if the render widget host should track the render widget's size
+ // as opposed to visa versa.
+ void SetShouldAutoResize(bool enable);
+
protected:
// true if a renderer has once been valid. We use this flag to display a sad
// tab only when we lose our renderer and not if a paint occurs during
@@ -674,6 +681,10 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Channel::Listener,
// hand is updated when the resize message is sent.
gfx::Rect in_flight_reserved_rect_;
+ // True if the render widget host should track the render widget's size as
+ // opposed to visa versa.
+ bool should_auto_resize_;
+
// True if a mouse move event was sent to the render view and we are waiting
// for a corresponding ViewHostMsg_HandleInputEvent_ACK message.
bool mouse_move_pending_;
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 3b7eac5..59aab0c 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -1024,6 +1024,12 @@ IPC_MESSAGE_ROUTED0(ViewMsg_Move_ACK)
// Used to instruct the RenderView to send back updates to the preferred size.
IPC_MESSAGE_ROUTED0(ViewMsg_EnablePreferredSizeChangedMode)
+// Used to instruct the RenderView to automatically resize and send back
+// updates for the new size.
+IPC_MESSAGE_ROUTED2(ViewMsg_EnableAutoResize,
+ gfx::Size /* min_size */,
+ gfx::Size /* max_size */)
+
// Changes the text direction of the currently selected input field (if any).
IPC_MESSAGE_ROUTED1(ViewMsg_SetTextDirection,
WebKit::WebTextDirection /* direction */)
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index a69d6e7..ad56df3 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -681,6 +681,7 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(ViewMsg_SetBackground, OnSetBackground)
IPC_MESSAGE_HANDLER(ViewMsg_EnablePreferredSizeChangedMode,
OnEnablePreferredSizeChangedMode)
+ IPC_MESSAGE_HANDLER(ViewMsg_EnableAutoResize, OnEnableAutoResize)
IPC_MESSAGE_HANDLER(ViewMsg_DisableScrollbarsForSmallWindows,
OnDisableScrollbarsForSmallWindows)
IPC_MESSAGE_HANDLER(ViewMsg_SetRendererPrefs, OnSetRendererPrefs)
@@ -3906,6 +3907,14 @@ void RenderViewImpl::OnFileChooserResponse(const std::vector<FilePath>& paths) {
}
}
+void RenderViewImpl::OnEnableAutoResize(const gfx::Size& min_size,
+ const gfx::Size& max_size) {
+ DCHECK(disable_scrollbars_size_limit_.IsEmpty());
+ if (!webview())
+ return;
+ webview()->enableAutoResizeMode(true, min_size, max_size);
+}
+
void RenderViewImpl::OnEnablePreferredSizeChangedMode() {
if (send_preferred_size_changes_)
return;
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 49c5c90..79b6302 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -822,6 +822,7 @@ class RenderViewImpl : public RenderWidget,
const gfx::Point& screen_pt,
WebKit::WebDragOperationsMask operations_allowed);
void OnEnablePreferredSizeChangedMode();
+ void OnEnableAutoResize(const gfx::Size& min_size, const gfx::Size& max_size);
void OnEnumerateDirectoryResponse(int id, const std::vector<FilePath>& paths);
void OnExecuteEditCommand(const std::string& name, const std::string& value);
void OnFileChooserResponse(const std::vector<FilePath>& paths);
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index b16c5ba..98da1c2 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -924,6 +924,10 @@ void RenderWidget::didScrollRect(int dx, int dy, const WebRect& clip_rect) {
FROM_HERE, base::Bind(&RenderWidget::InvalidationCallback, this));
}
+void RenderWidget::didAutoResize(const WebSize& new_size) {
+ size_ = new_size;
+}
+
void RenderWidget::didActivateCompositor(int compositor_identifier) {
TRACE_EVENT0("gpu", "RenderWidget::didActivateCompositor");
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 206c473..255bb09 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -104,6 +104,7 @@ class CONTENT_EXPORT RenderWidget
// WebKit::WebWidgetClient
virtual void didInvalidateRect(const WebKit::WebRect&);
virtual void didScrollRect(int dx, int dy, const WebKit::WebRect& clipRect);
+ virtual void didAutoResize(const WebKit::WebSize& new_size);
virtual void didActivateCompositor(int compositorIdentifier);
virtual void didDeactivateCompositor();
virtual void didCommitAndDrawCompositorFrame();
generated by cgit v1.1 at 2025-03-11 18:53:54 +0000