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

views/widget/widget_win.cc

Index: views/widget/widget_win.cc
===================================================================
--- views/widget/widget_win.cc	(revision 82144)
+++ views/widget/widget_win.cc	(working copy)
@@ -1077,25 +1077,25 @@
     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() {
@@ -1105,8 +1105,8 @@
               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);
   }
 }