| Index: content/browser/renderer_host/render_widget_host_view_gtk.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc
|
| index 849166352e763dde1af6f899436ad911b78b620f..395331267daa7af78a73df6230e017b1125d230c 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_gtk.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc
|
| @@ -758,7 +758,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewGtk::GetNativeViewAccessible() {
|
| }
|
|
|
| void RenderWidgetHostViewGtk::MovePluginWindows(
|
| - const gfx::Point& scroll_offset,
|
| + const gfx::Vector2d& scroll_offset,
|
| const std::vector<webkit::npapi::WebPluginGeometry>& moves) {
|
| for (size_t i = 0; i < moves.size(); ++i) {
|
| plugin_container_manager_.MovePluginContainer(moves[i]);
|
| @@ -1041,12 +1041,14 @@ void RenderWidgetHostViewGtk::CopyFromCompositingSurface(
|
| skia::PlatformBitmap* output) {
|
| base::ScopedClosureRunner scoped_callback_runner(base::Bind(callback, false));
|
|
|
| - const gfx::Rect bounds = GetViewBounds();
|
| + gfx::Rect src_subrect_in_view = src_subrect;
|
| + src_subrect_in_view.Offset(GetViewBounds().OffsetFromOrigin());
|
| +
|
| ui::XScopedImage image(XGetImage(ui::GetXDisplay(), ui::GetX11RootWindow(),
|
| - bounds.x() + src_subrect.x(),
|
| - bounds.y() + src_subrect.y(),
|
| - src_subrect.width(),
|
| - src_subrect.height(),
|
| + src_subrect_in_view.x(),
|
| + src_subrect_in_view.y(),
|
| + src_subrect_in_view.width(),
|
| + src_subrect_in_view.height(),
|
| AllPlanes, ZPixmap));
|
| if (!image.get())
|
| return;
|
|
|