diff options
| -rw-r--r-- | dm/DM.cpp | 1 | ||||
| -rw-r--r-- | dm/DMSrcSink.cpp | 11 | ||||
| -rw-r--r-- | dm/DMSrcSink.h | 6 | ||||
| -rw-r--r-- | gn/utils.gni | 1 | ||||
| -rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 586 | ||||
| -rw-r--r-- | src/utils/SkDeferredCanvas.h | 160 | ||||
| -rw-r--r-- | tools/dump_record.cpp | 9 |
7 files changed, 0 insertions, 774 deletions
@@ -936,7 +936,6 @@ static Sink* create_via(const SkString& tag, Sink* wrapped) { VIA("pic", ViaPicture, wrapped); VIA("2ndpic", ViaSecondPicture, wrapped); VIA("sp", ViaSingletonPictures, wrapped); - VIA("defer", ViaDefer, wrapped); VIA("tiles", ViaTiles, 256, 256, nullptr, wrapped); VIA("tiles_rt", ViaTiles, 256, 256, new SkRTreeFactory, wrapped); diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index fc535dcd59..89a4b531e2 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -19,7 +19,6 @@ #include "SkCommonFlags.h" #include "SkData.h" #include "SkDebugCanvas.h" -#include "SkDeferredCanvas.h" #include "SkDeferredDisplayListRecorder.h" #include "SkDocument.h" #include "SkExecutor.h" @@ -1961,16 +1960,6 @@ Error ViaPicture::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkSt /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ -Error ViaDefer::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const { - auto size = src.size(); - return draw_to_canvas(fSink.get(), bitmap, stream, log, size, [&](SkCanvas* canvas) -> Error { - SkDeferredCanvas deferred(canvas, SkDeferredCanvas::kEager); - return src.draw(&deferred); - }); -} - -/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ - Error ViaPipe::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const { auto size = src.size(); return draw_to_canvas(fSink.get(), bitmap, stream, log, size, [&](SkCanvas* canvas) -> Error { diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index 26c32f59b7..3f3c8b2892 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -483,12 +483,6 @@ public: Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; }; -class ViaDefer : public Via { -public: - explicit ViaDefer(Sink* sink) : Via(sink) {} - Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; -}; - class ViaTiles : public Via { public: ViaTiles(int w, int h, SkBBHFactory*, Sink*); diff --git a/gn/utils.gni b/gn/utils.gni index 4d32314cbc..e8d624d88d 100644 --- a/gn/utils.gni +++ b/gn/utils.gni @@ -36,7 +36,6 @@ skia_utils_sources = [ "$_src/utils/SkCurveMeasure.h", "$_src/utils/SkDashPath.cpp", "$_src/utils/SkDashPathPriv.h", - "$_src/utils/SkDeferredCanvas.cpp", "$_src/utils/SkDumpCanvas.cpp", "$_src/utils/SkEventTracer.cpp", "$_src/utils/SkFloatUtils.h", diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp deleted file mode 100644 index a98d4b7387..0000000000 --- a/src/utils/SkDeferredCanvas.cpp +++ /dev/null @@ -1,586 +0,0 @@ -/* - * Copyright 2016 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkDeferredCanvas.h" -#include "SkDrawable.h" -#include "SkPath.h" -#include "SkRSXform.h" -#include "SkRRect.h" -#include "SkSurface.h" -#include "SkTextBlob.h" -#include "SkClipOpPriv.h" - -bool SkDeferredCanvas::Rec::isConcat(SkMatrix* m) const { - switch (fType) { - case kTrans_Type: - m->setTranslate(fData.fTranslate.x(), fData.fTranslate.y()); - return true; - case kScaleTrans_Type: - m->setScaleTranslate(fData.fScaleTrans.fScale.x(), - fData.fScaleTrans.fScale.y(), - fData.fScaleTrans.fTrans.x(), - fData.fScaleTrans.fTrans.y()); - return true; - default: - break; - } - return false; -} - -void SkDeferredCanvas::Rec::setConcat(const SkMatrix& m) { - SkASSERT(m.getType() <= (SkMatrix::kScale_Mask | SkMatrix::kTranslate_Mask)); - - if (m.getType() <= SkMatrix::kTranslate_Mask) { - fType = kTrans_Type; - fData.fTranslate.set(m.getTranslateX(), m.getTranslateY()); - } else { - fType = kScaleTrans_Type; - fData.fScaleTrans.fScale.set(m.getScaleX(), m.getScaleY()); - fData.fScaleTrans.fTrans.set(m.getTranslateX(), m.getTranslateY()); - } -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -SkDeferredCanvas::SkDeferredCanvas(SkCanvas* canvas, EvalType evalType) - : INHERITED(canvas->getBaseLayerSize().width(), canvas->getBaseLayerSize().height()) - , fCanvas(nullptr) // must be here for reset to work. - , fEvalType(evalType) -{ - this->reset(canvas); -} - -SkDeferredCanvas::~SkDeferredCanvas() {} - -void SkDeferredCanvas::reset(SkCanvas* canvas) { - if (fCanvas) { - this->flush(); - fCanvas = nullptr; - } - fRecs.reset(); - if (canvas) { - this->resetCanvas(canvas->getBaseLayerSize().width(), - canvas->getBaseLayerSize().height()); - fCanvas = canvas; - } -} - -void SkDeferredCanvas::push_save() { - Rec* r = fRecs.append(); - r->fType = kSave_Type; -} - -void SkDeferredCanvas::push_cliprect(const SkRect& bounds) { - int index = fRecs.count() - 1; - if (index >= 0 && fRecs[index].fType == kClipRect_Type) { - if (!fRecs[index].fData.fBounds.intersect(bounds)) { - fRecs[index].fData.fBounds.setEmpty(); - } - } else { - Rec* r = fRecs.append(); - r->fType = kClipRect_Type; - r->fData.fBounds = bounds; - } -} - -bool SkDeferredCanvas::push_concat(const SkMatrix& mat) { - if (mat.getType() > (SkMatrix::kScale_Mask | SkMatrix::kTranslate_Mask)) { - return false; - } - // At the moment, we don't know which ops can scale and which can also flip, so - // we reject negative scales for now - if (mat.getScaleX() < 0 || mat.getScaleY() < 0) { - return false; - } - - int index = fRecs.count() - 1; - SkMatrix m; - if (index >= 0 && fRecs[index].isConcat(&m)) { - m.preConcat(mat); - fRecs[index].setConcat(m); - } else { - fRecs.append()->setConcat(mat); - } - return true; -} - -void SkDeferredCanvas::emit(const Rec& rec) { - switch (rec.fType) { - case kSave_Type: - fCanvas->save(); - this->INHERITED::willSave(); - break; - case kClipRect_Type: - fCanvas->clipRect(rec.fData.fBounds); - this->INHERITED::onClipRect(rec.fData.fBounds, - kIntersect_SkClipOp, kHard_ClipEdgeStyle); - break; - case kTrans_Type: - case kScaleTrans_Type: { - SkMatrix mat; - rec.getConcat(&mat); - fCanvas->concat(mat); - this->INHERITED::didConcat(mat); - } break; - } -} - -void SkDeferredCanvas::flush_le(int index) { - SkASSERT(index >= -1 && index < fRecs.count()); - - int count = index + 1; - for (int i = 0; i < count; ++i) { - this->emit(fRecs[i]); - } - fRecs.remove(0, count); -} - -void SkDeferredCanvas::flush_all() { - this->flush_le(fRecs.count() - 1); -} - -void SkDeferredCanvas::flush_before_saves() { - int i; - for (i = fRecs.count() - 1; i >= 0; --i) { - if (kSave_Type != fRecs[i].fType) { - break; - } - } - this->flush_le(i); -} - -enum Flags { - kNoTranslate_Flag = 1 << 0, - kNoClip_Flag = 1 << 1, - kNoCull_Flag = 1 << 2, - kNoScale_Flag = 1 << 3, -}; - -void SkDeferredCanvas::flush_check(SkRect* bounds, const SkPaint* paint, unsigned flags) { - if (paint) { - if (paint->getShader() || paint->getImageFilter()) { - flags |= kNoTranslate_Flag | kNoScale_Flag; - } - // TODO: replace these with code to enlarge the bounds conservatively? - if (paint->getStyle() != SkPaint::kFill_Style || paint->getMaskFilter() || - paint->getImageFilter() || paint->getPathEffect()) - { - flags |= kNoCull_Flag | kNoScale_Flag | kNoClip_Flag; - } - if (paint->getLooper()) { - // to be conservative, we disable both, since embedded layers could have shaders - // or strokes etc. - flags |= kNoTranslate_Flag | kNoCull_Flag | kNoScale_Flag; - } - } - bool canClip = !(flags & kNoClip_Flag); - bool canTranslate = !(flags & kNoTranslate_Flag); - bool canCull = !(flags & kNoCull_Flag); - bool canScale = !(flags & kNoScale_Flag); - - int i; - for (i = fRecs.count() - 1; i >= 0; --i) { - const Rec& rec = fRecs[i]; - switch (rec.fType) { - case kSave_Type: - // continue to the next rec - break; - case kClipRect_Type: - if (!canCull) { - goto STOP; - } - if (canClip) { - if (!bounds->intersect(rec.fData.fBounds)) { - bounds->setEmpty(); - return; - } - // continue to the next rec - } else { - if (!rec.fData.fBounds.contains(*bounds)) { - goto STOP; - } - // continue to the next rec - } - break; - case kTrans_Type: - if (canTranslate) { - bounds->offset(rec.fData.fTranslate.x(), rec.fData.fTranslate.y()); - // continue to the next rec - } else { - goto STOP; - } - break; - case kScaleTrans_Type: - if (canScale) { - SkMatrix m; - rec.getConcat(&m); - m.mapRectScaleTranslate(bounds, *bounds); - } else { - goto STOP; - } - break; - } - } -STOP: - this->flush_le(i); -} - -void SkDeferredCanvas::flush_translate(SkScalar* x, SkScalar* y, const SkRect& bounds, - const SkPaint* paint) { - SkRect tmp = bounds; - this->flush_check(&tmp, paint, kNoClip_Flag | kNoScale_Flag); - *x += tmp.x() - bounds.x(); - *y += tmp.y() - bounds.y(); -} - -void SkDeferredCanvas::flush_translate(SkScalar* x, SkScalar* y, const SkPaint& paint) { - SkRect tmp = SkRect::MakeXYWH(*x, *y, 1, 1); - this->flush_check(&tmp, &paint, kNoClip_Flag | kNoCull_Flag | kNoScale_Flag); - *x = tmp.x(); - *y = tmp.y(); -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -void SkDeferredCanvas::willSave() { - this->push_save(); -} - -SkCanvas::SaveLayerStrategy SkDeferredCanvas::getSaveLayerStrategy(const SaveLayerRec& rec) { - this->flush_all(); - fCanvas->saveLayer(rec); - this->INHERITED::getSaveLayerStrategy(rec); - // No need for a layer. - return kNoLayer_SaveLayerStrategy; -} - -void SkDeferredCanvas::willRestore() { - for (int i = fRecs.count() - 1; i >= 0; --i) { - if (kSave_Type == fRecs[i].fType) { - fRecs.setCount(i); // pop off everything here and later - return; - } - } - for (int i = 0; i < fRecs.count(); ++i) { - SkASSERT(kSave_Type != fRecs[i].fType); - } - fRecs.setCount(0); - fCanvas->restore(); - this->INHERITED::willRestore(); -} - -void SkDeferredCanvas::didConcat(const SkMatrix& matrix) { - if (matrix.isIdentity()) { - return; - } - if (!this->push_concat(matrix)) { - this->flush_all(); - fCanvas->concat(matrix); - this->INHERITED::didConcat(matrix); - } -} - -void SkDeferredCanvas::didSetMatrix(const SkMatrix& matrix) { - this->flush_all(); - fCanvas->setMatrix(matrix); - this->INHERITED::didSetMatrix(matrix); -} - -void SkDeferredCanvas::onClipRect(const SkRect& rect, SkClipOp op, ClipEdgeStyle edgeStyle) { - if (kIntersect_SkClipOp == op) { - this->push_cliprect(rect); - } else { - this->flush_all(); - fCanvas->clipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle); - this->INHERITED::onClipRect(rect, op, edgeStyle); - } -} - -void SkDeferredCanvas::onClipRRect(const SkRRect& rrect, SkClipOp op, ClipEdgeStyle edgeStyle) { - this->flush_all(); - fCanvas->clipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle); - this->INHERITED::onClipRRect(rrect, op, edgeStyle); -} - -void SkDeferredCanvas::onClipPath(const SkPath& path, SkClipOp op, ClipEdgeStyle edgeStyle) { - this->flush_all(); - fCanvas->clipPath(path, op, kSoft_ClipEdgeStyle == edgeStyle); - this->INHERITED::onClipPath(path, op, edgeStyle); -} - -void SkDeferredCanvas::onClipRegion(const SkRegion& deviceRgn, SkClipOp op) { - this->flush_all(); - fCanvas->clipRegion(deviceRgn, op); - this->INHERITED::onClipRegion(deviceRgn, op); -} - -void SkDeferredCanvas::onDrawPaint(const SkPaint& paint) { - // TODO: Can we turn this into drawRect? - this->flush_all(); - fCanvas->drawPaint(paint); -} - -void SkDeferredCanvas::onDrawPoints(PointMode mode, size_t count, const SkPoint pts[], - const SkPaint& paint) { - this->flush_all(); - fCanvas->drawPoints(mode, count, pts, paint); -} - -void SkDeferredCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) { - SkRect modRect = rect; - this->flush_check(&modRect, &paint); - fCanvas->drawRect(modRect, paint); -} - -void SkDeferredCanvas::onDrawRegion(const SkRegion& region, const SkPaint& paint) { - this->flush_all(); // can we do better? - fCanvas->drawRegion(region, paint); -} - -void SkDeferredCanvas::onDrawOval(const SkRect& rect, const SkPaint& paint) { - SkRect modRect = rect; - this->flush_check(&modRect, &paint, kNoClip_Flag); - fCanvas->drawOval(modRect, paint); -} - -void SkDeferredCanvas::onDrawArc(const SkRect& rect, SkScalar startAngle, SkScalar sweepAngle, - bool useCenter, const SkPaint& paint) { - SkRect modRect = rect; - this->flush_check(&modRect, &paint, kNoClip_Flag); - fCanvas->drawArc(modRect, startAngle, sweepAngle, useCenter, paint); -} - -static SkRRect make_offset(const SkRRect& src, SkScalar dx, SkScalar dy) { - SkRRect dst = src; - dst.offset(dx, dy); - return dst; -} - -void SkDeferredCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) { - SkRect modRect = rrect.getBounds(); - this->flush_check(&modRect, &paint, kNoClip_Flag); - fCanvas->drawRRect(make_offset(rrect, - modRect.x() - rrect.getBounds().x(), - modRect.y() - rrect.getBounds().y()), paint); -} - -void SkDeferredCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint& paint) { - this->flush_all(); - fCanvas->drawDRRect(outer, inner, paint); -} - -void SkDeferredCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { - if (path.isInverseFillType()) { - this->flush_before_saves(); - } else { - SkRect modRect = path.getBounds(); - this->flush_check(&modRect, &paint, kNoClip_Flag | kNoTranslate_Flag | kNoScale_Flag); - } - fCanvas->drawPath(path, paint); -} - -void SkDeferredCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y, - const SkPaint* paint) { - const SkScalar w = SkIntToScalar(bitmap.width()); - const SkScalar h = SkIntToScalar(bitmap.height()); - SkRect bounds = SkRect::MakeXYWH(x, y, w, h); - this->flush_check(&bounds, paint, kNoClip_Flag); - if (bounds.width() == w && bounds.height() == h) { - fCanvas->drawBitmap(bitmap, bounds.x(), bounds.y(), paint); - } else { - fCanvas->drawBitmapRect(bitmap, bounds, paint); - } -} - -void SkDeferredCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, - const SkPaint* paint, SrcRectConstraint constraint) { - SkRect modRect = dst; - this->flush_check(&modRect, paint, kNoClip_Flag); - fCanvas->legacy_drawBitmapRect(bitmap, src, modRect, paint, constraint); -} - -void SkDeferredCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, - const SkRect& dst, const SkPaint* paint) { - SkRect modRect = dst; - this->flush_check(&modRect, paint, kNoClip_Flag); - fCanvas->drawBitmapNine(bitmap, center, modRect, paint); -} - -void SkDeferredCanvas::onDrawBitmapLattice(const SkBitmap& bitmap, const Lattice& lattice, - const SkRect& dst, const SkPaint* paint) { - SkRect modRect = dst; - this->flush_check(&modRect, paint, kNoClip_Flag); - fCanvas->drawBitmapLattice(bitmap, lattice, modRect, paint); -} - -void SkDeferredCanvas::onDrawImageNine(const SkImage* image, const SkIRect& center, - const SkRect& dst, const SkPaint* paint) { - SkRect modRect = dst; - this->flush_check(&modRect, paint, kNoClip_Flag); - fCanvas->drawImageNine(image, center, modRect, paint); -} - -void SkDeferredCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, - const SkPaint* paint) { - const SkScalar w = SkIntToScalar(image->width()); - const SkScalar h = SkIntToScalar(image->height()); - SkRect bounds = SkRect::MakeXYWH(x, y, w, h); - this->flush_check(&bounds, paint, kNoClip_Flag); - if (bounds.width() == w && bounds.height() == h) { - fCanvas->drawImage(image, bounds.x(), bounds.y(), paint); - } else { - fCanvas->drawImageRect(image, bounds, paint); - } -} - -void SkDeferredCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, - const SkPaint* paint, SrcRectConstraint constraint) { - SkRect modRect = dst; - this->flush_check(&modRect, paint, kNoClip_Flag); - fCanvas->legacy_drawImageRect(image, src, modRect, paint, constraint); -} - -void SkDeferredCanvas::onDrawImageLattice(const SkImage* image, const Lattice& lattice, - const SkRect& dst, const SkPaint* paint) { - SkRect modRect = dst; - this->flush_check(&modRect, paint, kNoClip_Flag); - fCanvas->drawImageLattice(image, lattice, modRect, paint); -} - -void SkDeferredCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint& paint) { - this->flush_translate(&x, &y, paint); - fCanvas->drawText(text, byteLength, x, y, paint); -} - -void SkDeferredCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint& paint) { - this->flush_before_saves(); - fCanvas->drawPosText(text, byteLength, pos, paint); -} - -void SkDeferredCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint& paint) { - this->flush_before_saves(); - fCanvas->drawPosTextH(text, byteLength, xpos, constY, paint); -} - -void SkDeferredCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint& paint) { - this->flush_before_saves(); - fCanvas->drawTextOnPath(text, byteLength, path, matrix, paint); -} - -void SkDeferredCanvas::onDrawTextRSXform(const void* text, size_t byteLength, - const SkRSXform xform[], const SkRect* cullRect, - const SkPaint& paint) { - if (cullRect) { - SkRect modRect = *cullRect; - // only allow culling - this->flush_check(&modRect, &paint, kNoClip_Flag | kNoScale_Flag | kNoTranslate_Flag); - } else { - this->flush_before_saves(); - } - fCanvas->drawTextRSXform(text, byteLength, xform, cullRect, paint); -} - -void SkDeferredCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, - const SkPaint &paint) { - this->flush_translate(&x, &y, blob->bounds(), &paint); - fCanvas->drawTextBlob(blob, x, y, paint); -} - -#include "SkPicture.h" -#include "SkCanvasPriv.h" -void SkDeferredCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, - const SkPaint* paint) { - if (kEager == fEvalType) { - SkAutoCanvasMatrixPaint acmp(this, matrix, paint, picture->cullRect()); - picture->playback(this); - } else { - this->flush_before_saves(); - fCanvas->drawPicture(picture, matrix, paint); - } -} - -void SkDeferredCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) { - if (kEager == fEvalType) { - // TODO: investigate culling and applying concat to the matrix - drawable->draw(this, matrix); - } else { - this->flush_before_saves(); - fCanvas->drawDrawable(drawable, matrix); - } -} - -void SkDeferredCanvas::onDrawAtlas(const SkImage* image, const SkRSXform xform[], - const SkRect rects[], const SkColor colors[], - int count, SkBlendMode bmode, - const SkRect* cull, const SkPaint* paint) { - this->flush_before_saves(); - fCanvas->drawAtlas(image, xform, rects, colors, count, bmode, cull, paint); -} - -void SkDeferredCanvas::onDrawVerticesObject(const SkVertices* vertices, SkBlendMode bmode, - const SkPaint& paint) { - this->flush_before_saves(); - fCanvas->drawVertices(vertices, bmode, paint); -} - -void SkDeferredCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], - const SkPoint texCoords[4], SkBlendMode bmode, - const SkPaint& paint) { - this->flush_before_saves(); - fCanvas->drawPatch(cubics, colors, texCoords, bmode, paint); -} - -void SkDeferredCanvas::onDrawAnnotation(const SkRect& rect, const char key[], SkData* data) { - SkRect modRect = rect; - this->flush_check(&modRect, nullptr, kNoClip_Flag); - fCanvas->drawAnnotation(modRect, key, data); -} - -#ifdef SK_SUPPORT_LEGACY_DRAWFILTER -SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) { - fCanvas->setDrawFilter(filter); - return this->INHERITED::setDrawFilter(filter); -} -#endif - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -sk_sp<SkSurface> SkDeferredCanvas::onNewSurface(const SkImageInfo& info, - const SkSurfaceProps& props) { - return fCanvas->makeSurface(info, &props); -} -SkISize SkDeferredCanvas::getBaseLayerSize() const { return fCanvas->getBaseLayerSize(); } -SkRect SkDeferredCanvas::onGetLocalClipBounds() const { - return fCanvas->getLocalClipBounds(); -} -SkIRect SkDeferredCanvas::onGetDeviceClipBounds() const { - return fCanvas->getDeviceClipBounds(); -} -bool SkDeferredCanvas::isClipEmpty() const { return fCanvas->isClipEmpty(); } -bool SkDeferredCanvas::isClipRect() const { return fCanvas->isClipRect(); } -bool SkDeferredCanvas::onPeekPixels(SkPixmap* pixmap) { return fCanvas->peekPixels(pixmap); } -bool SkDeferredCanvas::onAccessTopLayerPixels(SkPixmap* pixmap) { - SkImageInfo info; - size_t rowBytes; - SkIPoint* origin = nullptr; - void* addr = fCanvas->accessTopLayerPixels(&info, &rowBytes, origin); - if (addr) { - *pixmap = SkPixmap(info, addr, rowBytes); - return true; - } - return false; -} -SkImageInfo SkDeferredCanvas::onImageInfo() const { return fCanvas->imageInfo(); } -bool SkDeferredCanvas::onGetProps(SkSurfaceProps* props) const { return fCanvas->getProps(props); } -void SkDeferredCanvas::onFlush() { - this->flush_all(); - return fCanvas->flush(); -} diff --git a/src/utils/SkDeferredCanvas.h b/src/utils/SkDeferredCanvas.h deleted file mode 100644 index eb07965799..0000000000 --- a/src/utils/SkDeferredCanvas.h +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright 2016 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkDeferredCanvas_DEFINED -#define SkDeferredCanvas_DEFINED - -#include "../private/SkTDArray.h" -#include "SkNoDrawCanvas.h" - -class SK_API SkDeferredCanvas : public SkNoDrawCanvas { -public: - enum EvalType {kEager, kLazy}; - // There are two strategies for evaluating of sub-drawings (pictures and drawables). - // * kEager - a sub-drawing is expanded using the using the SkDeferredCanvas. This has - // the advantage of optimizing the sub drawing, and is used when the underlying - // SkCanvas is drawing and not recording. - // * kLazy - a sub-drawing is not expanded, but passed directly to the underlying SkCanvas. - // This has the advantage of not expanding the sub drawing and then immediately - // re-encoding it, and is used for recording canvases. - SkDeferredCanvas(SkCanvas*, EvalType); - ~SkDeferredCanvas() override; - - void reset(SkCanvas*); - -#ifdef SK_SUPPORT_LEGACY_DRAWFILTER - SkDrawFilter* setDrawFilter(SkDrawFilter*) override; -#endif - -protected: - sk_sp<SkSurface> onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override; - SkISize getBaseLayerSize() const override; - SkRect onGetLocalClipBounds() const override; - SkIRect onGetDeviceClipBounds() const override; - bool isClipEmpty() const override; - bool isClipRect() const override; - bool onPeekPixels(SkPixmap*) override; - bool onAccessTopLayerPixels(SkPixmap*) override; - SkImageInfo onImageInfo() const override; - bool onGetProps(SkSurfaceProps*) const override; - void onFlush() override; - - void willSave() override; - SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec&) override; - void willRestore() override; - - void didConcat(const SkMatrix&) override; - void didSetMatrix(const SkMatrix&) override; - - void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override; - virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint&) override; - virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint&) override; - virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint&) override; - virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint&) override; - void onDrawTextRSXform(const void* text, size_t byteLength, const SkRSXform[], - const SkRect* cullRect, const SkPaint&) override; - virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, - const SkPaint& paint) override; - virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], - const SkPoint texCoords[4], SkBlendMode, - const SkPaint& paint) override; - - void onDrawPaint(const SkPaint&) override; - void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override; - void onDrawRect(const SkRect&, const SkPaint&) override; - void onDrawRegion(const SkRegion& region, const SkPaint& paint) override; - void onDrawOval(const SkRect&, const SkPaint&) override; - void onDrawArc(const SkRect&, SkScalar, SkScalar, bool, const SkPaint&) override; - void onDrawRRect(const SkRRect&, const SkPaint&) override; - void onDrawPath(const SkPath&, const SkPaint&) override; - - void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override; - void onDrawBitmapLattice(const SkBitmap&, const Lattice& lattice, const SkRect& dst, - const SkPaint*) override; - void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst, - const SkPaint*) override; - void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, - SrcRectConstraint) override; - - void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override; - void onDrawImageLattice(const SkImage*, const Lattice& lattice, const SkRect& dst, - const SkPaint*) override; - void onDrawImageNine(const SkImage* image, const SkIRect& center, - const SkRect& dst, const SkPaint*) override; - void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst, - const SkPaint*, SrcRectConstraint) override; - - void onDrawVerticesObject(const SkVertices*, SkBlendMode, const SkPaint&) override; - void onDrawAtlas(const SkImage* image, const SkRSXform xform[], - const SkRect rects[], const SkColor colors[], - int count, SkBlendMode, const SkRect* cull, const SkPaint* paint) override; - - void onClipRect(const SkRect&, SkClipOp, ClipEdgeStyle) override; - void onClipRRect(const SkRRect&, SkClipOp, ClipEdgeStyle) override; - void onClipPath(const SkPath&, SkClipOp, ClipEdgeStyle) override; - void onClipRegion(const SkRegion&, SkClipOp) override; - - void onDrawDrawable(SkDrawable*, const SkMatrix*) override; - void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override; - void onDrawAnnotation(const SkRect&, const char[], SkData*) override; - - class Iter; - -private: - enum Type { - kSave_Type, - kClipRect_Type, - kTrans_Type, - kScaleTrans_Type, - }; - struct Rec { - Type fType; - union { - SkRect fBounds; - SkVector fTranslate; - struct { - SkVector fScale; - SkVector fTrans; // post translate - } fScaleTrans; - } fData; - - bool isConcat(SkMatrix*) const; - void getConcat(SkMatrix* mat) const { - SkDEBUGCODE(bool isconcat = ) this->isConcat(mat); - SkASSERT(isconcat); - } - void setConcat(const SkMatrix&); - }; - - void push_save(); - void push_cliprect(const SkRect&); - bool push_concat(const SkMatrix&); - - void emit(const Rec& rec); - - void flush_all(); - void flush_before_saves(); - void flush_le(int index); - void flush_translate(SkScalar* x, SkScalar* y, const SkPaint&); - void flush_translate(SkScalar* x, SkScalar* y, const SkRect& bounds, const SkPaint* = nullptr); - void flush_check(SkRect* bounds, const SkPaint*, unsigned flags = 0); - - void internal_flush_translate(SkScalar* x, SkScalar* y, const SkRect* boundsOrNull); - - SkTDArray<Rec> fRecs; - SkCanvas* fCanvas; - const EvalType fEvalType; - - typedef SkNoDrawCanvas INHERITED; -}; - - -#endif diff --git a/tools/dump_record.cpp b/tools/dump_record.cpp index 24017bd6c9..783c378f44 100644 --- a/tools/dump_record.cpp +++ b/tools/dump_record.cpp @@ -8,7 +8,6 @@ #include "DumpRecord.h" #include "SkBitmap.h" #include "SkCommandLineFlags.h" -#include "SkDeferredCanvas.h" #include "SkPicture.h" #include "SkPictureRecorder.h" #include "SkRecordDraw.h" @@ -24,7 +23,6 @@ DEFINE_bool(optimize2, false, "Run SkRecordOptimize2 before dumping."); DEFINE_int32(tile, 1000000000, "Simulated tile size."); DEFINE_bool(timeWithCommand, false, "If true, print time next to command, else in first column."); DEFINE_string2(write, w, "", "Write the (optimized) picture to the named file."); -DEFINE_bool(defer, false, "Defer clips and translates"); static void dump(const char* name, int w, int h, const SkRecord& record) { SkBitmap bitmap; @@ -56,13 +54,6 @@ int main(int argc, char** argv) { SkDebugf("Could not read %s as an SkPicture.\n", FLAGS_skps[i]); return 1; } - if (FLAGS_defer) { - SkPictureRecorder recorder; - SkDeferredCanvas deferred(recorder.beginRecording(src->cullRect()), - SkDeferredCanvas::kEager); - src->playback(&deferred); - src = recorder.finishRecordingAsPicture(); - } const int w = SkScalarCeilToInt(src->cullRect().width()); const int h = SkScalarCeilToInt(src->cullRect().height()); |