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

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

Issue 10762005: Merge 121491 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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 | « LayoutTests/svg/custom/animate-reference-crash-expected.txt ('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 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 { 549 {
550 if (m_timeContainer) 550 if (m_timeContainer)
551 m_timeContainer->schedule(this); 551 m_timeContainer->schedule(this);
552 } 552 }
553 553
554 SVGElement* SVGSMILElement::targetElement() 554 SVGElement* SVGSMILElement::targetElement()
555 { 555 {
556 if (m_targetElement) 556 if (m_targetElement)
557 return m_targetElement; 557 return m_targetElement;
558 558
559 if (!inDocument())
560 return 0;
561
559 String href = getAttribute(XLinkNames::hrefAttr); 562 String href = getAttribute(XLinkNames::hrefAttr);
560 ContainerNode* target = href.isEmpty() ? parentNode() : SVGURIReference::tar getElementFromIRIString(href, document()); 563 ContainerNode* target = href.isEmpty() ? parentNode() : SVGURIReference::tar getElementFromIRIString(href, document());
561 if (!target || !target->isSVGElement()) 564 if (!target || !target->isSVGElement())
562 return 0; 565 return 0;
563 566
564 SVGElement* targetElement = static_cast<SVGElement*>(target); 567 SVGElement* targetElement = static_cast<SVGElement*>(target);
565 targetElementWillChange(m_targetElement, targetElement); 568 targetElementWillChange(m_targetElement, targetElement);
566 m_targetElement = targetElement; 569 m_targetElement = targetElement;
567 document()->accessSVGExtensions()->addAnimationElementToTarget(this, m_targe tElement); 570 document()->accessSVGExtensions()->addAnimationElementToTarget(this, m_targe tElement);
568 return m_targetElement; 571 return m_targetElement;
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 1150
1148 void SVGSMILElement::endedActiveInterval() 1151 void SVGSMILElement::endedActiveInterval()
1149 { 1152 {
1150 clearTimesWithDynamicOrigins(m_beginTimes); 1153 clearTimesWithDynamicOrigins(m_beginTimes);
1151 clearTimesWithDynamicOrigins(m_endTimes); 1154 clearTimesWithDynamicOrigins(m_endTimes);
1152 } 1155 }
1153 1156
1154 } 1157 }
1155 1158
1156 #endif 1159 #endif
OLDNEW
« no previous file with comments | « LayoutTests/svg/custom/animate-reference-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698