From 8cffccac05cf4151653d689b3ba8d4b24aeae386 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Mon, 8 Dec 2014 13:45:40 -0800 Subject: [PATCH] Update from https://crrev.com/307330 Includes several sky updates for skia API changes and the gn format presubmit check from https://codereview.chromium.org/779193003/ Review URL: https://codereview.chromium.org/786123002 --- engine/platform/graphics/Gradient.cpp | 3 +-- engine/platform/graphics/InterceptingCanvas.h | 1 - engine/platform/graphics/LoggingCanvas.cpp | 7 ------- engine/platform/graphics/LoggingCanvas.h | 1 - engine/platform/graphics/Pattern.cpp | 3 +-- engine/platform/graphics/ProfilingCanvas.cpp | 6 ------ engine/platform/graphics/ProfilingCanvas.h | 1 - engine/platform/graphics/ReplayingCanvas.cpp | 6 ------ engine/platform/graphics/ReplayingCanvas.h | 1 - 9 files changed, 2 insertions(+), 27 deletions(-) diff --git a/engine/platform/graphics/Gradient.cpp b/engine/platform/graphics/Gradient.cpp index ccd85052294..e4abfe52a9c 100644 --- a/engine/platform/graphics/Gradient.cpp +++ b/engine/platform/graphics/Gradient.cpp @@ -32,7 +32,6 @@ #include "sky/engine/platform/graphics/GraphicsContext.h" #include "sky/engine/platform/graphics/skia/SkiaUtils.h" #include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkColorShader.h" #include "third_party/skia/include/core/SkShader.h" #include "third_party/skia/include/effects/SkGradientShader.h" @@ -260,7 +259,7 @@ SkShader* Gradient::shader() if (!m_gradient) { // use last color, since our "geometry" was degenerate (e.g. radius==0) - m_gradient = adoptRef(new SkColorShader(colors[countUsed - 1])); + m_gradient = adoptRef(SkShader::CreateColorShader(colors[countUsed - 1])); } return m_gradient.get(); } diff --git a/engine/platform/graphics/InterceptingCanvas.h b/engine/platform/graphics/InterceptingCanvas.h index dbf95676476..a3e9ba55bec 100644 --- a/engine/platform/graphics/InterceptingCanvas.h +++ b/engine/platform/graphics/InterceptingCanvas.h @@ -40,7 +40,6 @@ public: InterceptingCanvas(SkBitmap bitmap) : SkCanvas(bitmap), m_depthCount(0) { }; InterceptingCanvas(int width, int height) : SkCanvas(width, height), m_depthCount(0) { }; - virtual void clear(SkColor) override = 0; virtual void drawPaint(const SkPaint&) override = 0; virtual void drawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override = 0; virtual void drawRect(const SkRect&, const SkPaint&) override = 0; diff --git a/engine/platform/graphics/LoggingCanvas.cpp b/engine/platform/graphics/LoggingCanvas.cpp index 892b26d9636..18adab937c1 100644 --- a/engine/platform/graphics/LoggingCanvas.cpp +++ b/engine/platform/graphics/LoggingCanvas.cpp @@ -84,13 +84,6 @@ LoggingCanvas::LoggingCanvas(int width, int height) : InterceptingCanvas(width, m_log = JSONArray::create(); } -void LoggingCanvas::clear(SkColor color) -{ - AutoLogger logger(this); - logger.logItemWithParams("clear")->setString("color", stringForSkColor(color)); - this->SkCanvas::clear(color); -} - void LoggingCanvas::drawPaint(const SkPaint& paint) { AutoLogger logger(this); diff --git a/engine/platform/graphics/LoggingCanvas.h b/engine/platform/graphics/LoggingCanvas.h index b2a833b95c8..348301554ac 100644 --- a/engine/platform/graphics/LoggingCanvas.h +++ b/engine/platform/graphics/LoggingCanvas.h @@ -41,7 +41,6 @@ public: LoggingCanvas(int width, int height); PassRefPtr log(); - virtual void clear(SkColor) override; virtual void drawPaint(const SkPaint&) override; virtual void drawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override; virtual void drawRect(const SkRect&, const SkPaint&) override; diff --git a/engine/platform/graphics/Pattern.cpp b/engine/platform/graphics/Pattern.cpp index d29593f7274..3bd11121734 100644 --- a/engine/platform/graphics/Pattern.cpp +++ b/engine/platform/graphics/Pattern.cpp @@ -30,7 +30,6 @@ #include "sky/engine/platform/graphics/skia/SkiaUtils.h" #include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkColorShader.h" #include "v8/include/v8.h" namespace blink { @@ -64,7 +63,7 @@ SkShader* Pattern::shader() // If we don't have a bitmap, return a transparent shader. if (!m_tileImage) { - m_pattern = adoptRef(new SkColorShader(SK_ColorTRANSPARENT)); + m_pattern = adoptRef(SkShader::CreateColorShader(SK_ColorTRANSPARENT)); } else if (m_repeatMode == RepeatModeXY) { m_pattern = adoptRef(SkShader::CreateBitmapShader(m_tileImage->bitmap(), SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &localMatrix)); diff --git a/engine/platform/graphics/ProfilingCanvas.cpp b/engine/platform/graphics/ProfilingCanvas.cpp index 6faaa919dda..2940339011e 100644 --- a/engine/platform/graphics/ProfilingCanvas.cpp +++ b/engine/platform/graphics/ProfilingCanvas.cpp @@ -69,12 +69,6 @@ void ProfilingCanvas::setTimings(Vector* timings) m_timings = timings; } -void ProfilingCanvas::clear(SkColor color) -{ - AutoStamper stamper(this); - this->SkCanvas::clear(color); -} - void ProfilingCanvas::drawPaint(const SkPaint& paint) { AutoStamper stamper(this); diff --git a/engine/platform/graphics/ProfilingCanvas.h b/engine/platform/graphics/ProfilingCanvas.h index 007f8426f92..b390ab482b3 100644 --- a/engine/platform/graphics/ProfilingCanvas.h +++ b/engine/platform/graphics/ProfilingCanvas.h @@ -41,7 +41,6 @@ public: ProfilingCanvas(SkBitmap); void setTimings(Vector*); - virtual void clear(SkColor) override; virtual void drawPaint(const SkPaint&) override; virtual void drawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override; virtual void drawRect(const SkRect&, const SkPaint&) override; diff --git a/engine/platform/graphics/ReplayingCanvas.cpp b/engine/platform/graphics/ReplayingCanvas.cpp index db2433a854b..3c13a10b6ba 100644 --- a/engine/platform/graphics/ReplayingCanvas.cpp +++ b/engine/platform/graphics/ReplayingCanvas.cpp @@ -83,12 +83,6 @@ bool ReplayingCanvas::abortDrawing() return m_abortDrawing; } -void ReplayingCanvas::clear(SkColor color) -{ - AutoReplayer replayer(this); - this->SkCanvas::clear(color); -} - void ReplayingCanvas::drawPaint(const SkPaint& paint) { AutoReplayer replayer(this); diff --git a/engine/platform/graphics/ReplayingCanvas.h b/engine/platform/graphics/ReplayingCanvas.h index 99ca93a1163..a8e95415fc0 100644 --- a/engine/platform/graphics/ReplayingCanvas.h +++ b/engine/platform/graphics/ReplayingCanvas.h @@ -43,7 +43,6 @@ public: virtual bool abortDrawing() override; - virtual void clear(SkColor) override; virtual void drawPaint(const SkPaint&) override; virtual void drawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override; virtual void drawRect(const SkRect&, const SkPaint&) override;