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

Side by Side Diff: Source/core/svg/SVGImageElement.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGImageElement.h ('k') | Source/core/svg/SVGLinearGradientElement.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, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rob Buis <buis@kde.org>
4 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> 4 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 updateRelativeLengthsInformation(); 129 updateRelativeLengthsInformation();
130 130
131 if (SVGURIReference::isKnownAttribute(attrName)) { 131 if (SVGURIReference::isKnownAttribute(attrName)) {
132 if (inDocument()) 132 if (inDocument())
133 imageLoader().updateFromElement(ImageLoader::UpdateIgnorePreviousErr or); 133 imageLoader().updateFromElement(ImageLoader::UpdateIgnorePreviousErr or);
134 else 134 else
135 m_needsLoaderURIUpdate = true; 135 m_needsLoaderURIUpdate = true;
136 return; 136 return;
137 } 137 }
138 138
139 RenderObject* renderer = this->renderer(); 139 LayoutObject* renderer = this->renderer();
140 if (!renderer) 140 if (!renderer)
141 return; 141 return;
142 142
143 if (isLengthAttribute) { 143 if (isLengthAttribute) {
144 if (toRenderSVGImage(renderer)->updateImageViewport()) 144 if (toRenderSVGImage(renderer)->updateImageViewport())
145 markForLayoutAndParentResourceInvalidation(renderer); 145 markForLayoutAndParentResourceInvalidation(renderer);
146 return; 146 return;
147 } 147 }
148 148
149 if (attrName == SVGNames::preserveAspectRatioAttr) { 149 if (attrName == SVGNames::preserveAspectRatioAttr) {
150 markForLayoutAndParentResourceInvalidation(renderer); 150 markForLayoutAndParentResourceInvalidation(renderer);
151 return; 151 return;
152 } 152 }
153 153
154 ASSERT_NOT_REACHED(); 154 ASSERT_NOT_REACHED();
155 } 155 }
156 156
157 bool SVGImageElement::selfHasRelativeLengths() const 157 bool SVGImageElement::selfHasRelativeLengths() const
158 { 158 {
159 return m_x->currentValue()->isRelative() 159 return m_x->currentValue()->isRelative()
160 || m_y->currentValue()->isRelative() 160 || m_y->currentValue()->isRelative()
161 || m_width->currentValue()->isRelative() 161 || m_width->currentValue()->isRelative()
162 || m_height->currentValue()->isRelative(); 162 || m_height->currentValue()->isRelative();
163 } 163 }
164 164
165 RenderObject* SVGImageElement::createRenderer(const RenderStyle&) 165 LayoutObject* SVGImageElement::createRenderer(const RenderStyle&)
166 { 166 {
167 return new RenderSVGImage(this); 167 return new RenderSVGImage(this);
168 } 168 }
169 169
170 bool SVGImageElement::haveLoadedRequiredResources() 170 bool SVGImageElement::haveLoadedRequiredResources()
171 { 171 {
172 return !m_needsLoaderURIUpdate && !imageLoader().hasPendingActivity(); 172 return !m_needsLoaderURIUpdate && !imageLoader().hasPendingActivity();
173 } 173 }
174 174
175 void SVGImageElement::attach(const AttachContext& context) 175 void SVGImageElement::attach(const AttachContext& context)
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 return AtomicString(hrefString()); 210 return AtomicString(hrefString());
211 } 211 }
212 212
213 void SVGImageElement::didMoveToNewDocument(Document& oldDocument) 213 void SVGImageElement::didMoveToNewDocument(Document& oldDocument)
214 { 214 {
215 imageLoader().elementDidMoveToNewDocument(); 215 imageLoader().elementDidMoveToNewDocument();
216 SVGGraphicsElement::didMoveToNewDocument(oldDocument); 216 SVGGraphicsElement::didMoveToNewDocument(oldDocument);
217 } 217 }
218 218
219 } // namespace blink 219 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/svg/SVGImageElement.h ('k') | Source/core/svg/SVGLinearGradientElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698