Chromium Code Reviews| 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 |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
| 15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
| 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
| 18 */ | 18 */ |
| 19 | 19 |
| 20 #include "core/layout/svg/SVGResourcesCache.h" | 20 #include "core/layout/svg/SVGResourcesCache.h" |
| 21 | 21 |
| 22 #include "core/HTMLNames.h" | 22 #include "core/HTMLNames.h" |
| 23 #include "core/dom/ElementTraversal.h" | |
| 23 #include "core/layout/svg/LayoutSVGResourceContainer.h" | 24 #include "core/layout/svg/LayoutSVGResourceContainer.h" |
| 24 #include "core/layout/svg/SVGResources.h" | 25 #include "core/layout/svg/SVGResources.h" |
| 25 #include "core/layout/svg/SVGResourcesCycleSolver.h" | 26 #include "core/layout/svg/SVGResourcesCycleSolver.h" |
| 26 #include "core/svg/SVGDocumentExtensions.h" | 27 #include "core/svg/SVGDocumentExtensions.h" |
| 27 #include <memory> | 28 #include <memory> |
| 28 | 29 |
| 29 namespace blink { | 30 namespace blink { |
| 30 | 31 |
| 31 SVGResourcesCache::SVGResourcesCache() {} | 32 SVGResourcesCache::SVGResourcesCache() {} |
| 32 | 33 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 110 | 111 |
| 111 if (!diff.hasDifference() || !layoutObject->parent()) | 112 if (!diff.hasDifference() || !layoutObject->parent()) |
| 112 return; | 113 return; |
| 113 | 114 |
| 114 // In this case the proper SVGFE*Element will decide whether the modified CSS | 115 // In this case the proper SVGFE*Element will decide whether the modified CSS |
| 115 // properties require | 116 // properties require |
| 116 // a relayout or paintInvalidation. | 117 // a relayout or paintInvalidation. |
| 117 if (layoutObject->isSVGResourceFilterPrimitive() && !diff.needsLayout()) | 118 if (layoutObject->isSVGResourceFilterPrimitive() && !diff.needsLayout()) |
| 118 return; | 119 return; |
| 119 | 120 |
| 121 LayoutObject* current = layoutObject->parent(); | |
| 122 while (current) { | |
| 123 if (current->isSVGResourceContainer()) { | |
| 124 if (newStyle.visibility() == EVisibility::kVisible) { | |
| 125 LayoutSVGResourceContainer* container = | |
| 126 toLayoutSVGResourceContainer(current); | |
| 127 for (auto client : container->clients()) { | |
| 128 if (client) { | |
| 129 LayoutRect boundingBox = client->visualRect(); | |
| 130 if (client->style()->visibility() == EVisibility::Visible && | |
| 131 !boundingBox.width() && !boundingBox.height()) | |
| 132 LayoutSVGResourceContainer::markForLayoutAndParentResourceInvalida tion(client, true); | |
|
fs
2017/01/16 10:03:10
Why isn't this handled by the call to markForLayou
| |
| 133 } | |
| 134 } | |
| 135 } | |
| 136 break; | |
| 137 } | |
| 138 current = current->parent(); | |
| 139 } | |
| 140 | |
| 120 // Dynamic changes of CSS properties like 'clip-path' may require us to | 141 // Dynamic changes of CSS properties like 'clip-path' may require us to |
| 121 // recompute the associated resources for a LayoutObject. | 142 // recompute the associated resources for a LayoutObject. |
| 122 // TODO(fs): Avoid passing in a useless StyleDifference, but instead compare | 143 // TODO(fs): Avoid passing in a useless StyleDifference, but instead compare |
| 123 // oldStyle/newStyle to see which resources changed to be able to selectively | 144 // oldStyle/newStyle to see which resources changed to be able to selectively |
| 124 // rebuild individual resources, instead of all of them. | 145 // rebuild individual resources, instead of all of them. |
| 125 if (layoutObjectCanHaveResources(layoutObject)) { | 146 if (layoutObjectCanHaveResources(layoutObject)) { |
| 126 SVGResourcesCache& cache = resourcesCache(layoutObject->document()); | 147 SVGResourcesCache& cache = resourcesCache(layoutObject->document()); |
| 127 cache.removeResourcesFromLayoutObject(layoutObject); | 148 cache.removeResourcesFromLayoutObject(layoutObject); |
| 128 cache.addResourcesFromLayoutObject(layoutObject, newStyle); | 149 cache.addResourcesFromLayoutObject(layoutObject, newStyle); |
| 129 } | 150 } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 ASSERT(layoutObject); | 183 ASSERT(layoutObject); |
| 163 | 184 |
| 164 SVGResources* resources = cachedResourcesForLayoutObject(layoutObject); | 185 SVGResources* resources = cachedResourcesForLayoutObject(layoutObject); |
| 165 if (resources) | 186 if (resources) |
| 166 resources->removeClientFromCache(layoutObject); | 187 resources->removeClientFromCache(layoutObject); |
| 167 SVGResourcesCache& cache = resourcesCache(layoutObject->document()); | 188 SVGResourcesCache& cache = resourcesCache(layoutObject->document()); |
| 168 cache.removeResourcesFromLayoutObject(layoutObject); | 189 cache.removeResourcesFromLayoutObject(layoutObject); |
| 169 } | 190 } |
| 170 | 191 |
| 171 } // namespace blink | 192 } // namespace blink |
| OLD | NEW |