| OLD | NEW |
| 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 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 SVGResourcesCache::~SVGResourcesCache() | 34 SVGResourcesCache::~SVGResourcesCache() |
| 35 { | 35 { |
| 36 } | 36 } |
| 37 | 37 |
| 38 void SVGResourcesCache::addResourcesFromLayoutObject(LayoutObject* object, const
ComputedStyle& style) | 38 void SVGResourcesCache::addResourcesFromLayoutObject(LayoutObject* object, const
ComputedStyle& style) |
| 39 { | 39 { |
| 40 ASSERT(object); | 40 ASSERT(object); |
| 41 ASSERT(!m_cache.contains(object)); | 41 ASSERT(!m_cache.contains(object)); |
| 42 | 42 |
| 43 const SVGComputedStyle& svgStyle = style.svgStyle(); | |
| 44 | |
| 45 // Build a list of all resources associated with the passed LayoutObject. | 43 // Build a list of all resources associated with the passed LayoutObject. |
| 46 OwnPtr<SVGResources> newResources = SVGResources::buildResources(object, svg
Style); | 44 OwnPtr<SVGResources> newResources = SVGResources::buildResources(object, sty
le); |
| 47 if (!newResources) | 45 if (!newResources) |
| 48 return; | 46 return; |
| 49 | 47 |
| 50 // Put object in cache. | 48 // Put object in cache. |
| 51 SVGResources* resources = m_cache.set(object, std::move(newResources)).store
dValue->value.get(); | 49 SVGResources* resources = m_cache.set(object, std::move(newResources)).store
dValue->value.get(); |
| 52 | 50 |
| 53 // Run cycle-detection _afterwards_, so self-references can be caught as wel
l. | 51 // Run cycle-detection _afterwards_, so self-references can be caught as wel
l. |
| 54 SVGResourcesCycleSolver solver(object, resources); | 52 SVGResourcesCycleSolver solver(object, resources); |
| 55 solver.resolveCycles(); | 53 solver.resolveCycles(); |
| 56 | 54 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 ASSERT(layoutObject); | 160 ASSERT(layoutObject); |
| 163 | 161 |
| 164 SVGResources* resources = cachedResourcesForLayoutObject(layoutObject); | 162 SVGResources* resources = cachedResourcesForLayoutObject(layoutObject); |
| 165 if (resources) | 163 if (resources) |
| 166 resources->removeClientFromCache(layoutObject); | 164 resources->removeClientFromCache(layoutObject); |
| 167 SVGResourcesCache& cache = resourcesCache(layoutObject->document()); | 165 SVGResourcesCache& cache = resourcesCache(layoutObject->document()); |
| 168 cache.removeResourcesFromLayoutObject(layoutObject); | 166 cache.removeResourcesFromLayoutObject(layoutObject); |
| 169 } | 167 } |
| 170 | 168 |
| 171 } // namespace blink | 169 } // namespace blink |
| OLD | NEW |