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

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

Issue 11434065: Merge 135719 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years 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/stale-resource-data-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) 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 143
144 void RenderSVGResourceContainer::addClient(RenderObject* client) 144 void RenderSVGResourceContainer::addClient(RenderObject* client)
145 { 145 {
146 ASSERT(client); 146 ASSERT(client);
147 m_clients.add(client); 147 m_clients.add(client);
148 } 148 }
149 149
150 void RenderSVGResourceContainer::removeClient(RenderObject* client) 150 void RenderSVGResourceContainer::removeClient(RenderObject* client)
151 { 151 {
152 ASSERT(client); 152 ASSERT(client);
153 removeClientFromCache(client, false);
153 m_clients.remove(client); 154 m_clients.remove(client);
154 } 155 }
155 156
156 void RenderSVGResourceContainer::addClientRenderLayer(RenderLayer* client) 157 void RenderSVGResourceContainer::addClientRenderLayer(RenderLayer* client)
157 { 158 {
158 ASSERT(client); 159 ASSERT(client);
159 m_clientLayers.add(client); 160 m_clientLayers.add(client);
160 } 161 }
161 162
162 void RenderSVGResourceContainer::removeClientRenderLayer(RenderLayer* client) 163 void RenderSVGResourceContainer::removeClientRenderLayer(RenderLayer* client)
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 221
221 SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableE lement*>(object->node()); 222 SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableE lement*>(object->node());
222 AffineTransform transform = element->getScreenCTM(SVGLocatable::DisallowStyl eUpdate); 223 AffineTransform transform = element->getScreenCTM(SVGLocatable::DisallowStyl eUpdate);
223 transform *= resourceTransform; 224 transform *= resourceTransform;
224 return transform; 225 return transform;
225 } 226 }
226 227
227 } 228 }
228 229
229 #endif 230 #endif
OLDNEW
« no previous file with comments | « LayoutTests/svg/custom/stale-resource-data-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698