Roll src/third_party/skia b5fae93:c13bc57 (manual roll)

skia/ext/vector_platform_device_emf_win.cc

 // Copyright (c) 2012 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 "skia/ext/vector_platform_device_emf_win.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 492 matching lines @@
 }
 
 static size_t size_glyphid(const char* text) {
   return 2;
 }
 
 void VectorPlatformDeviceEmf::drawPosText(const SkDraw& draw,
                                           const void* text,
                                           size_t len,
                                           const SkScalar pos[],
-                                          SkScalar constY,
                                           int scalarsPerPos,
+                                          const SkPoint& offset,
                                           const SkPaint& paint) {
   SkGDIFontSetup setup;
   bool useDrawText = true;
 
   if (scalarsPerPos == 2 && len >= 2 &&
       SkPaint::kUTF8_TextEncoding != paint.getTextEncoding() &&
       setup.useGDI(hdc_, paint)) {
-    int startX = SkScalarRoundToInt(pos[0]);
-    int startY = SkScalarRoundToInt(pos[1] + getAscent(paint));
+    int startX = SkScalarRoundToInt(pos[0] + offset.x());
+    int startY = SkScalarRoundToInt(pos[1] + offset.y() + getAscent(paint));
     const int count = len >> 1;
     SkAutoSTMalloc<64, INT> storage(count);
     INT* advances = storage.get();
     for (int i = 0; i < count - 1; ++i) {
       advances[i] = SkScalarRoundToInt(pos[2] - pos[0]);
       pos += 2;
     }
     advances[count - 1] = 0;
     useDrawText = !EnsureExtTextOut(hdc_, startX, startY,
         getTextOutOptions(paint), 0, reinterpret_cast<const wchar_t*>(text),
@@ skipping 11 matching lines @@
       break;
     default:
       SkASSERT(SkPaint::kGlyphID_TextEncoding == paint.getTextEncoding());
       bytesPerCodePoint = size_glyphid;
       break;
     }
 
     const char* curr = reinterpret_cast<const char*>(text);
     const char* stop = curr + len;
     while (curr < stop) {
-      SkScalar y = (1 == scalarsPerPos) ? constY : pos[1];
+      SkScalar x = offset.x() + pos[0];
+      SkScalar y = offset.y() + (2 == scalarsPerPos ? pos[1] : 0);
+
       size_t bytes = bytesPerCodePoint(curr);
-      drawText(draw, curr, bytes, pos[0], y, paint);
+      drawText(draw, curr, bytes, x, y, paint);
       curr += bytes;
       pos += scalarsPerPos;
     }
   }
 }
 
 void VectorPlatformDeviceEmf::drawTextOnPath(const SkDraw& draw,
                                              const void* text,
                                              size_t len,
                                              const SkPath& path,
@@ skipping 409 matching lines @@
                                 pixels,
                                 reinterpret_cast<const BITMAPINFO*>(&hdr),
                                 DIB_RGB_COLORS,
                                 SRCCOPY);
   }
   EndPlatformPaint();
   Cleanup();
 }
 
 }  // namespace skia