Context Navigation

← Previous Changeset
Next Changeset →

Changeset 31801

Timestamp:

04/10/08 23:37:30 (7 months ago)

Author:

antti@apple.com

Message:

2008-04-10 Antti Koivisto <antti@apple.com>

Reviewed by Eric.

Redo the SVG animation support.

It does

Full SMIL interval timing model including syncbase and event base timing (the hard part).
CSS and XML attribute animation.
Linear, discrete and spline calcModes.
Values animation with keyTimes and keySplines.
Link activated animations.
Pretty good support for <animate> and <set> animations
Basic support for <animateColor>, <animateMotion> and <animateTransform>.

This passes some 35 of the 56 tests in W3C SVG animation test suite, a bunch more
with some subtest failures.

What is still missing

Additive animation with multiple animations operating on the same property. This is a major architectural feature in animation code. It shouldn't be too hard to add.
Only <animate> implements accumulate.
<animateMotion> does not do paths, keypoints, rotate.
<animateTransform> does not work correctly in all cases
calcMode paced is missing.
repeat, beginEvent, endEvent are missing.
accesskey() is missing.
JS does not see correct values for baseVal/animVal, changing values that are being animted for a script produces wrong results. This problem needs to be solved outside the animation code.
Some other stuff I forgot or do not know about.

GNUmakefile.am:
WebCore.pro:
WebCore.vcproj/WebCore.vcproj:
WebCore.xcodeproj/project.pbxproj:
dom/Document.cpp:
history/CachedPage.cpp: (WebCore::CachedPage::CachedPage):

Use cache notification mechanism to start/stop animations.

svg/SVGAElement.cpp: (WebCore::SVGAElement::defaultEventHandler):

Start target animation on link activation.

svg/SVGAnimateColorElement.cpp: (WebCore::SVGAnimateColorElement::applyAnimatedValueToElement): (WebCore::SVGAnimateColorElement::updateAnimatedValue): (WebCore::SVGAnimateColorElement::calculateFromAndToValues): (WebCore::SVGAnimateColorElement::calculateFromAndByValues):
svg/SVGAnimateColorElement.h:
svg/SVGAnimateElement.cpp: (WebCore::SVGAnimateElement::SVGAnimateElement): (WebCore::parseNumberValueAndUnit): (WebCore::SVGAnimateElement::applyAnimatedValueToElement): (WebCore::SVGAnimateElement::updateAnimatedValue): (WebCore::isColorAttribute): (WebCore::SVGAnimateElement::calculateFromAndToValues): (WebCore::SVGAnimateElement::calculateFromAndByValues):
svg/SVGAnimateElement.h: (WebCore::SVGAnimateElement::):
svg/SVGAnimateMotionElement.cpp: (WebCore::SVGAnimateMotionElement::SVGAnimateMotionElement): (WebCore::SVGAnimateMotionElement::parseMappedAttribute): (WebCore::SVGAnimateMotionElement::updateAnimatedValue): (WebCore::parsePoint): (WebCore::SVGAnimateMotionElement::calculateFromAndToValues): (WebCore::SVGAnimateMotionElement::calculateFromAndByValues): (WebCore::SVGAnimateMotionElement::applyAnimatedValueToElement): (WebCore::SVGAnimateMotionElement::startedActiveInterval):
svg/SVGAnimateMotionElement.h:
svg/SVGAnimateTransformElement.cpp: (WebCore::SVGAnimateTransformElement::SVGAnimateTransformElement): (WebCore::SVGAnimateTransformElement::hasValidTarget): (WebCore::SVGAnimateTransformElement::updateAnimatedValue): (WebCore::transformListFor): (WebCore::SVGAnimateTransformElement::applyAnimatedValueToElement): (WebCore::SVGAnimateTransformElement::calculateFromAndToValues): (WebCore::SVGAnimateTransformElement::calculateFromAndByValues): (WebCore::SVGAnimateTransformElement::startedActiveInterval): (WebCore::SVGAnimateTransformElement::parseTransformValue):
svg/SVGAnimateTransformElement.h:

Concrete anmation element classes.

