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

Side by Side Diff: Source/core/layout/svg/LayoutSVGResourceContainer.cpp

Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Better rebasing. 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/layout/svg/LayoutSVGModelObject.cpp ('k') | Source/core/layout/svg/LayoutSVGRoot.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) 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 ASSERT(client); 166 ASSERT(client);
167 removeClientFromCache(client, false); 167 removeClientFromCache(client, false);
168 m_clients.remove(client); 168 m_clients.remove(client);
169 } 169 }
170 170
171 void LayoutSVGResourceContainer::addClientLayer(Node* node) 171 void LayoutSVGResourceContainer::addClientLayer(Node* node)
172 { 172 {
173 ASSERT(node); 173 ASSERT(node);
174 if (!node->renderer() || !node->renderer()->hasLayer()) 174 if (!node->renderer() || !node->renderer()->hasLayer())
175 return; 175 return;
176 m_clientLayers.add(toLayoutLayerModelObject(node->renderer())->layer()); 176 m_clientLayers.add(toLayoutBoxModelObject(node->renderer())->layer());
177 clearInvalidationMask(); 177 clearInvalidationMask();
178 } 178 }
179 179
180 void LayoutSVGResourceContainer::addClientLayer(Layer* client) 180 void LayoutSVGResourceContainer::addClientLayer(Layer* client)
181 { 181 {
182 ASSERT(client); 182 ASSERT(client);
183 m_clientLayers.add(client); 183 m_clientLayers.add(client);
184 clearInvalidationMask(); 184 clearInvalidationMask();
185 } 185 }
186 186
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 // This will process the rest of the ancestors. 290 // This will process the rest of the ancestors.
291 toLayoutSVGResourceContainer(current)->removeAllClientsFromCache(); 291 toLayoutSVGResourceContainer(current)->removeAllClientsFromCache();
292 break; 292 break;
293 } 293 }
294 294
295 current = current->parent(); 295 current = current->parent();
296 } 296 }
297 } 297 }
298 298
299 } 299 }
OLDNEW
« no previous file with comments | « Source/core/layout/svg/LayoutSVGModelObject.cpp ('k') | Source/core/layout/svg/LayoutSVGRoot.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698