skia::PlatformCanvas is being deprecated. Going forward we will use gfx::Canvas wherever we need ...

views/widget/widget_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 "views/widget/widget_win.h"
 
 #include <dwmapi.h>
 
 #include "base/string_util.h"
 #include "base/win/windows_version.h"
@@ skipping 1059 matching lines @@
                    RDW_INVALIDATE | RDW_UPDATENOW | RDW_NOCHILDREN);
     }
   }
 }
 
 void WidgetWin::RedrawLayeredWindowContents() {
   if (layered_window_invalid_rect_.IsEmpty())
     return;
 
   // We need to clip to the dirty rect ourselves.
-  layered_window_contents_->save(SkCanvas::kClip_SaveFlag);
+  layered_window_contents_->skia_canvas()->save(SkCanvas::kClip_SaveFlag);
   layered_window_contents_->ClipRectInt(layered_window_invalid_rect_.x(),
                                         layered_window_invalid_rect_.y(),
                                         layered_window_invalid_rect_.width(),
                                         layered_window_invalid_rect_.height());
   GetRootView()->Paint(layered_window_contents_.get());
-  layered_window_contents_->restore();
+  layered_window_contents_->skia_canvas()->restore();
 
   RECT wr;
   GetWindowRect(&wr);
   SIZE size = {wr.right - wr.left, wr.bottom - wr.top};
   POINT position = {wr.left, wr.top};
-  HDC dib_dc = layered_window_contents_->beginPlatformPaint();
+  HDC dib_dc = layered_window_contents_->BeginPlatformPaint();
   POINT zero = {0, 0};
   BLENDFUNCTION blend = {AC_SRC_OVER, 0, layered_alpha_, AC_SRC_ALPHA};
   UpdateLayeredWindow(hwnd(), NULL, &position, &size, dib_dc, &zero,
                       RGB(0xFF, 0xFF, 0xFF), &blend, ULW_ALPHA);
   layered_window_invalid_rect_.SetRect(0, 0, 0, 0);
-  layered_window_contents_->endPlatformPaint();
+  layered_window_contents_->EndPlatformPaint();
 }
 
 void WidgetWin::ClientAreaSizeChanged() {
   RECT r;
   GetClientRect(&r);
   gfx::Size s(std::max(0, static_cast<int>(r.right - r.left)),
               std::max(0, static_cast<int>(r.bottom - r.top)));
   delegate_->OnSizeChanged(s);
   if (use_layered_buffer_) {
-    layered_window_contents_.reset(
-        new gfx::CanvasSkia(s.width(), s.height(), false));
+    layered_window_contents_.reset(new gfx::CanvasSkia);
+    layered_window_contents_->Init(s.width(), s.height(), false);
   }
 }
 
 gfx::AcceleratedWidget WidgetWin::GetAcceleratedWidget() {
   // TODO(beng):
   return gfx::kNullAcceleratedWidget;
 }
 
 void WidgetWin::DispatchKeyEventPostIME(const KeyEvent& key) {
   RootView* root_view = GetFocusedViewRootView();
@@ skipping 120 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views