svg/SVGAnimationElement.cpp: (WebCore::SVGAnimationElement::SVGAnimationElement): (WebCore::SVGAnimationElement::~SVGAnimationElement): (WebCore::parseKeyTimes): (WebCore::parseKeySplines): (WebCore::SVGAnimationElement::parseMappedAttribute): (WebCore::SVGAnimationElement::attributeChanged): (WebCore::SVGAnimationElement::getStartTime): (WebCore::SVGAnimationElement::getCurrentTime): (WebCore::SVGAnimationElement::getSimpleDuration): (WebCore::SVGAnimationElement::beginElement): (WebCore::SVGAnimationElement::beginElementAt): (WebCore::SVGAnimationElement::endElement): (WebCore::SVGAnimationElement::endElementAt): (WebCore::SVGAnimationElement::animationMode): (WebCore::SVGAnimationElement::calcMode): (WebCore::SVGAnimationElement::attributeType): (WebCore::SVGAnimationElement::toValue): (WebCore::SVGAnimationElement::byValue): (WebCore::SVGAnimationElement::fromValue): (WebCore::SVGAnimationElement::attributeName): (WebCore::SVGAnimationElement::isAdditive): (WebCore::SVGAnimationElement::isAccumulated): (WebCore::SVGAnimationElement::hasValidTarget): (WebCore::SVGAnimationElement::targetAttributeIsCSS): (WebCore::SVGAnimationElement::setTargetAttributeAnimatedValue): (WebCore::SVGAnimationElement::targetAttributeBaseValue): (WebCore::solveEpsilon): (WebCore::SVGAnimationElement::currentValuesForValuesAnimation): (WebCore::SVGAnimationElement::startedActiveInterval): (WebCore::SVGAnimationElement::applyAnimation): (WebCore::SVGAnimationElement::unapplyAnimation): (WebCore::SVGAnimationElement::endedActiveInterval):
svg/SVGAnimationElement.h: (WebCore::SVGAnimationElement::):

This is pretty much a complete rewrite of the SVGAnimationElement. Timing related functionality
was refactored to SMILTimingElement class that this class now inherits.

svg/SVGDocumentExtensions.cpp: (WebCore::SVGDocumentExtensions::startAnimations):
svg/SVGElement.cpp: (WebCore::SVGElement::ownerSVGElement):
svg/SVGSVGElement.cpp:

We need to reach the <svg> element from <use> too so go out from the shadow tree.

(WebCore::SVGSVGElement::SVGSVGElement):
(WebCore::SVGSVGElement::~SVGSVGElement):
(WebCore::SVGSVGElement::pauseAnimations):
(WebCore::SVGSVGElement::unpauseAnimations):
(WebCore::SVGSVGElement::animationsPaused):
(WebCore::SVGSVGElement::getCurrentTime):
(WebCore::SVGSVGElement::willSaveToCache):
(WebCore::SVGSVGElement::willRestoreFromCache):

svg/SVGSVGElement.h: (WebCore::SVGSVGElement::timeContainer):
svg/SVGSetElement.cpp: (WebCore::SVGSetElement::applyAnimatedValueToElement): (WebCore::SVGSetElement::calculateFromAndToValues): (WebCore::SVGSetElement::calculateFromAndByValues): (WebCore::SVGSetElement::updateAnimatedValue):
svg/SVGSetElement.h:

Concrete anmation element classes.

svg/SVGTimer.cpp: Removed.
svg/SVGTimer.h: Removed.
svg/SVGUseElement.cpp: (WebCore::SVGUseElement::removedFromDocument):
svg/TimeScheduler.cpp: Removed.
svg/TimeScheduler.h: Removed.

Replaced these with SMILTimeContainer class.

svg/animation: Added.
svg/animation/SMILTime.cpp: Added. (WebCore::operator+): (WebCore::operator-): (WebCore::operator*):
svg/animation/SMILTime.h: Added. (WebCore::SMILTime::SMILTime): (WebCore::SMILTime::unresolved): (WebCore::SMILTime::indefinite): (WebCore::SMILTime::operator=): (WebCore::SMILTime::value): (WebCore::SMILTime::isFinite): (WebCore::SMILTime::isIndefinite): (WebCore::SMILTime::isUnresolved): (WebCore::operator==): (WebCore::operator!=): (WebCore::operator>): (WebCore::operator<): (WebCore::operator>=): (WebCore::operator<=): (WebCore::max): (WebCore::min):

A floating point number with special values "indefinite" and "unresolved". Defines math for those.

svg/animation/SMILTimeContainer.cpp: Added. (WebCore::SMILTimeContainer::SMILTimeContainer): (WebCore::SMILTimeContainer::schedule): (WebCore::SMILTimeContainer::unschedule): (WebCore::SMILTimeContainer::elapsed): (WebCore::SMILTimeContainer::isActive): (WebCore::SMILTimeContainer::isPaused): (WebCore::SMILTimeContainer::begin): (WebCore::SMILTimeContainer::pause): (WebCore::SMILTimeContainer::resume): (WebCore::SMILTimeContainer::startTimer): (WebCore::SMILTimeContainer::timerFired): (WebCore::SMILTimeContainer::updateAnimations):
svg/animation/SMILTimeContainer.h: Added.

