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

Side by Side Diff: Source/WebCore/svg/animation/SVGSMILElement.cpp

Issue 11186052: Revert 131767 - Merge 130777 - Prevent animation when CSS attributeType is invalid. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 2 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
« no previous file with comments | « Source/WebCore/svg/animation/SVGSMILElement.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 condition.m_syncbase = 0; 542 condition.m_syncbase = 0;
543 } 543 }
544 } 544 }
545 545
546 void SVGSMILElement::reschedule() 546 void SVGSMILElement::reschedule()
547 { 547 {
548 if (m_timeContainer) 548 if (m_timeContainer)
549 m_timeContainer->schedule(this); 549 m_timeContainer->schedule(this);
550 } 550 }
551 551
552 SVGElement* SVGSMILElement::targetElement(ResolveTarget resolveTarget) 552 SVGElement* SVGSMILElement::targetElement()
553 { 553 {
554 if (m_targetElement) 554 if (m_targetElement)
555 return m_targetElement; 555 return m_targetElement;
556 556
557 if (!inDocument() || resolveTarget == DoNotResolveNewTarget) 557 if (!inDocument())
558 return 0; 558 return 0;
559 559
560 String href = getAttribute(XLinkNames::hrefAttr); 560 String href = getAttribute(XLinkNames::hrefAttr);
561 ContainerNode* target = href.isEmpty() ? parentNode() : SVGURIReference::tar getElementFromIRIString(href, document()); 561 ContainerNode* target = href.isEmpty() ? parentNode() : SVGURIReference::tar getElementFromIRIString(href, document());
562 if (!target || !target->isSVGElement()) 562 if (!target || !target->isSVGElement())
563 return 0; 563 return 0;
564 564
565 SVGElement* targetElement = static_cast<SVGElement*>(target); 565 SVGElement* targetElement = static_cast<SVGElement*>(target);
566 targetElementWillChange(m_targetElement, targetElement); 566 targetElementWillChange(m_targetElement, targetElement);
567 m_targetElement = targetElement; 567 m_targetElement = targetElement;
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 1153
1154 void SVGSMILElement::endedActiveInterval() 1154 void SVGSMILElement::endedActiveInterval()
1155 { 1155 {
1156 clearTimesWithDynamicOrigins(m_beginTimes); 1156 clearTimesWithDynamicOrigins(m_beginTimes);
1157 clearTimesWithDynamicOrigins(m_endTimes); 1157 clearTimesWithDynamicOrigins(m_endTimes);
1158 } 1158 }
1159 1159
1160 } 1160 }
1161 1161
1162 #endif 1162 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/svg/animation/SVGSMILElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698