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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 { | 102 { |
103 if (!shapeValue) | 103 if (!shapeValue) |
104 return; | 104 return; |
105 | 105 |
106 StyleImage* image = shapeValue->image(); | 106 StyleImage* image = shapeValue->image(); |
107 if (!image || !image->isPendingImage()) | 107 if (!image || !image->isPendingImage()) |
108 return; | 108 return; |
109 | 109 |
110 ResourceLoaderOptions options = ResourceFetcher::defaultResourceOptions(); | 110 ResourceLoaderOptions options = ResourceFetcher::defaultResourceOptions(); |
111 options.allowCredentials = DoNotAllowStoredCredentials; | 111 options.allowCredentials = DoNotAllowStoredCredentials; |
| 112 options.credentialsRequested = ClientDidNotRequestCredentials; |
112 options.corsEnabled = IsCORSEnabled; | 113 options.corsEnabled = IsCORSEnabled; |
113 | 114 |
114 shapeValue->setImage(doLoadPendingImage(m_fetcher, toStylePendingImage(image
), deviceScaleFactor, options)); | 115 shapeValue->setImage(doLoadPendingImage(m_fetcher, toStylePendingImage(image
), deviceScaleFactor, options)); |
115 } | 116 } |
116 | 117 |
117 void StyleResourceLoader::loadPendingImages(RenderStyle* style, ElementStyleReso
urces& elementStyleResources) | 118 void StyleResourceLoader::loadPendingImages(RenderStyle* style, ElementStyleReso
urces& elementStyleResources) |
118 { | 119 { |
119 if (elementStyleResources.pendingImageProperties().isEmpty()) | 120 if (elementStyleResources.pendingImageProperties().isEmpty()) |
120 return; | 121 return; |
121 | 122 |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 void StyleResourceLoader::loadPendingResources(RenderStyle* renderStyle, Element
StyleResources& elementStyleResources) | 206 void StyleResourceLoader::loadPendingResources(RenderStyle* renderStyle, Element
StyleResources& elementStyleResources) |
206 { | 207 { |
207 // Start loading images referenced by this style. | 208 // Start loading images referenced by this style. |
208 loadPendingImages(renderStyle, elementStyleResources); | 209 loadPendingImages(renderStyle, elementStyleResources); |
209 | 210 |
210 // Start loading the SVG Documents referenced by this style. | 211 // Start loading the SVG Documents referenced by this style. |
211 loadPendingSVGDocuments(renderStyle, elementStyleResources); | 212 loadPendingSVGDocuments(renderStyle, elementStyleResources); |
212 } | 213 } |
213 | 214 |
214 } | 215 } |
OLD | NEW |