summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authormkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-03 07:32:07 +0000
committermkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-03 07:32:07 +0000
commita4f98e2023fed3f3f697b837ccca6c98940c6526 (patch)
tree0b379a66bb200377bc51fae1150096279831390a /content
parent676bfd3221b2b70db1a278d5193760278b0219f9 (diff)
downloadchromium_src-a4f98e2023fed3f3f697b837ccca6c98940c6526.zip
chromium_src-a4f98e2023fed3f3f697b837ccca6c98940c6526.tar.gz
chromium_src-a4f98e2023fed3f3f697b837ccca6c98940c6526.tar.bz2
Revert 120282 - Fix broken resize box appearance after download shelf open/close.
The issue was that currently only a WasResized() message updates the resize corner information in WebKit, but if the download shelf opens, the web contents don't necessarily get resized. As a fix, add an IPC to explicitly update the resize rect, and call this when the download shelf opens/closes, and when a TabContents object becomes active. Depends on https://bugs.webkit.org/show_bug.cgi?id=77453 BUG=111266 TEST=open page with scrollbar, save it. no resize corner in web. switch to background tab with scrollbar, no resize corner there either. close download shelf, resize corner doesn't overlap scrollbar. back to first tab, there neither. Review URL: http://codereview.chromium.org/9159057 TBR=thakis@chromium.org Reverting in the hopes that this is magically the cause of timeouts in Prerendering* http://build.chromium.org/p/chromium/builders/Win7%20Tests%20%28dbg%29%283%29/builds/2660/steps/browser_tests/logs/stdio If this turns out to be the culprit, I'll post more logs in the TBR CL. Sorry! Review URL: https://chromiumcodereview.appspot.com/9316088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_widget_host.cc4
-rw-r--r--content/browser/renderer_host/render_widget_host.h4
-rw-r--r--content/browser/tab_contents/tab_contents.cc7
-rw-r--r--content/common/view_messages.h4
-rw-r--r--content/renderer/render_widget.cc10
-rw-r--r--content/renderer/render_widget.h1
6 files changed, 0 insertions, 30 deletions
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index 0977e91..288a411 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -378,10 +378,6 @@ void RenderWidgetHost::WasResized() {
}
}
-void RenderWidgetHost::ResizeRectChanged(const gfx::Rect& new_rect) {
- Send(new ViewMsg_ChangeResizeRect(routing_id_, new_rect));
-}
-
void RenderWidgetHost::GotFocus() {
Focus();
}
diff --git a/content/browser/renderer_host/render_widget_host.h b/content/browser/renderer_host/render_widget_host.h
index ec5d09e..cf61649 100644
--- a/content/browser/renderer_host/render_widget_host.h
+++ b/content/browser/renderer_host/render_widget_host.h
@@ -195,10 +195,6 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Channel::Listener,
// Called to notify the RenderWidget that it has been resized.
void WasResized();
- // Called to notify the RenderWidget that the resize rect has changed without
- // the size of the RenderWidget itself changing.
- void ResizeRectChanged(const gfx::Rect& new_rect);
-
// Called to notify the RenderWidget that its associated native window got
// focused.
virtual void GotFocus();
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index e0d3529..78b8024 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -609,13 +609,6 @@ void TabContents::DidBecomeSelected() {
#endif
}
- // The resize rect might have changed while this was inactive -- send the new
- // one to make sure it's up to date.
- RenderViewHost* rvh = GetRenderViewHost();
- if (rvh) {
- rvh->ResizeRectChanged(GetRootWindowResizerRect());
- }
-
last_selected_time_ = base::TimeTicks::Now();
FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidBecomeSelected());
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 9923dce..23fa018 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -736,10 +736,6 @@ IPC_MESSAGE_ROUTED3(ViewMsg_Resize,
gfx::Rect /* resizer_rect */,
bool /* is_fullscreen */)
-// Tells the render view that the resize rect has changed.
-IPC_MESSAGE_ROUTED1(ViewMsg_ChangeResizeRect,
- gfx::Rect /* resizer_rect */)
-
// Sent to inform the view that it was hidden. This allows it to reduce its
// resource utilization.
IPC_MESSAGE_ROUTED0(ViewMsg_WasHidden)
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index c6ea764..3df2a99 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -198,7 +198,6 @@ bool RenderWidget::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(ViewMsg_Close, OnClose)
IPC_MESSAGE_HANDLER(ViewMsg_CreatingNew_ACK, OnCreatingNewAck)
IPC_MESSAGE_HANDLER(ViewMsg_Resize, OnResize)
- IPC_MESSAGE_HANDLER(ViewMsg_ChangeResizeRect, OnChangeResizeRect)
IPC_MESSAGE_HANDLER(ViewMsg_WasHidden, OnWasHidden)
IPC_MESSAGE_HANDLER(ViewMsg_WasRestored, OnWasRestored)
IPC_MESSAGE_HANDLER(ViewMsg_WasSwappedOut, OnWasSwappedOut)
@@ -312,15 +311,6 @@ void RenderWidget::OnResize(const gfx::Size& new_size,
DidToggleFullscreen();
}
-void RenderWidget::OnChangeResizeRect(const gfx::Rect& resizer_rect) {
- if (resizer_rect_ != resizer_rect) {
- paint_aggregator_.InvalidateRect(resizer_rect_);
- paint_aggregator_.InvalidateRect(resizer_rect);
- resizer_rect_ = resizer_rect;
- webwidget_->didChangeWindowResizerRect();
- }
-}
-
void RenderWidget::OnWasHidden() {
TRACE_EVENT0("renderer", "RenderWidget::OnWasHidden");
// Go into a mode where we stop generating paint and scrolling events.
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 6a6d8eb..5c11923 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -207,7 +207,6 @@ class CONTENT_EXPORT RenderWidget
virtual void OnResize(const gfx::Size& new_size,
const gfx::Rect& resizer_rect,
bool is_fullscreen);
- void OnChangeResizeRect(const gfx::Rect& resizer_rect);
virtual void OnWasHidden();
virtual void OnWasRestored(bool needs_repainting);
virtual void OnWasSwappedOut();