Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas"

Browse Source
This commit is contained in:
Derek Sollenberger
2015-01-30 14:25:22 +00:00
committed by Android (Google) Code Review
parent 9a1eefe174 b3d50e0075
commit c4e4eef64a
7 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android/graphics/Camera.cpp
View File

@@ -96,7 +96,7 @@ static void Camera_getMatrix(JNIEnv* env, jobject obj, jlong matrixHandle) {
}
static void Camera_applyToCanvas(JNIEnv* env, jobject obj, jlong canvasHandle) {
SkCanvas* canvas = reinterpret_cast<android::Canvas*>(canvasHandle)->getSkCanvas();
SkCanvas* canvas = reinterpret_cast<android::Canvas*>(canvasHandle)->asSkCanvas();
jlong viewHandle = env->GetLongField(obj, gNativeInstanceFieldID);
Sk3DView* v = reinterpret_cast<Sk3DView*>(viewHandle);
v->applyToCanvas(canvas);

2
core/jni/android/graphics/Graphics.cpp
View File

@@ -366,7 +366,7 @@ SkCanvas* GraphicsJNI::getNativeCanvas(JNIEnv* env, jobject canvas) {
if (!canvasHandle) {
return NULL;
}
SkCanvas* c = reinterpret_cast<android::Canvas*>(canvasHandle)->getSkCanvas();
SkCanvas* c = reinterpret_cast<android::Canvas*>(canvasHandle)->asSkCanvas();
SkASSERT(c);
return c;
}

4
core/jni/android/graphics/NinePatch.cpp
View File

@@ -120,7 +120,7 @@ public:
static void drawF(JNIEnv* env, jobject, jlong canvasHandle, jobject boundsRectF,
jlong bitmapHandle, jlong chunkHandle, jlong paintHandle,
jint destDensity, jint srcDensity) {
SkCanvas* canvas = reinterpret_cast<Canvas*>(canvasHandle)->getSkCanvas();
SkCanvas* canvas = reinterpret_cast<Canvas*>(canvasHandle)->asSkCanvas();
const SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(bitmapHandle);
Res_png_9patch* chunk = reinterpret_cast<Res_png_9patch*>(chunkHandle);
const Paint* paint = reinterpret_cast<Paint*>(paintHandle);
@@ -139,7 +139,7 @@ public:
static void drawI(JNIEnv* env, jobject, jlong canvasHandle, jobject boundsRect,
jlong bitmapHandle, jlong chunkHandle, jlong paintHandle,
jint destDensity, jint srcDensity) {
SkCanvas* canvas = reinterpret_cast<Canvas*>(canvasHandle)->getSkCanvas();
SkCanvas* canvas = reinterpret_cast<Canvas*>(canvasHandle)->asSkCanvas();
const SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(bitmapHandle);
Res_png_9patch* chunk = reinterpret_cast<Res_png_9patch*>(chunkHandle);
const Paint* paint = reinterpret_cast<Paint*>(paintHandle);

2
core/jni/android/graphics/Picture.cpp
View File

@@ -101,7 +101,7 @@ void Picture::draw(Canvas* canvas) {
}
validate();
if (NULL != mPicture.get()) {
mPicture.get()->playback(canvas->getSkCanvas());
mPicture.get()->playback(canvas->asSkCanvas());
}
}

2
libs/hwui/Canvas.h
View File

@@ -50,7 +50,7 @@ public:
// moved within this interface! Further, the return value should
// NOT be unref'd and is valid until this canvas is destroyed or a
// new bitmap is set.
virtual SkCanvas* getSkCanvas() = 0;
virtual SkCanvas* asSkCanvas() = 0;
virtual void setBitmap(SkBitmap* bitmap, bool copyState) = 0;

2
libs/hwui/DisplayListRenderer.h
View File

@@ -136,7 +136,7 @@ public:
// ----------------------------------------------------------------------------
// android/graphics/Canvas interface
// ----------------------------------------------------------------------------
virtual SkCanvas* getSkCanvas() override {
virtual SkCanvas* asSkCanvas() override {
LOG_ALWAYS_FATAL("DisplayListRenderer has no SkCanvas");
return nullptr;
}

99
libs/hwui/SkiaCanvas.cpp
View File

@@ -46,82 +46,87 @@ public:
canvas->ref();
}
virtual SkCanvas* getSkCanvas() {
virtual SkCanvas* asSkCanvas() override {
return mCanvas.get();
}
virtual void setBitmap(SkBitmap* bitmap, bool copyState);
virtual void setBitmap(SkBitmap* bitmap, bool copyState) override;
virtual bool isOpaque();
virtual int width();
virtual int height();
virtual bool isOpaque() override;
virtual int width() override;
virtual int height() override;
virtual int getSaveCount() const;
virtual int save(SkCanvas::SaveFlags flags);
virtual void restore();
virtual void restoreToCount(int saveCount);
virtual int getSaveCount() const override;
virtual int save(SkCanvas::SaveFlags flags) override;
virtual void restore() override;
virtual void restoreToCount(int saveCount) override;
virtual int saveLayer(float left, float top, float right, float bottom,
const SkPaint* paint, SkCanvas::SaveFlags flags);
const SkPaint* paint, SkCanvas::SaveFlags flags) override;
virtual int saveLayerAlpha(float left, float top, float right, float bottom,
int alpha, SkCanvas::SaveFlags flags);
int alpha, SkCanvas::SaveFlags flags) override;
virtual void getMatrix(SkMatrix* outMatrix) const;
virtual void setMatrix(const SkMatrix& matrix);
virtual void concat(const SkMatrix& matrix);
virtual void rotate(float degrees);
virtual void scale(float sx, float sy);
virtual void skew(float sx, float sy);
virtual void translate(float dx, float dy);
virtual void getMatrix(SkMatrix* outMatrix) const override;
virtual void setMatrix(const SkMatrix& matrix) override;
virtual void concat(const SkMatrix& matrix) override;
virtual void rotate(float degrees) override;
virtual void scale(float sx, float sy) override;
virtual void skew(float sx, float sy) override;
virtual void translate(float dx, float dy) override;
virtual bool getClipBounds(SkRect* outRect) const;
virtual bool quickRejectRect(float left, float top, float right, float bottom) const;
virtual bool quickRejectPath(const SkPath& path) const;
virtual bool clipRect(float left, float top, float right, float bottom, SkRegion::Op op);
virtual bool clipPath(const SkPath* path, SkRegion::Op op);
virtual bool clipRegion(const SkRegion* region, SkRegion::Op op);
virtual bool getClipBounds(SkRect* outRect) const override;
virtual bool quickRejectRect(float left, float top, float right, float bottom) const override;
virtual bool quickRejectPath(const SkPath& path) const override;
virtual bool clipRect(float left, float top, float right, float bottom,
SkRegion::Op op) override;
virtual bool clipPath(const SkPath* path, SkRegion::Op op) override;
virtual bool clipRegion(const SkRegion* region, SkRegion::Op op) override;
virtual SkDrawFilter* getDrawFilter();
virtual void setDrawFilter(SkDrawFilter* drawFilter);
virtual SkDrawFilter* getDrawFilter() override;
virtual void setDrawFilter(SkDrawFilter* drawFilter) override;
virtual void drawColor(int color, SkXfermode::Mode mode);
virtual void drawPaint(const SkPaint& paint);
virtual void drawColor(int color, SkXfermode::Mode mode) override;
virtual void drawPaint(const SkPaint& paint) override;
virtual void drawPoint(float x, float y, const SkPaint& paint);
virtual void drawPoints(const float* points, int count, const SkPaint& paint);
virtual void drawPoint(float x, float y, const SkPaint& paint) override;
virtual void drawPoints(const float* points, int count, const SkPaint& paint) override;
virtual void drawLine(float startX, float startY, float stopX, float stopY,
const SkPaint& paint);
virtual void drawLines(const float* points, int count, const SkPaint& paint);
virtual void drawRect(float left, float top, float right, float bottom, const SkPaint& paint);
const SkPaint& paint) override;
virtual void drawLines(const float* points, int count, const SkPaint& paint) override;
virtual void drawRect(float left, float top, float right, float bottom,
const SkPaint& paint) override;
virtual void drawRoundRect(float left, float top, float right, float bottom,
float rx, float ry, const SkPaint& paint);
virtual void drawCircle(float x, float y, float radius, const SkPaint& paint);
virtual void drawOval(float left, float top, float right, float bottom, const SkPaint& paint);
float rx, float ry, const SkPaint& paint) override;
virtual void drawCircle(float x, float y, float radius, const SkPaint& paint) override;
virtual void drawOval(float left, float top, float right, float bottom,
const SkPaint& paint) override;
virtual void drawArc(float left, float top, float right, float bottom,
float startAngle, float sweepAngle, bool useCenter, const SkPaint& paint);
virtual void drawPath(const SkPath& path, const SkPaint& paint);
float startAngle, float sweepAngle, bool useCenter, const SkPaint& paint) override;
virtual void drawPath(const SkPath& path, const SkPaint& paint) override;
virtual void drawVertices(SkCanvas::VertexMode vertexMode, int vertexCount,
const float* verts, const float* tex, const int* colors,
const uint16_t* indices, int indexCount, const SkPaint& paint);
const uint16_t* indices, int indexCount, const SkPaint& paint) override;
virtual void drawBitmap(const SkBitmap& bitmap, float left, float top, const SkPaint* paint);
virtual void drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix, const SkPaint* paint);
virtual void drawBitmap(const SkBitmap& bitmap, float left, float top,
const SkPaint* paint) override;
virtual void drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix,
const SkPaint* paint) override;
virtual void drawBitmap(const SkBitmap& bitmap, float srcLeft, float srcTop,
float srcRight, float srcBottom, float dstLeft, float dstTop,
float dstRight, float dstBottom, const SkPaint* paint);
float dstRight, float dstBottom, const SkPaint* paint) override;
virtual void drawBitmapMesh(const SkBitmap& bitmap, int meshWidth, int meshHeight,
const float* vertices, const int* colors, const SkPaint* paint);
const float* vertices, const int* colors, const SkPaint* paint) override;
virtual void drawText(const uint16_t* text, const float* positions, int count,
const SkPaint& paint, float x, float y,
float boundsLeft, float boundsTop, float boundsRight, float boundsBottom,
float totalAdvance);
float totalAdvance) override;
virtual void drawPosText(const uint16_t* text, const float* positions, int count,
int posCount, const SkPaint& paint);
int posCount, const SkPaint& paint) override;
virtual void drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path,
float hOffset, float vOffset, const SkPaint& paint);
float hOffset, float vOffset, const SkPaint& paint) override;
virtual bool drawTextAbsolutePos() const { return true; }
virtual bool drawTextAbsolutePos() const override { return true; }
private:
struct SaveRec {