Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(932)

Unified Diff: src/core/SkLiteDL.cpp.orig

Issue 2224163005: Made shadows blurry (thru implementing variance mapping) (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: rebased off master again! Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/core/SkLiteDL.cpp.orig
diff --git a/src/core/SkLiteDL.cpp b/src/core/SkLiteDL.cpp.orig
similarity index 97%
copy from src/core/SkLiteDL.cpp
copy to src/core/SkLiteDL.cpp.orig
index f7fe578c4efa38fdd0dc7d6019faed1e48e52bfc..73d33c7f1c93ec115664320daac12d06f072e3fe 100644
--- a/src/core/SkLiteDL.cpp
+++ b/src/core/SkLiteDL.cpp.orig
@@ -269,18 +269,29 @@ namespace {
void makeThreadsafe() { make_threadsafe(nullptr, &matrix); }
};
struct DrawShadowedPicture final : Op {
+<<<<<<< e4eafaf6385a6ab52989fe9a2685ae1e48e5815c
static const auto kType = Type::DrawShadowedPicture;
DrawShadowedPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint)
+=======
+ DrawShadowedPicture(const SkPicture* picture, const SkMatrix* matrix,
+ const SkPaint* paint, bool blurry)
+>>>>>>> added biasing
: picture(sk_ref_sp(picture)) {
if (matrix) { this->matrix = *matrix; }
if (paint) { this->paint = *paint; }
+ this->blurry = blurry;
}
sk_sp<const SkPicture> picture;
SkMatrix matrix = SkMatrix::I();
SkPaint paint;
+<<<<<<< e4eafaf6385a6ab52989fe9a2685ae1e48e5815c
void draw(SkCanvas* c, const SkMatrix&) {
+=======
+ bool blurry;
+ void draw(SkCanvas* c) override {
+>>>>>>> added biasing
#ifdef SK_EXPERIMENTAL_SHADOWING
- c->drawShadowedPicture(picture.get(), &matrix, &paint);
+ c->drawShadowedPicture(picture.get(), &matrix, &paint, blurry);
#endif
}
void makeThreadsafe() { make_threadsafe(nullptr, &matrix); }
@@ -615,9 +626,15 @@ void SkLiteDL::drawPicture(const SkPicture* picture,
const SkMatrix* matrix, const SkPaint* paint) {
this->push<DrawPicture>(0, picture, matrix, paint);
}
+<<<<<<< e4eafaf6385a6ab52989fe9a2685ae1e48e5815c
void SkLiteDL::drawShadowedPicture(const SkPicture* picture,
const SkMatrix* matrix, const SkPaint* paint) {
this->push<DrawShadowedPicture>(0, picture, matrix, paint);
+=======
+void SkLiteDL::drawShadowedPicture(const SkPicture* picture, const SkMatrix* matrix,
+ const SkPaint* paint, bool blurry) {
+ push<DrawShadowedPicture>(&fBytes, 0, picture, matrix, paint, blurry);
+>>>>>>> added biasing
}
void SkLiteDL::drawBitmap(const SkBitmap& bm, SkScalar x, SkScalar y, const SkPaint* paint) {

Powered by Google App Engine
This is Rietveld 408576698