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

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

Issue 11316291: Merge 135719 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 void RenderSVGResourceContainer::addClient(RenderObject* client) 145 void RenderSVGResourceContainer::addClient(RenderObject* client)
146 { 146 {
147 ASSERT(client); 147 ASSERT(client);
148 m_clients.add(client); 148 m_clients.add(client);
149 } 149 }
150 150
151 void RenderSVGResourceContainer::removeClient(RenderObject* client) 151 void RenderSVGResourceContainer::removeClient(RenderObject* client)
152 { 152 {
153 ASSERT(client); 153 ASSERT(client);
154 removeClientFromCache(client, false);
154 m_clients.remove(client); 155 m_clients.remove(client);
155 } 156 }
156 157
157 void RenderSVGResourceContainer::addClientRenderLayer(RenderLayer* client) 158 void RenderSVGResourceContainer::addClientRenderLayer(RenderLayer* client)
158 { 159 {
159 ASSERT(client); 160 ASSERT(client);
160 m_clientLayers.add(client); 161 m_clientLayers.add(client);
161 } 162 }
162 163
163 void RenderSVGResourceContainer::removeClientRenderLayer(RenderLayer* client) 164 void RenderSVGResourceContainer::removeClientRenderLayer(RenderLayer* client)
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 222
222 SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableE lement*>(object->node()); 223 SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableE lement*>(object->node());
223 AffineTransform transform = element->getScreenCTM(SVGLocatable::DisallowStyl eUpdate); 224 AffineTransform transform = element->getScreenCTM(SVGLocatable::DisallowStyl eUpdate);
224 transform *= resourceTransform; 225 transform *= resourceTransform;
225 return transform; 226 return transform;
226 } 227 }
227 228
228 } 229 }
229 230
230 #endif 231 #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