Source/core/page/animation/CSSPropertyAnimation.cpp - Issue 16358010: [CSS Exclusions] Add CSS parsing support for image URI shape-inside and shape-outside values

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: Source/core/page/animation/CSSPropertyAnimation.cpp

Issue 16358010: [CSS Exclusions] Add CSS parsing support for image URI shape-inside and shape-outside values (Closed) Base URL: svn://svn.chromium.org/blink/trunk

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

« Source/core/css/resolver/StyleResolver.cpp ('K') | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/rendering/exclusions/ExclusionShapeInfo.cpp » ('j') | Source/core/rendering/style/ExclusionShapeValue.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/page/animation/CSSPropertyAnimation.cpp

diff --git a/Source/core/page/animation/CSSPropertyAnimation.cpp b/Source/core/page/animation/CSSPropertyAnimation.cpp

index 5aa840d1fed0263f6fceef0fa08257b21ea83b23..cebadfce14350a4716b6076b811549dddaf3b9e5 100644

--- a/Source/core/page/animation/CSSPropertyAnimation.cpp

+++ b/Source/core/page/animation/CSSPropertyAnimation.cpp

@@ -140,7 +140,7 @@ static inline PassRefPtr<ClipPathOperation> blendFunc(const AnimationBase*, Clip

static inline PassRefPtr<ExclusionShapeValue> blendFunc(const AnimationBase*, ExclusionShapeValue* from, ExclusionShapeValue* to, double progress)

{

// FIXME Bug 102723: Shape-inside should be able to animate a value of 'outside-shape' when shape-outside is set to a BasicShape

- if (from->type() != ExclusionShapeValue::SHAPE || to->type() != ExclusionShapeValue::SHAPE)

+ if (from->type() != ExclusionShapeValue::Shape || to->type() != ExclusionShapeValue::Shape)

return to;

const BasicShape* fromShape = from->shape();