Merge 152061 - linux/npapi: correctly clip damage rect when checking if the background has changed.

content/renderer/webplugin_delegate_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #elif defined(USE_X11)
 #include <cairo/cairo.h>
@@ skipping 827 matching lines @@
                                      : -transform.ty;
   gfx::Rect full_content_rect(context_offset_x, context_offset_y,
                               CGBitmapContextGetWidth(context),
                               CGBitmapContextGetHeight(context));
 #else
   cairo_surface_t* page_surface = cairo_get_target(context);
   DCHECK_EQ(cairo_surface_get_type(page_surface), CAIRO_SURFACE_TYPE_IMAGE);
   DCHECK_EQ(cairo_image_surface_get_format(page_surface), CAIRO_FORMAT_ARGB32);
 
   // Transform context coordinates into surface coordinates.
-  double page_x_double = rect.x();
-  double page_y_double = rect.y();
-  cairo_user_to_device(context, &page_x_double, &page_y_double);
-  gfx::Rect full_content_rect(0, 0,
+  double page_x_double = 0;
+  double page_y_double = 0;
+  cairo_device_to_user(context, &page_x_double, &page_y_double);
+  gfx::Rect full_content_rect(static_cast<int>(page_x_double),
+                              static_cast<int>(page_y_double),
                               cairo_image_surface_get_width(page_surface),
                               cairo_image_surface_get_height(page_surface));
 #endif
   // According to comments in the Windows code, the damage rect that we're given
   // may project outside the image, so intersect their rects.
   gfx::Rect content_rect = rect.Intersect(full_content_rect);
 
 #if defined(OS_MACOSX)
   const unsigned char* page_bytes = static_cast<const unsigned char*>(
       CGBitmapContextGetData(context));
@@ skipping 12 matching lines @@
   int full_bg_width = CGBitmapContextGetWidth(bg_context);
   int full_bg_height = CGBitmapContextGetHeight(bg_context);
   int bg_stride = CGBitmapContextGetBytesPerRow(bg_context);
   int bg_last_row = CGBitmapContextGetHeight(bg_context) - 1;
 
   int bytes_per_pixel = CGBitmapContextGetBitsPerPixel(context) / 8;
 #else
   cairo_surface_flush(page_surface);
   const unsigned char* page_bytes = cairo_image_surface_get_data(page_surface);
   int page_stride = cairo_image_surface_get_stride(page_surface);
-  int page_start_x = static_cast<int>(page_x_double);
-  int page_start_y = static_cast<int>(page_y_double);
+  int page_start_x = content_rect.x() - static_cast<int>(page_x_double);
+  int page_start_y = content_rect.y() - static_cast<int>(page_y_double);
 
   skia::ScopedPlatformPaint scoped_platform_paint(
       background_store_.canvas.get());
   cairo_surface_t* bg_surface =cairo_get_target(
       scoped_platform_paint.GetPlatformSurface());
   DCHECK_EQ(cairo_surface_get_type(bg_surface), CAIRO_SURFACE_TYPE_IMAGE);
   DCHECK_EQ(cairo_image_surface_get_format(bg_surface), CAIRO_FORMAT_ARGB32);
   cairo_surface_flush(bg_surface);
   const unsigned char* bg_bytes = cairo_image_surface_get_data(bg_surface);
   int full_bg_width = cairo_image_surface_get_width(bg_surface);
@@ skipping 584 matching lines @@
 }
 #endif
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }