encounter/engine
0
0
Fork 0
mirror of https://github.com/encounter/engine.git synced 2026-03-30 11:09:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Roll Skia to the latest revision to pick up drawAtlas fix

Browse Source 
R=chinmaygarde@google.com
This commit is contained in:
Eric Seidel
2015-07-24 10:53:31 -07:00
parent 00823e6e68
commit 244cebd496
9 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DEPS
+1 -1
View File
@@ -19,7 +19,7 @@
vars = {
'chromium_git': 'https://chromium.googlesource.com',
'skia_revision': '2ced78866fcadd98895777c8dffe92e229775181',
'skia_revision': '29ccdf86ab0a1649fd775c9431891bacb1391e99',
'dart_revision': 'e5e3d161e70d862608e6597facdf5ac8ae9ab2c3',
'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485',
skia/ext/analysis_canvas.cc
+1 -1
View File
@@ -191,7 +191,7 @@ void AnalysisCanvas::onDrawBitmapRect(const SkBitmap&,
const SkRect* src,
const SkRect& dst,
const SkPaint* paint,
DrawBitmapRectFlags flags) {
SrcRectConstraint flags) {
// Call drawRect to determine transparency,
// but reset solid color to false.
SkPaint tmpPaint;
skia/ext/analysis_canvas.h
+1 -1
View File
@@ -48,7 +48,7 @@ class SK_API AnalysisCanvas : public SkCanvas,
const SkRect* src,
const SkRect& dst,
const SkPaint* paint,
DrawBitmapRectFlags flags) override;
SrcRectConstraint flags) override;
void onDrawBitmapNine(const SkBitmap& bitmap,
const SkIRect& center,
const SkRect& dst,
skia/ext/benchmarking_canvas.cc
+4 -3
View File
@@ -702,7 +702,7 @@ void BenchmarkingCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
const SkRect* src,
const SkRect& dst,
const SkPaint* paint,
DrawBitmapRectFlags flags) {
SrcRectConstraint flags) {
AutoOp op(this, "DrawBitmapRect", paint);
op.addParam("bitmap", AsValue(bitmap));
if (src)
@@ -726,7 +726,8 @@ void BenchmarkingCanvas::onDrawImage(const SkImage* image,
}
void BenchmarkingCanvas::onDrawImageRect(const SkImage* image, const SkRect* src,
const SkRect& dst, const SkPaint* paint) {
const SkRect& dst, const SkPaint* paint,
SrcRectConstraint flags) {
DCHECK(image);
AutoOp op(this, "DrawImageRect", paint);
op.addParam("image", AsValue(*image));
@@ -734,7 +735,7 @@ void BenchmarkingCanvas::onDrawImageRect(const SkImage* image, const SkRect* src
op.addParam("src", AsValue(*src));
op.addParam("dst", AsValue(dst));
INHERITED::onDrawImageRect(image, src, dst, op.paint());
INHERITED::onDrawImageRect(image, src, dst, op.paint(), flags);
}
void BenchmarkingCanvas::onDrawBitmapNine(const SkBitmap& bitmap,
skia/ext/benchmarking_canvas.h
+2 -2
View File
@@ -60,10 +60,10 @@ protected:
void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst,
const SkPaint*, DrawBitmapRectFlags flags) override;
const SkPaint*, SrcRectConstraint flags) override;
void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
const SkPaint*) override;
const SkPaint*, SrcRectConstraint flags) override;
void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
const SkPaint*) override;
void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
skia/ext/pixel_ref_utils.cc
+1 -1
View File
@@ -146,7 +146,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
const SkRect* src_or_null,
const SkRect& dst,
const SkPaint& paint,
SkCanvas::DrawBitmapRectFlags flags) override {
SkCanvas::SrcRectConstraint flags) override {
SkRect bitmap_rect = SkRect::MakeWH(bitmap.width(), bitmap.height());
SkMatrix matrix;
matrix.setRectToRect(bitmap_rect, dst, SkMatrix::kFill_ScaleToFit);
sky/engine/core/painting/Canvas.cpp
+1 -1
View File
@@ -226,7 +226,7 @@ void Canvas::drawImageRect(const CanvasImage* image, Rect& src, Rect& dst, Paint
if (!m_canvas)
return;
ASSERT(image);
m_canvas->drawBitmapRectToRect(image->bitmap(), &src.sk_rect, dst.sk_rect, &paint->paint());
m_canvas->drawBitmapRect(image->bitmap(), &src.sk_rect, dst.sk_rect, &paint->paint());
}
void Canvas::drawPicture(Picture* picture)
sky/engine/platform/graphics/GraphicsContext.cpp
+3 -3
View File
@@ -967,10 +967,10 @@ void GraphicsContext::drawBitmapRect(const SkBitmap& bitmap, const SkRect* src,
if (contextDisabled())
return;
SkCanvas::DrawBitmapRectFlags flags =
immutableState()->shouldClampToSourceRect() ? SkCanvas::kNone_DrawBitmapRectFlag : SkCanvas::kBleed_DrawBitmapRectFlag;
SkCanvas::SrcRectConstraint flags =
immutableState()->shouldClampToSourceRect() ? SkCanvas::kStrict_SrcRectConstraint : SkCanvas::kFast_SrcRectConstraint;
m_canvas->drawBitmapRectToRect(bitmap, src, dst, paint, flags);
m_canvas->drawBitmapRect(bitmap, src, dst, paint, flags);
if (regionTrackingEnabled())
m_trackedRegion.didDrawRect(this, dst, *paint, &bitmap);
sky/engine/platform/graphics/filters/FilterEffect.cpp
+4 -4
View File
@@ -556,20 +556,20 @@ SkImageFilter::CropRect FilterEffect::getCropRect(const FloatSize& cropOffset) c
if (hasX()) {
rect.setX(boundaries.x());
flags |= SkImageFilter::CropRect::kHasLeft_CropEdge;
flags |= SkImageFilter::CropRect::kHasRight_CropEdge;
flags |= SkImageFilter::CropRect::kHasWidth_CropEdge;
}
if (hasY()) {
rect.setY(boundaries.y());
flags |= SkImageFilter::CropRect::kHasTop_CropEdge;
flags |= SkImageFilter::CropRect::kHasBottom_CropEdge;
flags |= SkImageFilter::CropRect::kHasHeight_CropEdge;
}
if (hasWidth()) {
rect.setWidth(boundaries.width());
flags |= SkImageFilter::CropRect::kHasRight_CropEdge;
flags |= SkImageFilter::CropRect::kHasWidth_CropEdge;
}
if (hasHeight()) {
rect.setHeight(boundaries.height());
flags |= SkImageFilter::CropRect::kHasBottom_CropEdge;
flags |= SkImageFilter::CropRect::kHasHeight_CropEdge;
}
rect.scale(filter()->absoluteTransform().a(), filter()->absoluteTransform().d());
return SkImageFilter::CropRect(rect, flags);