Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / GrGpu.cpp

diff --git a/src/third_party/skia/src/gpu/GrGpu.cpp b/src/third_party/skia/src/gpu/GrGpu.cpp
index fd249de..0b49e74 100644 (file)
--- a/src/third_party/skia/src/gpu/GrGpu.cpp
+++ b/src/third_party/skia/src/gpu/GrGpu.cpp
@@ -85,14 +85,14 @@ void GrGpu::releaseResources() {
     fIndexPool = NULL;
 }
 
-void GrGpu::insertObject(GrGpuObject* object) {
+void GrGpu::insertObject(GrGpuResource* object) {
     SkASSERT(NULL != object);
     SkASSERT(this == object->getGpu());
 
     fObjectList.addToHead(object);
 }
 
-void GrGpu::removeObject(GrGpuObject* object) {
+void GrGpu::removeObject(GrGpuResource* object) {
     SkASSERT(NULL != object);
     SkASSERT(this == object->getGpu());
 
@@ -218,6 +218,12 @@ GrPath* GrGpu::createPath(const SkPath& path, const SkStrokeRec& stroke) {
     return this->onCreatePath(path, stroke);
 }
 
+GrPathRange* GrGpu::createPathRange(size_t size, const SkStrokeRec& stroke) {
+    SkASSERT(this->caps()->pathRenderingSupport());
+    this->handleDirtyContext();
+    return this->onCreatePathRange(size, stroke);
+}
+
 void GrGpu::clear(const SkIRect* rect,
                   GrColor color,
                   bool canIgnoreRect,
@@ -419,10 +425,10 @@ void GrGpu::onDrawPath(const GrPath* path, SkPath::FillType fill,
     this->onGpuDrawPath(path, fill);
 }
 
-void GrGpu::onDrawPaths(int pathCount, const GrPath** paths,
-                        const SkMatrix* transforms, SkPath::FillType fill,
-                        SkStrokeRec::Style style,
-                        const GrDeviceCoordTexture* dstCopy) {
+void GrGpu::onDrawPaths(const GrPathRange* pathRange,
+                        const uint32_t indices[], int count,
+                        const float transforms[], PathTransformType transformsType,
+                        SkPath::FillType fill, const GrDeviceCoordTexture* dstCopy) {
     this->handleDirtyContext();
 
     drawState()->setDefaultVertexAttribs();
@@ -432,7 +438,7 @@ void GrGpu::onDrawPaths(int pathCount, const GrPath** paths,
         return;
     }
 
-    this->onGpuDrawPaths(pathCount, paths, transforms, fill, style);
+    this->onGpuDrawPaths(pathRange, indices, count, transforms, transformsType, fill);
 }
 
 void GrGpu::finalizeReservedVertices() {