| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 4 * Copyright (C) 2013 Google Inc. All rights reserved. | 4 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 style->setMaskBoxImageSource(loadPendingImage(toStylePendingImag
e(style->maskBoxImageSource()), elementStyleResources.deviceScaleFactor())); | 182 style->setMaskBoxImageSource(loadPendingImage(toStylePendingImag
e(style->maskBoxImageSource()), elementStyleResources.deviceScaleFactor())); |
| 183 break; | 183 break; |
| 184 } | 184 } |
| 185 case CSSPropertyWebkitMaskImage: { | 185 case CSSPropertyWebkitMaskImage: { |
| 186 for (FillLayer* maskLayer = style->accessMaskLayers(); maskLayer; ma
skLayer = maskLayer->next()) { | 186 for (FillLayer* maskLayer = style->accessMaskLayers(); maskLayer; ma
skLayer = maskLayer->next()) { |
| 187 if (maskLayer->image() && maskLayer->image()->isPendingImage()) | 187 if (maskLayer->image() && maskLayer->image()->isPendingImage()) |
| 188 maskLayer->setImage(loadPendingImage(toStylePendingImage(mas
kLayer->image()), elementStyleResources.deviceScaleFactor())); | 188 maskLayer->setImage(loadPendingImage(toStylePendingImage(mas
kLayer->image()), elementStyleResources.deviceScaleFactor())); |
| 189 } | 189 } |
| 190 break; | 190 break; |
| 191 } | 191 } |
| 192 case CSSPropertyShapeInside: | |
| 193 loadPendingShapeImage(style, style->shapeInside(), elementStyleResou
rces.deviceScaleFactor()); | |
| 194 break; | |
| 195 case CSSPropertyShapeOutside: | 192 case CSSPropertyShapeOutside: |
| 196 loadPendingShapeImage(style, style->shapeOutside(), elementStyleReso
urces.deviceScaleFactor()); | 193 loadPendingShapeImage(style, style->shapeOutside(), elementStyleReso
urces.deviceScaleFactor()); |
| 197 break; | 194 break; |
| 198 default: | 195 default: |
| 199 ASSERT_NOT_REACHED(); | 196 ASSERT_NOT_REACHED(); |
| 200 } | 197 } |
| 201 } | 198 } |
| 202 | 199 |
| 203 elementStyleResources.clearPendingImageProperties(); | 200 elementStyleResources.clearPendingImageProperties(); |
| 204 } | 201 } |
| 205 | 202 |
| 206 void StyleResourceLoader::loadPendingResources(RenderStyle* renderStyle, Element
StyleResources& elementStyleResources) | 203 void StyleResourceLoader::loadPendingResources(RenderStyle* renderStyle, Element
StyleResources& elementStyleResources) |
| 207 { | 204 { |
| 208 // Start loading images referenced by this style. | 205 // Start loading images referenced by this style. |
| 209 loadPendingImages(renderStyle, elementStyleResources); | 206 loadPendingImages(renderStyle, elementStyleResources); |
| 210 | 207 |
| 211 // Start loading the SVG Documents referenced by this style. | 208 // Start loading the SVG Documents referenced by this style. |
| 212 loadPendingSVGDocuments(renderStyle, elementStyleResources); | 209 loadPendingSVGDocuments(renderStyle, elementStyleResources); |
| 213 } | 210 } |
| 214 | 211 |
| 215 } | 212 } |
| OLD | NEW |