Manages the clock and time line for active animations in a document.

svg/animation/SVGSMILElement.cpp: Added. (WebCore::ConditionEventListener::ConditionEventListener): (WebCore::ConditionEventListener::handleEvent): (WebCore::SVGSMILElement::Condition::Condition): (WebCore::SVGSMILElement::SVGSMILElement): (WebCore::SVGSMILElement::~SVGSMILElement): (WebCore::SVGSMILElement::insertedIntoDocument): (WebCore::SVGSMILElement::removedFromDocument): (WebCore::SVGSMILElement::finishParsingChildren): (WebCore::SVGSMILElement::parseOffsetValue): (WebCore::SVGSMILElement::parseClockValue): (WebCore::smilTimeSortFunction): (WebCore::sortTimeList): (WebCore::SVGSMILElement::parseCondition): (WebCore::SVGSMILElement::isTimingElement): (WebCore::SVGSMILElement::parseBeginOrEnd): (WebCore::SVGSMILElement::parseMappedAttribute): (WebCore::SVGSMILElement::attributeChanged): (WebCore::SVGSMILElement::connectConditions): (WebCore::SVGSMILElement::disconnectConditions): (WebCore::SVGSMILElement::reschedule): (WebCore::SVGSMILElement::targetElement): (WebCore::SVGSMILElement::elapsed): (WebCore::SVGSMILElement::restart): (WebCore::SVGSMILElement::fill): (WebCore::SVGSMILElement::xlinkHref): (WebCore::SVGSMILElement::dur): (WebCore::SVGSMILElement::repeatDur): (WebCore::SVGSMILElement::repeatCount): (WebCore::SVGSMILElement::maxValue): (WebCore::SVGSMILElement::minValue): (WebCore::SVGSMILElement::simpleDuration): (WebCore::SVGSMILElement::addBeginTime): (WebCore::SVGSMILElement::addEndTime): (WebCore::SVGSMILElement::findInstanceTime): (WebCore::SVGSMILElement::repeatingDuration): (WebCore::SVGSMILElement::resolveActiveEnd): (WebCore::SVGSMILElement::resolveInterval): (WebCore::SVGSMILElement::resolveFirstInterval): (WebCore::SVGSMILElement::resolveNextInterval): (WebCore::SVGSMILElement::nextProgressTime): (WebCore::SVGSMILElement::beginListChanged): (WebCore::SVGSMILElement::endListChanged): (WebCore::SVGSMILElement::checkRestart): (WebCore::SVGSMILElement::calculateAnimationPercentAndRepeat): (WebCore::SVGSMILElement::calculateNextProgressTime): (WebCore::SVGSMILElement::determineActiveState): (WebCore::SVGSMILElement::progress): (WebCore::SVGSMILElement::notifyDependentsIntervalChanged): (WebCore::SVGSMILElement::createInstanceTimesFromSyncbase): (WebCore::SVGSMILElement::addTimeDependent): (WebCore::SVGSMILElement::removeTimeDependent): (WebCore::SVGSMILElement::handleConditionEvent): (WebCore::SVGSMILElement::beginByLinkActivation):
svg/animation/SVGSMILElement.h: Added. (WebCore::SVGSMILElement::timeContainer): (WebCore::SVGSMILElement::): (WebCore::SVGSMILElement::intervalBegin): (WebCore::SVGSMILElement::intervalEnd): (WebCore::SVGSMILElement::Condition::):

This abstract class implements the SMIL timing model. As an output it produces calls
to these virtual functions:

virtual void startedActiveInterval() = 0;
virtual void applyAnimation(float percent, unsigned repeat) = 0;
virtual void unapplyAnimation() = 0;
virtual void endedActiveInterval() = 0;

Location:

trunk/WebCore

Files:

: 7 added
: 4 removed
: 25 modified

