Removal of dependencies on PlatformDevice classes.

chrome/browser/ui/views/tabs/native_view_photobooth_win.cc

 // 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 "chrome/browser/ui/views/tabs/native_view_photobooth_win.h"
 
 #include "content/browser/tab_contents/tab_contents.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/point.h"
@@ skipping 92 matching lines @@
   // canvas' DIB.
   HDC target_dc = canvas->BeginPlatformPaint();
   HDC source_dc = GetDC(current_hwnd_);
   RECT window_rect = {0};
   GetWindowRect(current_hwnd_, &window_rect);
   BitBlt(target_dc, target_bounds.x(), target_bounds.y(),
          target_bounds.width(), target_bounds.height(), source_dc, 0, 0,
          SRCCOPY);
   // Windows screws up the alpha channel on all text it draws, and so we need
   // to call makeOpaque _after_ the blit to correct for this.
-  canvas->AsCanvasSkia()->getTopPlatformDevice().makeOpaque(
+  skia::MakeOpaque(
+      &canvas->AsCanvasSkia()->getTopDevice(),

[alokp, 2011/05/19 18:15:15]

could skia::MakeOpaque take canvas argument instead of device?

[Jeff Timanus, 2011/05/19 20:38:29]

Done.

       target_bounds.x(), target_bounds.y(), target_bounds.width(),
       target_bounds.height());
   ReleaseDC(current_hwnd_, source_dc);
   canvas->EndPlatformPaint();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // NativeViewPhotoboothWin, private:
 
 void NativeViewPhotoboothWin::CreateCaptureWindow(HWND initial_hwnd) {
@@ skipping 33 matching lines @@
   params.bounds = capture_bounds;
   capture_window_->Init(params);
   // If the capture window isn't visible, blitting from the TabContents'
   // HWND's DC to the capture bitmap produces blankness.
   capture_window_->Show();
   SetLayeredWindowAttributes(
       capture_window_->GetNativeView(), RGB(0xFF, 0xFF, 0xFF), 0xFF, LWA_ALPHA);
 
   Replace(initial_hwnd);
 }