Merge 216933 "aura: Fix crash in RootWindowHostX11::GetXImage()."

ui/aura/root_window_host_x11.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 "ui/aura/root_window_host_x11.h"
 
 #include <strings.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XInput2.h>
@@ skipping 774 matching lines @@
     ui::SetIntProperty(xwindow_,
                        k_NET_WM_USER_TIME,
                        k_NET_WM_USER_TIME,
                        0);
   }
 }
 
 bool RootWindowHostX11::CopyAreaToSkCanvas(const gfx::Rect& source_bounds,
                                              const gfx::Point& dest_offset,
                                              SkCanvas* canvas) {
-  scoped_ptr<ui::XScopedImage> scoped_image(GetXImage(source_bounds));
-  if (!scoped_image)
+  ui::XScopedImage scoped_image(
+      XGetImage(xdisplay_, xwindow_,
+                source_bounds.x(), source_bounds.y(),
+                source_bounds.width(), source_bounds.height(),
+                AllPlanes, ZPixmap));
+  XImage* image = scoped_image.get();
+  if (!image) {
+    LOG(ERROR) << "XGetImage failed";
     return false;
-
-  XImage* image = scoped_image->get();
-  DCHECK(image);
+  }
 
   if (image->bits_per_pixel == 32) {
     if ((0xff << SK_R32_SHIFT) != image->red_mask ||
         (0xff << SK_G32_SHIFT) != image->green_mask ||
         (0xff << SK_B32_SHIFT) != image->blue_mask) {
       LOG(WARNING) << "XImage and Skia byte orders differ";
       return false;
     }
 
     // Set the alpha channel before copying to the canvas.  Otherwise, areas of
@@ skipping 229 matching lines @@
     // host window, then convert it back to this host window's coordinate.
     screen_position_client->ConvertHostPointToScreen(root_window, &location);
     screen_position_client->ConvertPointFromScreen(root_window, &location);
     root_window->ConvertPointToHost(&location);
     event->set_location(location);
     event->set_root_location(location);
   }
   delegate_->OnHostMouseEvent(event);
 }
 
-scoped_ptr<ui::XScopedImage> RootWindowHostX11::GetXImage(
-    const gfx::Rect& snapshot_bounds) {
-  scoped_ptr<ui::XScopedImage> image(new ui::XScopedImage(
-      XGetImage(xdisplay_, xwindow_,
-                snapshot_bounds.x(), snapshot_bounds.y(),
-                snapshot_bounds.width(), snapshot_bounds.height(),
-                AllPlanes, ZPixmap)));
-  if (!image) {
-    LOG(ERROR) << "XGetImage failed";
-    image.reset();
-  }
-  return image.Pass();
-}
-
 void RootWindowHostX11::UpdateIsInternalDisplay() {
   RootWindow* root_window = GetRootWindow();
   gfx::Screen* screen = gfx::Screen::GetScreenFor(root_window);
   gfx::Display display = screen->GetDisplayNearestWindow(root_window);
   is_internal_display_ = display.IsInternal();
 }
 
 void RootWindowHostX11::SetCrOSTapPaused(bool state) {
 #if defined(OS_CHROMEOS)
   // Temporarily pause tap-to-click when the cursor is hidden.
@@ skipping 34 matching lines @@
 }
 
 namespace test {
 
 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) {
   default_override_redirect = override_redirect;
 }
 
 }  // namespace test
 }  // namespace aura