ChangeLog (modified) (1 diff)
GNUmakefile.am (modified) (3 diffs)
WebCore.pro (modified) (3 diffs)
WebCore.vcproj/WebCore.vcproj (modified) (8 diffs)
WebCore.xcodeproj/project.pbxproj (modified) (14 diffs)
dom/Document.cpp (modified) (1 diff)
history/CachedPage.cpp (modified) (1 diff)
svg/SVGAElement.cpp (modified) (2 diffs)
svg/SVGAnimateColorElement.cpp (modified) (3 diffs)
svg/SVGAnimateColorElement.h (modified) (1 diff)
svg/SVGAnimateElement.cpp (modified) (4 diffs)
svg/SVGAnimateElement.h (modified) (2 diffs)
svg/SVGAnimateMotionElement.cpp (modified) (6 diffs)
svg/SVGAnimateMotionElement.h (modified) (3 diffs)
svg/SVGAnimateTransformElement.cpp (modified) (4 diffs)
svg/SVGAnimateTransformElement.h (modified) (2 diffs)
svg/SVGAnimationElement.cpp (modified) (5 diffs)
svg/SVGAnimationElement.h (modified) (5 diffs)
svg/SVGDocumentExtensions.cpp (modified) (2 diffs)
svg/SVGElement.cpp (modified) (1 diff)
svg/SVGSVGElement.cpp (modified) (5 diffs)
svg/SVGSVGElement.h (modified) (3 diffs)
svg/SVGSetElement.cpp (modified) (3 diffs)
svg/SVGSetElement.h (modified) (1 diff)
svg/SVGTimer.cpp (deleted)
svg/SVGTimer.h (deleted)
svg/SVGUseElement.cpp (modified) (1 diff)
svg/TimeScheduler.cpp (deleted)
svg/TimeScheduler.h (deleted)
svg/animation (added)
svg/animation/SMILTime.cpp (added)
svg/animation/SMILTime.h (added)
svg/animation/SMILTimeContainer.cpp (added)
svg/animation/SMILTimeContainer.h (added)
svg/animation/SVGSMILElement.cpp (added)
svg/animation/SVGSMILElement.h (added)

Legend:

: Unmodified
: Added
: Removed

trunk/WebCore/ChangeLog

