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

Side by Side Diff: Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp

Issue 10540037: Merge 118608 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 extensions->addResource(m_id, this); 158 extensions->addResource(m_id, this);
159 159
160 // Update cached resources of pending clients. 160 // Update cached resources of pending clients.
161 const SVGDocumentExtensions::SVGPendingElements::const_iterator end = client s->end(); 161 const SVGDocumentExtensions::SVGPendingElements::const_iterator end = client s->end();
162 for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients- >begin(); it != end; ++it) { 162 for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients- >begin(); it != end; ++it) {
163 ASSERT((*it)->hasPendingResources()); 163 ASSERT((*it)->hasPendingResources());
164 (*it)->clearHasPendingResourcesIfPossible(); 164 (*it)->clearHasPendingResourcesIfPossible();
165 RenderObject* renderer = (*it)->renderer(); 165 RenderObject* renderer = (*it)->renderer();
166 if (!renderer) 166 if (!renderer)
167 continue; 167 continue;
168 SVGResourcesCache::clientUpdatedFromElement(renderer, renderer->style()) ; 168 SVGResourcesCache::clientStyleChanged(renderer, StyleDifferenceLayout, r enderer->style());
169 renderer->setNeedsLayout(true); 169 renderer->setNeedsLayout(true);
170 } 170 }
171 } 171 }
172 172
173 // FIXME: This does not belong here. 173 // FIXME: This does not belong here.
174 AffineTransform RenderSVGResourceContainer::transformOnNonScalingStroke(RenderOb ject* object, const AffineTransform& resourceTransform) 174 AffineTransform RenderSVGResourceContainer::transformOnNonScalingStroke(RenderOb ject* object, const AffineTransform& resourceTransform)
175 { 175 {
176 if (!object->isSVGShape()) 176 if (!object->isSVGShape())
177 return resourceTransform; 177 return resourceTransform;
178 178
179 SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableE lement*>(object->node()); 179 SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableE lement*>(object->node());
180 AffineTransform transform = element->getScreenCTM(SVGLocatable::DisallowStyl eUpdate); 180 AffineTransform transform = element->getScreenCTM(SVGLocatable::DisallowStyl eUpdate);
181 transform *= resourceTransform; 181 transform *= resourceTransform;
182 return transform; 182 return transform;
183 } 183 }
184 184
185 } 185 }
186 186
187 #endif 187 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/svg/RenderSVGModelObject.cpp ('k') | Source/WebCore/rendering/svg/RenderSVGRoot.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698