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

Side by Side Diff: Source/WebCore/svg/SVGExternalResourcesRequired.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.cpp ('k') | Source/WebCore/svg/SVGScriptElement.h » ('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, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2007 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2007 Rob Buis <buis@kde.org>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 void SVGExternalResourcesRequired::insertedIntoDocument(SVGElement* targetElemen t) 97 void SVGExternalResourcesRequired::insertedIntoDocument(SVGElement* targetElemen t)
98 { 98 {
99 if (isParserInserted()) 99 if (isParserInserted())
100 return; 100 return;
101 101
102 // Eventually send SVGLoad event now for the dynamically inserted script ele ment. 102 // Eventually send SVGLoad event now for the dynamically inserted script ele ment.
103 if (externalResourcesRequiredBaseValue()) 103 if (externalResourcesRequiredBaseValue())
104 return; 104 return;
105 setHaveFiredLoadEvent(true); 105 setHaveFiredLoadEvent(true);
106 targetElement->sendSVGLoadEventIfPossible(); 106 targetElement->sendSVGLoadEventIfPossibleAsynchronously();
107 } 107 }
108 108
109 void SVGExternalResourcesRequired::finishParsingChildren() 109 void SVGExternalResourcesRequired::finishParsingChildren()
110 { 110 {
111 // A SVGLoad event has been fired by SVGElement::finishParsingChildren. 111 // A SVGLoad event has been fired by SVGElement::finishParsingChildren.
112 if (!externalResourcesRequiredBaseValue()) 112 if (!externalResourcesRequiredBaseValue())
113 setHaveFiredLoadEvent(true); 113 setHaveFiredLoadEvent(true);
114 } 114 }
115 115
116 bool SVGExternalResourcesRequired::haveLoadedRequiredResources() const 116 bool SVGExternalResourcesRequired::haveLoadedRequiredResources() const
117 { 117 {
118 return !externalResourcesRequiredBaseValue() || haveFiredLoadEvent(); 118 return !externalResourcesRequiredBaseValue() || haveFiredLoadEvent();
119 } 119 }
120 120
121 } 121 }
122 122
123 #endif // ENABLE(SVG) 123 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « Source/WebCore/svg/SVGElement.cpp ('k') | Source/WebCore/svg/SVGScriptElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698