r31797	r31801
	1	2008-04-10 Antti Koivisto <antti@apple.com>
	2
	3	Reviewed by Eric.
	4
	5	Redo the SVG animation support.
	6
	7	It does
	8	- Full SMIL interval timing model including syncbase and event base timing (the hard part).
	9	- CSS and XML attribute animation.
	10	- Linear, discrete and spline calcModes.
	11	- Values animation with keyTimes and keySplines.
	12	- Link activated animations.
	13	- Pretty good support for <animate> and <set> animations
	14	- Basic support for <animateColor>, <animateMotion> and <animateTransform>.
	15
	16	This passes some 35 of the 56 tests in W3C SVG animation test suite, a bunch more
	17	with some subtest failures.
	18
	19	What is still missing
	20	- Additive animation with multiple animations operating on the same property. This is a
	21	major architectural feature in animation code. It shouldn't be too hard to add.
	22	- Only <animate> implements accumulate.
	23	- <animateMotion> does not do paths, keypoints, rotate.
	24	- <animateTransform> does not work correctly in all cases
	25	- calcMode paced is missing.
	26	- repeat, beginEvent, endEvent are missing.
	27	- accesskey() is missing.
	28	- JS does not see correct values for baseVal/animVal, changing values that are being
	29	animted for a script produces wrong results. This problem needs to be solved outside
	30	the animation code.
	31	- Some other stuff I forgot or do not know about.
	32
	33	* GNUmakefile.am:
	34	* WebCore.pro:
	35	* WebCore.vcproj/WebCore.vcproj:
	36	* WebCore.xcodeproj/project.pbxproj:
	37	* dom/Document.cpp:
	38	* history/CachedPage.cpp:
	39	(WebCore::CachedPage::CachedPage):
	40
	41	Use cache notification mechanism to start/stop animations.
	42
	43	* svg/SVGAElement.cpp:
	44	(WebCore::SVGAElement::defaultEventHandler):
	45
	46	Start target animation on link activation.
	47
	48	* svg/SVGAnimateColorElement.cpp:
	49	(WebCore::SVGAnimateColorElement::applyAnimatedValueToElement):
	50	(WebCore::SVGAnimateColorElement::updateAnimatedValue):
	51	(WebCore::SVGAnimateColorElement::calculateFromAndToValues):
	52	(WebCore::SVGAnimateColorElement::calculateFromAndByValues):
	53	* svg/SVGAnimateColorElement.h:
	54	* svg/SVGAnimateElement.cpp:
	55	(WebCore::SVGAnimateElement::SVGAnimateElement):
	56	(WebCore::parseNumberValueAndUnit):
	57	(WebCore::SVGAnimateElement::applyAnimatedValueToElement):
	58	(WebCore::SVGAnimateElement::updateAnimatedValue):
	59	(WebCore::isColorAttribute):
	60	(WebCore::SVGAnimateElement::calculateFromAndToValues):
	61	(WebCore::SVGAnimateElement::calculateFromAndByValues):
	62	* svg/SVGAnimateElement.h:
	63	(WebCore::SVGAnimateElement::):
	64	* svg/SVGAnimateMotionElement.cpp:
	65	(WebCore::SVGAnimateMotionElement::SVGAnimateMotionElement):
	66	(WebCore::SVGAnimateMotionElement::parseMappedAttribute):
	67	(WebCore::SVGAnimateMotionElement::updateAnimatedValue):
	68	(WebCore::parsePoint):
	69	(WebCore::SVGAnimateMotionElement::calculateFromAndToValues):
	70	(WebCore::SVGAnimateMotionElement::calculateFromAndByValues):
	71	(WebCore::SVGAnimateMotionElement::applyAnimatedValueToElement):
	72	(WebCore::SVGAnimateMotionElement::startedActiveInterval):
	73	* svg/SVGAnimateMotionElement.h:
	74	* svg/SVGAnimateTransformElement.cpp:
	75	(WebCore::SVGAnimateTransformElement::SVGAnimateTransformElement):
	76	(WebCore::SVGAnimateTransformElement::hasValidTarget):
	77	(WebCore::SVGAnimateTransformElement::updateAnimatedValue):
	78	(WebCore::transformListFor):
	79	(WebCore::SVGAnimateTransformElement::applyAnimatedValueToElement):
	80	(WebCore::SVGAnimateTransformElement::calculateFromAndToValues):
	81	(WebCore::SVGAnimateTransformElement::calculateFromAndByValues):
	82	(WebCore::SVGAnimateTransformElement::startedActiveInterval):
	83	(WebCore::SVGAnimateTransformElement::parseTransformValue):
	84	* svg/SVGAnimateTransformElement.h:
	85
	86	Concrete anmation element classes.
	87
	88	* svg/SVGAnimationElement.cpp:
	89	(WebCore::SVGAnimationElement::SVGAnimationElement):
	90	(WebCore::SVGAnimationElement::~SVGAnimationElement):
	91	(WebCore::parseKeyTimes):
	92	(WebCore::parseKeySplines):
	93	(WebCore::SVGAnimationElement::parseMappedAttribute):
	94	(WebCore::SVGAnimationElement::attributeChanged):
	95	(WebCore::SVGAnimationElement::getStartTime):
	96	(WebCore::SVGAnimationElement::getCurrentTime):
	97	(WebCore::SVGAnimationElement::getSimpleDuration):
	98	(WebCore::SVGAnimationElement::beginElement):
	99	(WebCore::SVGAnimationElement::beginElementAt):
	100	(WebCore::SVGAnimationElement::endElement):
	101	(WebCore::SVGAnimationElement::endElementAt):
	102	(WebCore::SVGAnimationElement::animationMode):
	103	(WebCore::SVGAnimationElement::calcMode):
	104	(WebCore::SVGAnimationElement::attributeType):
	105	(WebCore::SVGAnimationElement::toValue):
	106	(WebCore::SVGAnimationElement::byValue):
	107	(WebCore::SVGAnimationElement::fromValue):
	108	(WebCore::SVGAnimationElement::attributeName):
	109	(WebCore::SVGAnimationElement::isAdditive):
	110	(WebCore::SVGAnimationElement::isAccumulated):
	111	(WebCore::SVGAnimationElement::hasValidTarget):
	112	(WebCore::SVGAnimationElement::targetAttributeIsCSS):
	113	(WebCore::SVGAnimationElement::setTargetAttributeAnimatedValue):
	114	(WebCore::SVGAnimationElement::targetAttributeBaseValue):
	115	(WebCore::solveEpsilon):
	116	(WebCore::SVGAnimationElement::currentValuesForValuesAnimation):
	117	(WebCore::SVGAnimationElement::startedActiveInterval):
	118	(WebCore::SVGAnimationElement::applyAnimation):
	119	(WebCore::SVGAnimationElement::unapplyAnimation):
	120	(WebCore::SVGAnimationElement::endedActiveInterval):
	121	* svg/SVGAnimationElement.h:
	122	(WebCore::SVGAnimationElement::):
	123
	124	This is pretty much a complete rewrite of the SVGAnimationElement. Timing related functionality
	125	was refactored to SMILTimingElement class that this class now inherits.
	126
	127	* svg/SVGDocumentExtensions.cpp:
	128	(WebCore::SVGDocumentExtensions::startAnimations):
	129	* svg/SVGElement.cpp:
	130	(WebCore::SVGElement::ownerSVGElement):
	131	* svg/SVGSVGElement.cpp:
	132
	133	We need to reach the <svg> element from <use> too so go out from the shadow tree.
	134
	135	(WebCore::SVGSVGElement::SVGSVGElement):
	136	(WebCore::SVGSVGElement::~SVGSVGElement):
	137	(WebCore::SVGSVGElement::pauseAnimations):
	138	(WebCore::SVGSVGElement::unpauseAnimations):
	139	(WebCore::SVGSVGElement::animationsPaused):
	140	(WebCore::SVGSVGElement::getCurrentTime):
	141	(WebCore::SVGSVGElement::willSaveToCache):
	142	(WebCore::SVGSVGElement::willRestoreFromCache):
	143	* svg/SVGSVGElement.h:
	144	(WebCore::SVGSVGElement::timeContainer):
	145	* svg/SVGSetElement.cpp:
	146	(WebCore::SVGSetElement::applyAnimatedValueToElement):
	147	(WebCore::SVGSetElement::calculateFromAndToValues):
	148	(WebCore::SVGSetElement::calculateFromAndByValues):
	149	(WebCore::SVGSetElement::updateAnimatedValue):
	150	* svg/SVGSetElement.h:
	151
	152	Concrete anmation element classes.
	153
	154	* svg/SVGTimer.cpp: Removed.
	155	* svg/SVGTimer.h: Removed.
	156	* svg/SVGUseElement.cpp:
	157	(WebCore::SVGUseElement::removedFromDocument):
	158	* svg/TimeScheduler.cpp: Removed.
	159	* svg/TimeScheduler.h: Removed.
	160
	161	Replaced these with SMILTimeContainer class.
	162
	163	* svg/animation: Added.
	164	* svg/animation/SMILTime.cpp: Added.
	165	(WebCore::operator+):
	166	(WebCore::operator-):
	167	(WebCore::operator*):
	168	* svg/animation/SMILTime.h: Added.
	169	(WebCore::SMILTime::SMILTime):
	170	(WebCore::SMILTime::unresolved):
	171	(WebCore::SMILTime::indefinite):
	172	(WebCore::SMILTime::operator=):
	173	(WebCore::SMILTime::value):
	174	(WebCore::SMILTime::isFinite):
	175	(WebCore::SMILTime::isIndefinite):
	176	(WebCore::SMILTime::isUnresolved):
	177	(WebCore::operator==):
	178	(WebCore::operator!=):
	179	(WebCore::operator>):
	180	(WebCore::operator<):
	181	(WebCore::operator>=):
	182	(WebCore::operator<=):
	183	(WebCore::max):
	184	(WebCore::min):
	185
	186	A floating point number with special values "indefinite" and "unresolved". Defines math for those.
	187
	188	* svg/animation/SMILTimeContainer.cpp: Added.
	189	(WebCore::SMILTimeContainer::SMILTimeContainer):
	190	(WebCore::SMILTimeContainer::schedule):
	191	(WebCore::SMILTimeContainer::unschedule):
	192	(WebCore::SMILTimeContainer::elapsed):
	193	(WebCore::SMILTimeContainer::isActive):
	194	(WebCore::SMILTimeContainer::isPaused):
	195	(WebCore::SMILTimeContainer::begin):
	196	(WebCore::SMILTimeContainer::pause):
	197	(WebCore::SMILTimeContainer::resume):
	198	(WebCore::SMILTimeContainer::startTimer):
	199	(WebCore::SMILTimeContainer::timerFired):
	200	(WebCore::SMILTimeContainer::updateAnimations):
	201	* svg/animation/SMILTimeContainer.h: Added.
	202
	203	Manages the clock and time line for active animations in a document.
	204
	205	* svg/animation/SVGSMILElement.cpp: Added.
	206	(WebCore::ConditionEventListener::ConditionEventListener):
	207	(WebCore::ConditionEventListener::handleEvent):
	208	(WebCore::SVGSMILElement::Condition::Condition):
	209	(WebCore::SVGSMILElement::SVGSMILElement):
	210	(WebCore::SVGSMILElement::~SVGSMILElement):
	211	(WebCore::SVGSMILElement::insertedIntoDocument):
	212	(WebCore::SVGSMILElement::removedFromDocument):
	213	(WebCore::SVGSMILElement::finishParsingChildren):
	214	(WebCore::SVGSMILElement::parseOffsetValue):
	215	(WebCore::SVGSMILElement::parseClockValue):
	216	(WebCore::smilTimeSortFunction):
	217	(WebCore::sortTimeList):
	218	(WebCore::SVGSMILElement::parseCondition):
	219	(WebCore::SVGSMILElement::isTimingElement):
	220	(WebCore::SVGSMILElement::parseBeginOrEnd):
	221	(WebCore::SVGSMILElement::parseMappedAttribute):
	222	(WebCore::SVGSMILElement::attributeChanged):
	223	(WebCore::SVGSMILElement::connectConditions):
	224	(WebCore::SVGSMILElement::disconnectConditions):
	225	(WebCore::SVGSMILElement::reschedule):
	226	(WebCore::SVGSMILElement::targetElement):
	227	(WebCore::SVGSMILElement::elapsed):
	228	(WebCore::SVGSMILElement::restart):
	229	(WebCore::SVGSMILElement::fill):
	230	(WebCore::SVGSMILElement::xlinkHref):
	231	(WebCore::SVGSMILElement::dur):
	232	(WebCore::SVGSMILElement::repeatDur):
	233	(WebCore::SVGSMILElement::repeatCount):
	234	(WebCore::SVGSMILElement::maxValue):
	235	(WebCore::SVGSMILElement::minValue):
	236	(WebCore::SVGSMILElement::simpleDuration):
	237	(WebCore::SVGSMILElement::addBeginTime):
	238	(WebCore::SVGSMILElement::addEndTime):
	239	(WebCore::SVGSMILElement::findInstanceTime):
	240	(WebCore::SVGSMILElement::repeatingDuration):
	241	(WebCore::SVGSMILElement::resolveActiveEnd):
	242	(WebCore::SVGSMILElement::resolveInterval):
	243	(WebCore::SVGSMILElement::resolveFirstInterval):
	244	(WebCore::SVGSMILElement::resolveNextInterval):
	245	(WebCore::SVGSMILElement::nextProgressTime):
	246	(WebCore::SVGSMILElement::beginListChanged):
	247	(WebCore::SVGSMILElement::endListChanged):
	248	(WebCore::SVGSMILElement::checkRestart):
	249	(WebCore::SVGSMILElement::calculateAnimationPercentAndRepeat):
	250	(WebCore::SVGSMILElement::calculateNextProgressTime):
	251	(WebCore::SVGSMILElement::determineActiveState):
	252	(WebCore::SVGSMILElement::progress):
	253	(WebCore::SVGSMILElement::notifyDependentsIntervalChanged):
	254	(WebCore::SVGSMILElement::createInstanceTimesFromSyncbase):
	255	(WebCore::SVGSMILElement::addTimeDependent):
	256	(WebCore::SVGSMILElement::removeTimeDependent):
	257	(WebCore::SVGSMILElement::handleConditionEvent):
	258	(WebCore::SVGSMILElement::beginByLinkActivation):
	259	* svg/animation/SVGSMILElement.h: Added.
	260	(WebCore::SVGSMILElement::timeContainer):
	261	(WebCore::SVGSMILElement::):
	262	(WebCore::SVGSMILElement::intervalBegin):
	263	(WebCore::SVGSMILElement::intervalEnd):
	264	(WebCore::SVGSMILElement::Condition::):
	265
	266	This abstract class implements the SMIL timing model. As an output it produces calls
	267	to these virtual functions:
	268
	269	virtual void startedActiveInterval() = 0;
	270	virtual void applyAnimation(float percent, unsigned repeat) = 0;
	271	virtual void unapplyAnimation() = 0;
	272	virtual void endedActiveInterval() = 0;
	273
