Limit manual control of platform painting

content/browser/compositor/software_output_device_win.cc

 // Copyright 2014 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/compositor/software_output_device_win.h"
 
 #include "base/debug/alias.h"
 #include "base/memory/shared_memory.h"
 #include "cc/resources/shared_bitmap.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 162 matching lines @@
     SIZE size = {wr.right - wr.left, wr.bottom - wr.top};
     POINT position = {wr.left, wr.top};
     POINT zero = {0, 0};
     BLENDFUNCTION blend = {AC_SRC_OVER, 0x00, 0xFF, AC_SRC_ALPHA};
 
     DWORD style = GetWindowLong(hwnd_, GWL_EXSTYLE);
     style &= ~WS_EX_COMPOSITED;
     style |= WS_EX_LAYERED;
     SetWindowLong(hwnd_, GWL_EXSTYLE, style);
 
-    HDC dib_dc = skia::BeginPlatformPaint(contents_.get());
+    skia::ScopedPlatformPaint spp (contents_.get());

[f(malita), 2016/03/29 17:31:07]

Nit: extra space

[tomhudson, 2016/03/29 17:47:31]

Done.

+    HDC dib_dc = spp.GetPlatformSurface();
     ::UpdateLayeredWindow(hwnd_, NULL, &position, &size, dib_dc, &zero,
                           RGB(0xFF, 0xFF, 0xFF), &blend, ULW_ALPHA);
-    skia::EndPlatformPaint(contents_.get());
   } else {
     HDC hdc = ::GetDC(hwnd_);
     RECT src_rect = rect.ToRECT();
     skia::DrawToNativeContext(contents_.get(), hdc, rect.x(), rect.y(),
                               &src_rect);
     ::ReleaseDC(hwnd_, hdc);
   }
 }
 
 void SoftwareOutputDeviceWin::ReleaseContents() {
   DCHECK(!contents_ || contents_->unique());
   DCHECK(!in_paint_);
   contents_.clear();
 }
 
 }  // namespace content