| Index: skia/ext/vector_platform_device_emf_win.cc
|
| ===================================================================
|
| --- skia/ext/vector_platform_device_emf_win.cc (revision 80484)
|
| +++ skia/ext/vector_platform_device_emf_win.cc (working copy)
|
| @@ -115,6 +115,9 @@
|
| SkASSERT(previous_pen_ == NULL);
|
| }
|
|
|
| +HDC VectorPlatformDeviceEmf::BeginPlatformPaint() {
|
| + return hdc_;
|
| +}
|
|
|
| void VectorPlatformDeviceEmf::drawPaint(const SkDraw& draw,
|
| const SkPaint& paint) {
|
| @@ -194,14 +197,14 @@
|
| 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();
|
| }
|
|
|
| @@ -227,7 +230,7 @@
|
| if (!ApplyPaint(paint)) {
|
| return;
|
| }
|
| - HDC dc = beginPlatformPaint();
|
| + HDC dc = BeginPlatformPaint();
|
| PlatformDevice::LoadPathToDC(dc, path);
|
| switch (paint.getStyle()) {
|
| case SkPaint::kFill_Style: {
|
| @@ -249,7 +252,7 @@
|
| SkASSERT(false);
|
| break;
|
| }
|
| - endPlatformPaint();
|
| + EndPlatformPaint();
|
| Cleanup();
|
| }
|
|
|
| @@ -656,7 +659,7 @@
|
| }
|
| }
|
|
|
| - HDC dc = beginPlatformPaint();
|
| + HDC dc = BeginPlatformPaint();
|
| BITMAPINFOHEADER hdr;
|
| FillBitmapInfoHeader(src_size_x, src_size_y, &hdr);
|
| if (is_translucent) {
|
| @@ -722,7 +725,7 @@
|
| SRCCOPY);
|
| SkASSERT(result);
|
| }
|
| - endPlatformPaint();
|
| + EndPlatformPaint();
|
| Cleanup();
|
| }
|
|
|
|
|