1	274	2008-04-10 Antti Koivisto <antti@apple.com>
2	275

trunk/WebCore/GNUmakefile.am

r31793	r31801
1769	1769	-DENABLE_SVG=1 \
1770	1770	-I\$(top_srcdir)/WebCore/svg \
	1771	-I\$(top_srcdir)/WebCore/svg/animation
1771	1772	-I\$(top_srcdir)/WebCore/svg/graphics \
1772	1773	-I\$(top_srcdir)/WebCore/svg/graphics/filters
…	…
1790	1791	WebCore/svg/SVGDocumentExtensions.cpp \
1791	1792	WebCore/svg/SVGImageLoader.cpp \
1792		~~WebCore/svg/SVGTimer.cpp \~~
1793		~~WebCore/svg/TimeScheduler.cpp \~~
1794	1793	WebCore/svg/ColorDistance.cpp \
1795	1794	WebCore/svg/SVGAElement.cpp \
…	…
1920	1919	WebCore/svg/SVGViewSpec.cpp \
1921	1920	WebCore/svg/SVGZoomAndPan.cpp \
	1921	WebCore/svg/animation/SMILTime.cpp \
	1922	WebCore/svg/animation/SMILTimeContainer.cpp \
	1923	WebCore/svg/animation/SVGSMILElement.cpp \
