DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update from https://crrev.com/307330

Browse Source 
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
This commit is contained in:
James Robinson 2014-12-08 13:45:40 -08:00
parent c37e637852
commit 8cffccac05
9 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/platform/graphics/Gradient.cpp
View File

@ -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();
}

1
engine/platform/graphics/InterceptingCanvas.h
View File

@ -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;

7
engine/platform/graphics/LoggingCanvas.cpp
View File

@ -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);

1
engine/platform/graphics/LoggingCanvas.h
View File

@ -41,7 +41,6 @@ public:
LoggingCanvas(int width, int height);
PassRefPtr<JSONArray> 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;

3
engine/platform/graphics/Pattern.cpp
View File

@ -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));

6
engine/platform/graphics/ProfilingCanvas.cpp
View File

@ -69,12 +69,6 @@ void ProfilingCanvas::setTimings(Vector<double>* 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);

1
engine/platform/graphics/ProfilingCanvas.h
View File

@ -41,7 +41,6 @@ public:
ProfilingCanvas(SkBitmap);
void setTimings(Vector<double>*);
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;

6
engine/platform/graphics/ReplayingCanvas.cpp
View File

@ -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);

1
engine/platform/graphics/ReplayingCanvas.h
View File

@ -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;