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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleResourceLoader.cpp

Issue 1387113002: Change StyleResolverState.styleImage() to take a const CSSValue& (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added TODOs to replace the members with const members Created 5 years, 2 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
OLDNEW
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 elementStyleResources.clearPendingSVGDocuments(); 77 elementStyleResources.clearPendingSVGDocuments();
78 } 78 }
79 79
80 static PassRefPtrWillBeRawPtr<StyleImage> doLoadPendingImage(Document* document, StylePendingImage* pendingImage, float deviceScaleFactor, const ResourceLoaderO ptions& options) 80 static PassRefPtrWillBeRawPtr<StyleImage> doLoadPendingImage(Document* document, StylePendingImage* pendingImage, float deviceScaleFactor, const ResourceLoaderO ptions& options)
81 { 81 {
82 if (CSSImageValue* imageValue = pendingImage->cssImageValue()) 82 if (CSSImageValue* imageValue = pendingImage->cssImageValue())
83 return imageValue->cacheImage(document, options); 83 return imageValue->cacheImage(document, options);
84 84
85 if (CSSImageGeneratorValue* imageGeneratorValue = pendingImage->cssImageGene ratorValue()) { 85 if (CSSImageGeneratorValue* imageGeneratorValue = pendingImage->cssImageGene ratorValue()) {
86 imageGeneratorValue->loadSubimages(document); 86 imageGeneratorValue->loadSubimages(document);
87 return StyleGeneratedImage::create(imageGeneratorValue); 87 return StyleGeneratedImage::create(*imageGeneratorValue);
88 } 88 }
89 89
90 if (CSSCursorImageValue* cursorImageValue = pendingImage->cssCursorImageValu e()) 90 if (CSSCursorImageValue* cursorImageValue = pendingImage->cssCursorImageValu e())
91 return cursorImageValue->cacheImage(document, deviceScaleFactor); 91 return cursorImageValue->cacheImage(document, deviceScaleFactor);
92 92
93 if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue()) 93 if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue())
94 return imageSetValue->cacheImageSet(document, deviceScaleFactor, options ); 94 return imageSetValue->cacheImageSet(document, deviceScaleFactor, options );
95 95
96 return nullptr; 96 return nullptr;
97 } 97 }
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 void StyleResourceLoader::loadPendingResources(ComputedStyle* computedStyle, Ele mentStyleResources& elementStyleResources) 203 void StyleResourceLoader::loadPendingResources(ComputedStyle* computedStyle, Ele mentStyleResources& elementStyleResources)
204 { 204 {
205 // Start loading images referenced by this style. 205 // Start loading images referenced by this style.
206 loadPendingImages(computedStyle, elementStyleResources); 206 loadPendingImages(computedStyle, elementStyleResources);
207 207
208 // Start loading the SVG Documents referenced by this style. 208 // Start loading the SVG Documents referenced by this style.
209 loadPendingSVGDocuments(computedStyle, elementStyleResources); 209 loadPendingSVGDocuments(computedStyle, elementStyleResources);
210 } 210 }
211 211
212 } 212 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698