1922	1924	WebCore/svg/graphics/filters/SVGFEBlend.cpp \
1923	1925	WebCore/svg/graphics/filters/SVGFEColorMatrix.cpp \

trunk/WebCore/WebCore.pro

r31793	r31801
196	196	$$PWD/platform/network \
197	197	$$PWD/platform/graphics \
	198	$$PWD/svg/animation \
198	199	$$PWD/svg/graphics \
199	200	$$PWD/svg/graphics/filters \
…	…
1481	1482	svg/SVGDocumentExtensions.cpp \
1482	1483	svg/SVGImageLoader.cpp \
1483		~~svg/SVGTimer.cpp \~~
1484		~~svg/TimeScheduler.cpp \~~
1485	1484	svg/ColorDistance.cpp \
1486	1485	svg/SVGAElement.cpp \
…	…
1610	1609	svg/SVGViewSpec.cpp \
1611	1610	svg/SVGZoomAndPan.cpp \
	1611	WebCore/svg/animation/SMILTime.cpp \
	1612	WebCore/svg/animation/SMILTimeContainer.cpp \
	1613	WebCore/svg/animation/SVGSMILElement.cpp \
1612	1614	svg/graphics/filters/SVGFEBlend.cpp \
1613	1615	svg/graphics/filters/SVGFEColorMatrix.cpp \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

