sky/engine/platform/graphics/GraphicsContext.cpp - Issue 1100833002: Roll skia to 409fd66a5afcef5f165f7ccec7c3473add231752.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sky/engine/platform/graphics/GraphicsContext.cpp

Issue 1100833002: Roll skia to 409fd66a5afcef5f165f7ccec7c3473add231752. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 8 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:

Index: sky/engine/platform/graphics/GraphicsContext.cpp

diff --git a/sky/engine/platform/graphics/GraphicsContext.cpp b/sky/engine/platform/graphics/GraphicsContext.cpp

index 5a8458b048698535ab05b7f3f97cbee0c2086045..f92e64f526a7f3de00146f281583b5265cbac6d2 100644

--- a/sky/engine/platform/graphics/GraphicsContext.cpp

+++ b/sky/engine/platform/graphics/GraphicsContext.cpp

@@ -45,7 +45,6 @@

#include "third_party/skia/include/core/SkColorFilter.h"

#include "third_party/skia/include/core/SkData.h"

#include "third_party/skia/include/core/SkDevice.h"

-#include "third_party/skia/include/core/SkMatrixImageFilter.h"

#include "third_party/skia/include/core/SkPicture.h"

#include "third_party/skia/include/core/SkRRect.h"

#include "third_party/skia/include/core/SkRefCnt.h"

@@ -913,7 +912,7 @@ void GraphicsContext::drawPicture(PassRefPtr<SkPicture> picture, const FloatRect

RefPtr<SkPictureImageFilter> pictureFilter = adoptRef(SkPictureImageFilter::Create(picture.get(), sourceBounds));

SkMatrix layerScale;

layerScale.setScale(deviceDest.width() / src.width(), deviceDest.height() / src.height());

- RefPtr<SkMatrixImageFilter> matrixFilter = adoptRef(SkMatrixImageFilter::Create(layerScale, kLow_SkFilterQuality, pictureFilter.get()));

+ RefPtr<SkImageFilter> matrixFilter = adoptRef(SkImageFilter::CreateMatrixFilter(layerScale, kLow_SkFilterQuality, pictureFilter.get()));

SkPaint picturePaint;

picturePaint.setXfermodeMode(WebCoreCompositeToSkiaComposite(op, blendMode));

picturePaint.setImageFilter(matrixFilter.get());