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

Side by Side Diff: Source/WebCore/svg/SVGElement.cpp

Issue 10917095: Merge 125147 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 3 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/SVGElement.h ('k') | Source/WebCore/svg/SVGExternalResourcesRequired.cpp » ('j') | 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) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org> 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org>
3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
4 * Copyright (C) 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2008 Apple Inc. All rights reserved.
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> 6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 ASSERT(sendParentLoadEvents); 470 ASSERT(sendParentLoadEvents);
471 471
472 // If the load event was not sent yet by Document::implicitClose(), but the <image> from the example 472 // If the load event was not sent yet by Document::implicitClose(), but the <image> from the example
473 // above, just appeared, don't send the SVGLoad event to the outermost < svg>, but wait for the document 473 // above, just appeared, don't send the SVGLoad event to the outermost < svg>, but wait for the document
474 // to be "ready to render", first. 474 // to be "ready to render", first.
475 if (!document()->loadEventFinished()) 475 if (!document()->loadEventFinished())
476 break; 476 break;
477 } 477 }
478 } 478 }
479 479
480 void SVGElement::sendSVGLoadEventIfPossibleAsynchronously()
481 {
482 svgLoadEventTimer()->startOneShot(0);
483 }
484
485 void SVGElement::svgLoadEventTimerFired(Timer<SVGElement>*)
486 {
487 sendSVGLoadEventIfPossible();
488 }
489
490 Timer<SVGElement>* SVGElement::svgLoadEventTimer()
491 {
492 ASSERT_NOT_REACHED();
493 return 0;
494 }
495
480 void SVGElement::finishParsingChildren() 496 void SVGElement::finishParsingChildren()
481 { 497 {
482 StyledElement::finishParsingChildren(); 498 StyledElement::finishParsingChildren();
483 499
484 // The outermost SVGSVGElement SVGLoad event is fired through Document::disp atchWindowLoadEvent. 500 // The outermost SVGSVGElement SVGLoad event is fired through Document::disp atchWindowLoadEvent.
485 if (isOutermostSVGSVGElement()) 501 if (isOutermostSVGSVGElement())
486 return; 502 return;
487 503
488 // finishParsingChildren() is called when the close tag is reached for an el ement (e.g. </svg>) 504 // finishParsingChildren() is called when the close tag is reached for an el ement (e.g. </svg>)
489 // we send SVGLoad events here if we can, otherwise they'll be sent when any required loads finish 505 // we send SVGLoad events here if we can, otherwise they'll be sent when any required loads finish
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 animatableAttributes.add(SVGNames::yChannelSelectorAttr); 740 animatableAttributes.add(SVGNames::yChannelSelectorAttr);
725 animatableAttributes.add(SVGNames::zAttr); 741 animatableAttributes.add(SVGNames::zAttr);
726 } 742 }
727 return animatableAttributes.contains(name); 743 return animatableAttributes.contains(name);
728 } 744 }
729 #endif 745 #endif
730 746
731 } 747 }
732 748
733 #endif // ENABLE(SVG) 749 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « Source/WebCore/svg/SVGElement.h ('k') | Source/WebCore/svg/SVGExternalResourcesRequired.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698