Refactor: Move app/surface to ui/gfx/surface.

content/browser/renderer_host/backing_store_win.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/browser/renderer_host/backing_store_win.h"
 
-#include "app/surface/transport_dib.h"
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "skia/ext/platform_canvas.h"
 #include "ui/gfx/gdi_util.h"
+#include "ui/gfx/surface/transport_dib.h"
 
 namespace {
 
 // Creates a dib conforming to the height/width/section parameters passed in.
 HANDLE CreateDIB(HDC dc, int width, int height, int color_depth) {
   BITMAPV5HEADER hdr = {0};
   ZeroMemory(&hdr, sizeof(BITMAPV5HEADER));
 
   // These values are shared with gfx::PlatformDevice
   hdr.bV5Size = sizeof(BITMAPINFOHEADER);
@@ skipping 38 matching lines @@
     rv = StretchDIBits(hdc,
                        dest_x, dest_y, dest_w, dest_h,
                        src_x, bottom_up_src_y, src_w, src_h,
                        pixels, bitmap_info, DIB_RGB_COLORS, SRCCOPY);
   }
   DCHECK(rv != GDI_ERROR);
 }
 
 }  // namespace
 
-BackingStoreWin::BackingStoreWin(RenderWidgetHost* widget, const gfx::Size& size)
+BackingStoreWin::BackingStoreWin(RenderWidgetHost* widget,
+                                 const gfx::Size& size)
     : BackingStore(widget, size),
       backing_store_dib_(NULL),
       original_bitmap_(NULL) {
   HDC screen_dc = ::GetDC(NULL);
   color_depth_ = ::GetDeviceCaps(screen_dc, BITSPIXEL);
   // Color depths less than 16 bpp require a palette to be specified. Instead,
   // we specify the desired color depth as 16 which lets the OS to come up
   // with an approximation.
   if (color_depth_ < 16)
     color_depth_ = 16;
@@ skipping 83 matching lines @@
 
 void BackingStoreWin::ScrollBackingStore(int dx, int dy,
                                          const gfx::Rect& clip_rect,
                                          const gfx::Size& view_size) {
   RECT damaged_rect, r = clip_rect.ToRECT();
   ScrollDC(hdc_, dx, dy, NULL, &r, NULL, &damaged_rect);
 
   // TODO(darin): this doesn't work if dx and dy are both non-zero!
   DCHECK(dx == 0 || dy == 0);
 }