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

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

Issue 2680683003: Remove faulty assertion in LayoutSVGResourceContainer::registerResource (Closed)
Patch Set: Created 3 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
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/masking/mask-valid-reference-wrong-element-type-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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 // Cache us with the new id. 223 // Cache us with the new id.
224 treeScopeResources.addResource(m_id, this); 224 treeScopeResources.addResource(m_id, this);
225 225
226 // Update cached resources of pending clients. 226 // Update cached resources of pending clients.
227 for (const auto& pendingClient : *clients) { 227 for (const auto& pendingClient : *clients) {
228 DCHECK(pendingClient->hasPendingResources()); 228 DCHECK(pendingClient->hasPendingResources());
229 treeScopeResources.clearHasPendingResourcesIfPossible(pendingClient); 229 treeScopeResources.clearHasPendingResourcesIfPossible(pendingClient);
230 LayoutObject* layoutObject = pendingClient->layoutObject(); 230 LayoutObject* layoutObject = pendingClient->layoutObject();
231 if (!layoutObject) 231 if (!layoutObject)
232 continue; 232 continue;
233 DCHECK(layoutObject->isSVG() && (resourceType() != FilterResourceType || 233 DCHECK(layoutObject->isSVG());
234 !layoutObject->isSVGRoot()));
235 234
236 StyleDifference diff; 235 StyleDifference diff;
237 diff.setNeedsFullLayout(); 236 diff.setNeedsFullLayout();
238 SVGResourcesCache::clientStyleChanged(layoutObject, diff, 237 SVGResourcesCache::clientStyleChanged(layoutObject, diff,
239 layoutObject->styleRef()); 238 layoutObject->styleRef());
240 layoutObject->setNeedsLayoutAndFullPaintInvalidation( 239 layoutObject->setNeedsLayoutAndFullPaintInvalidation(
241 LayoutInvalidationReason::SvgResourceInvalidated); 240 LayoutInvalidationReason::SvgResourceInvalidated);
242 } 241 }
243 } 242 }
244 243
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 // This will process the rest of the ancestors. 301 // This will process the rest of the ancestors.
303 toLayoutSVGResourceContainer(current)->removeAllClientsFromCache(); 302 toLayoutSVGResourceContainer(current)->removeAllClientsFromCache();
304 break; 303 break;
305 } 304 }
306 305
307 current = current->parent(); 306 current = current->parent();
308 } 307 }
309 } 308 }
310 309
311 } // namespace blink 310 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/masking/mask-valid-reference-wrong-element-type-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698