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

Unified Diff: third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp

Issue 2716203002: blink: Fix cc/paint skia type mismatches (Closed)
Patch Set: Fix canvas Created 3 years, 10 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: third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp
diff --git a/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp b/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp
index 7cdbd97253d388f42c5ade86308599c845bc3a5a..c5a45160e0e5d9263b905eaef2a23756a0699d1a 100644
--- a/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp
+++ b/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp
@@ -122,24 +122,24 @@ Vector<float> sepiaMatrix(double amount) {
FilterEffectBuilder::FilterEffectBuilder(const FloatRect& zoomedReferenceBox,
float zoom,
- const SkPaint* fillPaint,
- const SkPaint* strokePaint)
+ const PaintFlags* fillFlags,
+ const PaintFlags* strokeFlags)
: FilterEffectBuilder(nullptr,
zoomedReferenceBox,
zoom,
- fillPaint,
- strokePaint) {}
+ fillFlags,
+ strokeFlags) {}
FilterEffectBuilder::FilterEffectBuilder(Node* target,
const FloatRect& zoomedReferenceBox,
float zoom,
- const PaintFlags* fillPaint,
- const PaintFlags* strokePaint)
+ const PaintFlags* fillFlags,
+ const PaintFlags* strokeFlags)
: m_targetContext(target),
m_referenceBox(zoomedReferenceBox),
m_zoom(zoom),
- m_fillPaint(fillPaint),
- m_strokePaint(strokePaint) {
+ m_fillFlags(fillFlags),
+ m_strokeFlags(strokeFlags) {
if (m_zoom != 1)
m_referenceBox.scale(1 / m_zoom);
}
@@ -440,7 +440,7 @@ Filter* FilterEffectBuilder::buildReferenceFilter(
Filter::create(m_referenceBox, filterRegion, m_zoom, unitScaling);
if (!previousEffect)
previousEffect = result->getSourceGraphic();
- SVGFilterBuilder builder(previousEffect, nodeMap, m_fillPaint, m_strokePaint);
+ SVGFilterBuilder builder(previousEffect, nodeMap, m_fillFlags, m_strokeFlags);
builder.buildGraph(result, filterElement, m_referenceBox);
result->setLastEffect(builder.lastEffect());
return result;

Powered by Google App Engine
This is Rietveld 408576698