Changeset 76688 in webkit

Timestamp:

Jan 26, 2011 6:50:19 AM (13 years ago)

Author:

Patrick Gansterer

Message:

2011-01-26 Patrick Gansterer <Patrick Gansterer>

Reviewed by Andreas Kling.

[SKIA] Remove "current path" of GraphicsContext
​https://bugs.webkit.org/show_bug.cgi?id=53124

• platform/graphics/GraphicsContext.h:
• platform/graphics/skia/GraphicsContextSkia.cpp: (WebCore::GraphicsContext::clipPath): (WebCore::GraphicsContext::fillPath): (WebCore::GraphicsContext::strokePath):
• platform/graphics/skia/PathSkia.cpp: (WebCore::Path::strokeBoundingRect):
• platform/graphics/skia/PlatformContextSkia.cpp:
• platform/graphics/skia/PlatformContextSkia.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (1 diff)
• platform/graphics/skia/GraphicsContextSkia.cpp (modified) (5 diffs)
• platform/graphics/skia/PathSkia.cpp (modified) (1 diff)
• platform/graphics/skia/PlatformContextSkia.cpp (modified) (1 diff)
• platform/graphics/skia/PlatformContextSkia.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-26  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [SKIA] Remove "current path" of GraphicsContext
+        https://bugs.webkit.org/show_bug.cgi?id=53124
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::clipPath):
+        (WebCore::GraphicsContext::fillPath):
+        (WebCore::GraphicsContext::strokePath):
+        * platform/graphics/skia/PathSkia.cpp:
+        (WebCore::Path::strokeBoundingRect):
+        * platform/graphics/skia/PlatformContextSkia.cpp:
+        * platform/graphics/skia/PlatformContextSkia.h:
+
 2011-01-26  Zalan Bujtas <zbujtas@gmail.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -370 +370 @@
         CompositeOperator compositeOperation() const;
 
-#if PLATFORM(SKIA)
-        void beginPath();
-        void addPath(const Path&);
-#endif
-
         void clip(const Path&);
 

trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

@@ -310 +310 @@
 }
 
-void GraphicsContext::addPath(const Path& path)
-{
-    if (paintingDisabled())
-        return;
-    platformContext()->addPath(*path.platformPath());
-}
-
-void GraphicsContext::beginPath()
-{
-    if (paintingDisabled())
-        return;
-    platformContext()->beginPath();
-}
-
 void GraphicsContext::clearPlatformShadow()
 {
@@ -432 +418 @@
         platformContext()->gpuCanvas()->clipPath(pathToClip);
 
-    // FIXME: Be smarter about this.
-    beginPath();
-    addPath(pathToClip);
-
-    SkPath path = platformContext()->currentPathInLocalCoordinates();
+    SkPath path = *pathToClip.platformPath();
     if (!isPathSkiaSafe(getCTM(), path))
         return;
@@ -739 +721 @@
         return;
 
-    // FIXME: Be smarter about this.
-    beginPath();
-    addPath(pathToFill);
-
     if (platformContext()->useGPU() && platformContext()->canAccelerate()) {
         platformContext()->prepareForHardwareDraw();
@@ -749 +727 @@
     }
 
-    SkPath path = platformContext()->currentPathInLocalCoordinates();
+    SkPath path = *pathToFill.platformPath();
     if (!isPathSkiaSafe(getCTM(), path))
       return;
@@ -1205 +1183 @@
         return;
 
-    // FIXME: Be smarter about this.
-    beginPath();
-    addPath(pathToStroke);
-
-    SkPath path = platformContext()->currentPathInLocalCoordinates();
+    SkPath path = *pathToStroke.platformPath();
     if (!isPathSkiaSafe(getCTM(), path))
         return;

trunk/Source/WebCore/platform/graphics/skia/PathSkia.cpp

@@ -228 +228 @@
 }
 
-// Computes the bounding box for the stroke and style currently selected into
-// the given bounding box. This also takes into account the stroke width.
-static FloatRect boundingBoxForCurrentStroke(const GraphicsContext* context)
-{
-    SkPaint paint;
-    context->platformContext()->setupPaintForStroking(&paint, 0, 0);
-    SkPath boundingPath;
-    paint.getFillPath(context->platformContext()->currentPathInLocalCoordinates(), &boundingPath);
-    return boundingPath.getBounds();
-}
-
 FloatRect Path::strokeBoundingRect(StrokeStyleApplier* applier)
 {
     GraphicsContext* scratch = scratchContext();
     scratch->save();
-    scratch->beginPath();
-    scratch->addPath(*this);
 
     if (applier)
         applier->strokeStyle(scratch);
 
-    FloatRect r = boundingBoxForCurrentStroke(scratch);
+    SkPaint paint;
+    scratch->platformContext()->setupPaintForStroking(&paint, 0, 0);
+    SkPath boundingPath;
+    paint.getFillPath(*platformPath(), &boundingPath);
+
+    FloatRect r = boundingPath.getBounds();
     scratch->restore();
     return r;

trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp

@@ -551 +551 @@
 }
 
-void PlatformContextSkia::beginPath()
-{
-    m_path.reset();
-}
-
-void PlatformContextSkia::addPath(const SkPath& path)
-{
-    m_path.addPath(path, m_canvas->getTotalMatrix());
-}
-
-SkPath PlatformContextSkia::currentPathInLocalCoordinates() const
-{
-    SkPath localPath = m_path;
-    const SkMatrix& matrix = m_canvas->getTotalMatrix();
-    SkMatrix inverseMatrix;
-    if (!matrix.invert(&inverseMatrix))
-        return SkPath();
-    localPath.transform(inverseMatrix);
-    return localPath;
-}
-
 void PlatformContextSkia::canvasClipPath(const SkPath& path)
 {
     m_state->m_canvasClipApplied = true;
     m_canvas->clipPath(path);
-}
-
-void PlatformContextSkia::setFillRule(SkPath::FillType fr)
-{
-    m_path.setFillType(fr);
 }
 

trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.h

@@ -119 +119 @@
     void setLineCap(SkPaint::Cap);
     void setLineJoin(SkPaint::Join);
-    void setFillRule(SkPath::FillType);
     void setXfermodeMode(SkXfermode::Mode);
     void setFillColor(SkColor);
@@ -137 +136 @@
     float getAlpha() const;
     int getNormalizedAlpha() const;
-
-    void beginPath();
-    void addPath(const SkPath&);
-    SkPath currentPathInLocalCoordinates() const;
 
     void canvasClipPath(const SkPath&);
@@ -221 +216 @@
     State* m_state;
 
-    // Current path in global coordinates.
-    SkPath m_path;
-
     // Stores image sizes for a hint to compute image resampling modes.
     // Values are used in ImageSkia.cpp