Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1324700 - Resolve filter property for servo. r=heycam

Browse Source 
MozReview-Commit-ID: 6IHs682rZfH

--HG--
extra : rebase_source : 6688d70a0c92e27f15e97f0d55062fc74f08339e
This commit is contained in:
Hiroyuki Ikezoe 2017-04-15 07:37:35 +09:00
parent 3f46fb9acf
commit a52cf990ce
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dom/canvas/CanvasRenderingContext2D.cpp
View File

@ -3017,22 +3017,49 @@ CanvasRenderingContext2D::ParseFilter(const nsAString& aString,
}
nsString usedFont;
RefPtr<nsStyleContext> parentContext =
GetFontStyleContext(mCanvasElement, GetFont(),
presShell, usedFont, aError);
if (!parentContext) {
aError.Throw(NS_ERROR_FAILURE);
if (presShell->StyleSet()->IsGecko()) {
RefPtr<nsStyleContext> parentContext =
GetFontStyleContext(mCanvasElement, GetFont(),
presShell, usedFont, aError);
if (!parentContext) {
aError.Throw(NS_ERROR_FAILURE);
return false;
}
RefPtr<nsStyleContext> sc =
ResolveFilterStyle(aString, presShell, parentContext, aError);
if (!sc) {
return false;
}
aFilterChain = sc->StyleEffects()->mFilters;
return true;
}
// For stylo
MOZ_ASSERT(presShell->StyleSet()->IsServo());
RefPtr<ServoComputedValues> parentStyle =
GetFontStyleForServo(mCanvasElement,
GetFont(),
presShell,
usedFont,
aError);
if (!parentStyle) {
return false;
}
RefPtr<nsStyleContext> sc =
ResolveFilterStyle(aString, presShell, parentContext, aError);
if (!sc) {
return false;
RefPtr<ServoComputedValues> computedValues =
ResolveFilterStyleForServo(aString,
parentStyle,
presShell,
aError);
if (!computedValues) {
return false;
}
aFilterChain = sc->StyleEffects()->mFilters;
const nsStyleEffects* effects = Servo_GetStyleEffects(computedValues);
// XXX: This mFilters is a one shot object, we probably could avoid copying.
aFilterChain = effects->mFilters;
return true;
}