Fixed a few styles issues in skia::PlatformDevice. Made function names consistent. Added Begin/En...

skia/ext/vector_platform_device_emf_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 <windows.h>
 
 #include "skia/ext/vector_platform_device_emf_win.h"
 
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/skia_utils_win.h"
@@ skipping 97 matching lines @@
       previous_pen_(NULL),
       alpha_blend_used_(false) {
   transform_.reset();
 }
 
 VectorPlatformDeviceEmf::~VectorPlatformDeviceEmf() {
   SkASSERT(previous_brush_ == NULL);
   SkASSERT(previous_pen_ == NULL);
 }
 
+HDC VectorPlatformDeviceEmf::BeginPlatformPaint() {
+  return hdc_;
+}
 
 void VectorPlatformDeviceEmf::drawPaint(const SkDraw& draw,
                                         const SkPaint& paint) {
   // TODO(maruel):  Bypass the current transformation matrix.
   SkRect rect;
   rect.fLeft = 0;
   rect.fTop = 0;
   rect.fRight = SkIntToScalar(width() + 1);
   rect.fBottom = SkIntToScalar(height() + 1);
   drawRect(draw, rect, paint);
@@ skipping 59 matching lines @@
     SkSafeUnref(paint_no_effet.setPathEffect(NULL));
 
     // Draw the calculated path.
     drawPath(draw, path_modified, paint_no_effet);
     return;
   }
 
   if (!ApplyPaint(paint)) {
     return;
   }
-  HDC dc = beginPlatformPaint();
+  HDC dc = BeginPlatformPaint();
   if (!Rectangle(dc, SkScalarRound(rect.fLeft),
                  SkScalarRound(rect.fTop),
                  SkScalarRound(rect.fRight),
                  SkScalarRound(rect.fBottom))) {
     SkASSERT(false);
   }
-  endPlatformPaint();
+  EndPlatformPaint();
   Cleanup();
 }
 
 void VectorPlatformDeviceEmf::drawPath(const SkDraw& draw,
                                        const SkPath& path,
                                        const SkPaint& paint,
                                        const SkMatrix* prePathMatrix,
                                        bool pathIsMutable) {
   if (paint.getPathEffect()) {
     // Apply the path effect forehand.
     SkPath path_modified;
     paint.getFillPath(path, &path_modified);
 
     // Removes the path effect from the temporary SkPaint object.
     SkPaint paint_no_effet(paint);
     SkSafeUnref(paint_no_effet.setPathEffect(NULL));
 
     // Draw the calculated path.
     drawPath(draw, path_modified, paint_no_effet);
     return;
   }
 
   if (!ApplyPaint(paint)) {
     return;
   }
-  HDC dc = beginPlatformPaint();
+  HDC dc = BeginPlatformPaint();
   PlatformDevice::LoadPathToDC(dc, path);
   switch (paint.getStyle()) {
     case SkPaint::kFill_Style: {
       BOOL res = StrokeAndFillPath(dc);
       SkASSERT(res != 0);
       break;
     }
     case SkPaint::kStroke_Style: {
       BOOL res = StrokePath(dc);
       SkASSERT(res != 0);
       break;
     }
     case SkPaint::kStrokeAndFill_Style: {
       BOOL res = StrokeAndFillPath(dc);
       SkASSERT(res != 0);
       break;
     }
     default:
       SkASSERT(false);
       break;
   }
-  endPlatformPaint();
+  EndPlatformPaint();
   Cleanup();
 }
 
 void VectorPlatformDeviceEmf::drawBitmap(const SkDraw& draw,
                                          const SkBitmap& bitmap,
                                          const SkIRect* srcRectOrNull,
                                          const SkMatrix& matrix,
                                          const SkPaint& paint) {
   // Load the temporary matrix. This is what will translate, rotate and resize
   // the bitmap.
@@ skipping 386 matching lines @@
       for (int x2 = 0; x2 < src_size_x; ++x2) {
         if (SkColorGetA(pixels[(y2 * row_length) + x2]) != 255) {
           is_translucent = true;
           y2 = src_size_y;
           break;
         }
       }
     }
   }
 
-  HDC dc = beginPlatformPaint();
+  HDC dc = BeginPlatformPaint();
   BITMAPINFOHEADER hdr;
   FillBitmapInfoHeader(src_size_x, src_size_y, &hdr);
   if (is_translucent) {
     // The image must be loaded as a bitmap inside a device context.
     HDC bitmap_dc = ::CreateCompatibleDC(dc);
     void* bits = NULL;
     HBITMAP hbitmap = ::CreateDIBSection(
         bitmap_dc, reinterpret_cast<const BITMAPINFO*>(&hdr),
         DIB_RGB_COLORS, &bits, NULL, 0);
 
@@ skipping 45 matching lines @@
                                 x, y,  // Destination origin.
                                 src_size_x, src_size_y,
                                 0, 0,  // Source origin.
                                 src_size_x, src_size_y,  // Source size.
                                 pixels,
                                 reinterpret_cast<const BITMAPINFO*>(&hdr),
                                 DIB_RGB_COLORS,
                                 SRCCOPY);
     SkASSERT(result);
   }
-  endPlatformPaint();
+  EndPlatformPaint();
   Cleanup();
 }
 
 }  // namespace skia