diff options
-rw-r--r-- | chrome/browser/renderer_host/render_widget_host.h | 4 | ||||
-rw-r--r-- | chrome/browser/tab_contents/thumbnail_generator.cc | 2 | ||||
-rw-r--r-- | chrome/common/render_messages_params.h | 2 | ||||
-rw-r--r-- | chrome/renderer/render_view.cc | 4 | ||||
-rw-r--r-- | chrome/renderer/render_view.h | 2 | ||||
-rw-r--r-- | chrome/renderer/render_widget.cc | 4 | ||||
-rw-r--r-- | chrome/renderer/render_widget.h | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h index f13828a..f6b22ac 100644 --- a/chrome/browser/renderer_host/render_widget_host.h +++ b/chrome/browser/renderer_host/render_widget_host.h @@ -393,7 +393,7 @@ class RenderWidgetHost : public IPC::Channel::Listener, // Activate deferred plugin handles. void ActivateDeferredPluginHandles(); - const gfx::Size& last_scroll_offset() const { return last_scroll_offset_; } + const gfx::Point& last_scroll_offset() const { return last_scroll_offset_; } protected: // Internal implementation of the public Forward*Event() methods. @@ -669,7 +669,7 @@ class RenderWidgetHost : public IPC::Channel::Listener, std::vector<gfx::PluginWindowHandle> deferred_plugin_handles_; // The last scroll offset of the render widget. - gfx::Size last_scroll_offset_; + gfx::Point last_scroll_offset_; DISALLOW_COPY_AND_ASSIGN(RenderWidgetHost); }; diff --git a/chrome/browser/tab_contents/thumbnail_generator.cc b/chrome/browser/tab_contents/thumbnail_generator.cc index c0dd91d..dfa829a 100644 --- a/chrome/browser/tab_contents/thumbnail_generator.cc +++ b/chrome/browser/tab_contents/thumbnail_generator.cc @@ -649,7 +649,7 @@ void ThumbnailGenerator::UpdateThumbnailIfNecessary( // Compute the thumbnail score. ThumbnailScore score; score.at_top = - (tab_contents->render_view_host()->last_scroll_offset().height() == 0); + (tab_contents->render_view_host()->last_scroll_offset().y() == 0); score.boring_score = ThumbnailGenerator::CalculateBoringScore(&thumbnail); score.good_clipping = (clip_result == ThumbnailGenerator::kTallerThanWide || diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h index 0eeaa98..5ce030e 100644 --- a/chrome/common/render_messages_params.h +++ b/chrome/common/render_messages_params.h @@ -345,7 +345,7 @@ struct ViewHostMsg_UpdateRect_Params { gfx::Rect scroll_rect; // The scroll offset of the render view. - gfx::Size scroll_offset; + gfx::Point scroll_offset; // The regions of the bitmap (in view coords) that contain updated pixels. // In the case of scrolling, this includes the scroll damage rect. diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index fb63316..559647c 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -5130,9 +5130,9 @@ webkit::ppapi::PluginInstance* RenderView::GetBitmapForOptimizedPluginPaint( paint_bounds, dib, location, clip); } -gfx::Size RenderView::GetScrollOffset() { +gfx::Point RenderView::GetScrollOffset() { WebKit::WebSize scroll_offset = webview()->mainFrame()->scrollOffset(); - return gfx::Size(scroll_offset.width, scroll_offset.height); + return gfx::Point(scroll_offset.width, scroll_offset.height); } void RenderView::OnClearFocusedNode() { diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 7cbd422..7944059 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -648,7 +648,7 @@ class RenderView : public RenderWidget, TransportDIB** dib, gfx::Rect* location, gfx::Rect* clip); - virtual gfx::Size GetScrollOffset(); + virtual gfx::Point GetScrollOffset(); virtual void DidHandleKeyEvent(); virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event); virtual void OnSetFocus(bool enable); diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index 7e21813..28ff55f 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -988,9 +988,9 @@ webkit::ppapi::PluginInstance* RenderWidget::GetBitmapForOptimizedPluginPaint( return NULL; } -gfx::Size RenderWidget::GetScrollOffset() { +gfx::Point RenderWidget::GetScrollOffset() { // Bare RenderWidgets don't support scroll offset. - return gfx::Size(0, 0); + return gfx::Point(0, 0); } void RenderWidget::SetHidden(bool hidden) { diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index 04939f5..dac1efa 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -224,7 +224,7 @@ class RenderWidget : public IPC::Channel::Listener, // Gets the scroll offset of this widget, if this widget has a notion of // scroll offset. - virtual gfx::Size GetScrollOffset(); + virtual gfx::Point GetScrollOffset(); // Sets the "hidden" state of this widget. All accesses to is_hidden_ should // use this method so that we can properly inform the RenderThread of our |