summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/render_widget_host.h
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-02 23:01:26 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-02 23:01:26 +0000
commit01b0df26a5cbdd2e66d244246d815695b7f2363a (patch)
treee3b048736aeafd4d61947825b4cbe7eeb256e58a /chrome/browser/renderer_host/render_widget_host.h
parentb959a02903739c2e78245e0afb5c97d6c433ccfb (diff)
downloadchromium_src-01b0df26a5cbdd2e66d244246d815695b7f2363a.zip
chromium_src-01b0df26a5cbdd2e66d244246d815695b7f2363a.tar.gz
chromium_src-01b0df26a5cbdd2e66d244246d815695b7f2363a.tar.bz2
Fix a DCHECK that I hit while working on the extension shelf for OS X.
BUG=Part of 19073 TEST=unittest in CL Review URL: http://codereview.chromium.org/185015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/render_widget_host.h')
-rw-r--r--chrome/browser/renderer_host/render_widget_host.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index 242d56b..b06bce3 100644
--- a/chrome/browser/renderer_host/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -460,6 +460,13 @@ class RenderWidgetHost : public IPC::Channel::Listener,
// The current size of the RenderWidget.
gfx::Size current_size_;
+ // The size we last sent as requested size to the renderer. |current_size_|
+ // is only updated once the resize message has been ack'd. This on the other
+ // hand is updated when the resize message is sent. This is very similar to
+ // |resize_ack_pending_|, but the latter is not set if the new size has width
+ // or height zero, which is why we need this too.
+ gfx::Size in_flight_size_;
+
// 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_;