| Index: content/renderer/render_view.h
|
| diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h
|
| index b34322c0c68432d6a3025b2dfbdb49cf4d4e3267..9a329c515473ca024425d5e2f922d4caffcef982 100644
|
| --- a/content/renderer/render_view.h
|
| +++ b/content/renderer/render_view.h
|
| @@ -559,6 +559,9 @@ class RenderView : public RenderWidget,
|
| unsigned long long event_id);
|
| virtual void didUpdateLayout(WebKit::WebFrame* frame);
|
| virtual void didChangeScrollOffset(WebKit::WebFrame* frame);
|
| + virtual void numberOfWheelEventHandlersChanged(unsigned num_handlers);
|
| + virtual void didChangeContentsSize(WebKit::WebFrame* frame,
|
| + const WebKit::WebSize& size);
|
| virtual void reportFindInPageMatchCount(int request_id,
|
| int count,
|
| bool final_update);
|
| @@ -732,6 +735,9 @@ class RenderView : public RenderWidget,
|
| // Send queued accessibility notifications from the renderer to the browser.
|
| void SendPendingAccessibilityNotifications();
|
|
|
| + // Called when the "pinned to left/right edge" state needs to be updated.
|
| + void UpdateScrollState(WebKit::WebFrame* frame);
|
| +
|
| // IPC message handlers ------------------------------------------------------
|
| //
|
| // The documentation for these functions should be in
|
| @@ -1084,6 +1090,15 @@ class RenderView : public RenderWidget,
|
| // states for the sizes).
|
| base::OneShotTimer<RenderView> check_preferred_size_timer_;
|
|
|
| + // These store the "is main frame is scrolled all the way to the left
|
| + // or right" state that was last sent to the browser.
|
| + bool cached_is_main_frame_pinned_to_left_;
|
| + bool cached_is_main_frame_pinned_to_right_;
|
| +
|
| + // These store the "has scrollbars" state last sent to the browser.
|
| + bool cached_has_main_frame_horizontal_scrollbar_;
|
| + bool cached_has_main_frame_vertical_scrollbar_;
|
| +
|
| #if defined(OS_MACOSX)
|
| // Track the fake plugin window handles allocated on the browser side for
|
| // the accelerated compositor and (currently) accelerated plugins so that
|
|
|