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

skia/ext/vector_platform_device_emf_win.h

 // 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.
 
 #ifndef SKIA_EXT_VECTOR_PLATFORM_DEVICE_EMF_WIN_H_
 #define SKIA_EXT_VECTOR_PLATFORM_DEVICE_EMF_WIN_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "skia/ext/platform_device.h"
@@ skipping 41 matching lines @@
                               const SkPaint& paint,
                               SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE;
   virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
                           const SkMatrix& matrix,
                           const SkPaint& paint) OVERRIDE;
   virtual void drawSprite(const SkDraw& draw, const SkBitmap& bitmap,
                           int x, int y, const SkPaint& paint) OVERRIDE;
   virtual void drawText(const SkDraw& draw, const void* text, size_t len,
                         SkScalar x, SkScalar y, const SkPaint& paint) OVERRIDE;
   virtual void drawPosText(const SkDraw& draw, const void* text, size_t len,
-                           const SkScalar pos[], SkScalar constY,
-                           int scalarsPerPos, const SkPaint& paint) OVERRIDE;
+                           const SkScalar pos[], int scalarsPerPos,
+                           const SkPoint& offset, const SkPaint& paint) OVERRIDE;
   virtual void drawTextOnPath(const SkDraw& draw, const void* text, size_t len,
                               const SkPath& path, const SkMatrix* matrix,
                               const SkPaint& paint) OVERRIDE;
   virtual void drawVertices(const SkDraw& draw, SkCanvas::VertexMode,
                             int vertexCount,
                             const SkPoint verts[], const SkPoint texs[],
                             const SkColor colors[], SkXfermode* xmode,
                             const uint16_t indices[], int indexCount,
                             const SkPaint& paint) OVERRIDE;
   virtual void drawDevice(const SkDraw& draw, SkBaseDevice*, int x, int y,
@@ skipping 60 matching lines @@
 
 typedef void (*SkiaEnsureTypefaceCharactersAccessible)
     (const LOGFONT& font, const wchar_t* text, unsigned int text_length);
 
 SK_API void SetSkiaEnsureTypefaceCharactersAccessible(
     SkiaEnsureTypefaceCharactersAccessible func);
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_VECTOR_PLATFORM_DEVICE_EMF_WIN_H_