r31797	r31801
41	41	<Tool
42	42	Name="VCCLCompilerTool"
43		AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cg";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cg";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitOutputDir)\include\QtMovieWin""
	43	AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cg";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cg";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitOutputDir)\include\QtMovieWin";"$(ProjectDir)..\svg\animation""
44	44	PreprocessorDefinitions="__WIN32__;ENABLE_CROSS_DOCUMENT_MESSAGING;ENABLE_DOM_STORAGE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_ANIMATION;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FOREIGN_OBJECT;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;ENABLE_VIDEO"
45	45	UsePrecompiledHeader="2"
…	…
103	103	<Tool
104	104	Name="VCCLCompilerTool"
105		AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cg";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cg";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitOutputDir)\include\QtMovieWin""
	105	AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cg";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cg";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitOutputDir)\include\QtMovieWin";"$(ProjectDir)..\svg\animation""
106	106	PreprocessorDefinitions="__WIN32__;ENABLE_CROSS_DOCUMENT_MESSAGING;ENABLE_DOM_STORAGE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_ANIMATION;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FOREIGN_OBJECT;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;ENABLE_VIDEO"
107	107	UsePrecompiledHeader="2"
…	…
164	164	<Tool
165	165	Name="VCCLCompilerTool"
166		AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cg";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cg";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitOutputDir)\include\QtMovieWin""
	166	AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cg";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cg";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitOutputDir)\include\QtMovieWin";"$(ProjectDir)..\svg\animation""
167	167	PreprocessorDefinitions="__WIN32__;ENABLE_CROSS_DOCUMENT_MESSAGING;ENABLE_DOM_STORAGE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_ANIMATION;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FOREIGN_OBJECT;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;ENABLE_VIDEO"
168	168	UsePrecompiledHeader="2"
…	…
226	226	<Tool
227	227	Name="VCCLCompilerTool"
228		AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\curl";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cairo";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitOutputDir)\include\QtMovieWin""
	228	AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\curl";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cairo";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitOutputDir)\include\QtMovieWin";"$(ProjectDir)..\svg\animation""
229	229	PreprocessorDefinitions="__WIN32__;ENABLE_CROSS_DOCUMENT_MESSAGING;ENABLE_DOM_STORAGE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_ANIMATION;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FOREIGN_OBJECT;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;ENABLE_VIDEO"
230	230	UsePrecompiledHeader="2"
…	…
289	289	<Tool
290	290	Name="VCCLCompilerTool"
291		AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\curl";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(Proje