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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 3 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 if (!fromShape->canBlend(toShape)) 134 if (!fromShape->canBlend(toShape))
135 return to; 135 return to;
136 136
137 return ShapeClipPathOperation::create(toShape->blend(fromShape, progress)); 137 return ShapeClipPathOperation::create(toShape->blend(fromShape, progress));
138 } 138 }
139 139
140 static inline PassRefPtr<ExclusionShapeValue> blendFunc(const AnimationBase*, Ex clusionShapeValue* from, ExclusionShapeValue* to, double progress) 140 static inline PassRefPtr<ExclusionShapeValue> blendFunc(const AnimationBase*, Ex clusionShapeValue* from, ExclusionShapeValue* to, double progress)
141 { 141 {
142 // FIXME Bug 102723: Shape-inside should be able to animate a value of 'outs ide-shape' when shape-outside is set to a BasicShape 142 // FIXME Bug 102723: Shape-inside should be able to animate a value of 'outs ide-shape' when shape-outside is set to a BasicShape
143 if (from->type() != ExclusionShapeValue::SHAPE || to->type() != ExclusionSha peValue::SHAPE) 143 if (from->type() != ExclusionShapeValue::Shape || to->type() != ExclusionSha peValue::Shape)
144 return to; 144 return to;
145 145
146 const BasicShape* fromShape = from->shape(); 146 const BasicShape* fromShape = from->shape();
147 const BasicShape* toShape = to->shape(); 147 const BasicShape* toShape = to->shape();
148 148
149 if (!fromShape->canBlend(toShape)) 149 if (!fromShape->canBlend(toShape))
150 return to; 150 return to;
151 151
152 return ExclusionShapeValue::createShapeValue(toShape->blend(fromShape, progr ess)); 152 return ExclusionShapeValue::createShapeValue(toShape->blend(fromShape, progr ess));
153 } 153 }
(...skipping 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
1239 } 1239 }
1240 1240
1241 int CSSPropertyAnimation::getNumProperties() 1241 int CSSPropertyAnimation::getNumProperties()
1242 { 1242 {
1243 ensurePropertyMap(); 1243 ensurePropertyMap();
1244 1244
1245 return gPropertyWrappers->size(); 1245 return gPropertyWrappers->size();
1246 } 1246 }
1247 1247
1248 } 1248 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698