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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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 | Annotate | Revision Log
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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 return StyleGeneratedImage::create(imageGeneratorValue); 81 return StyleGeneratedImage::create(imageGeneratorValue);
82 } 82 }
83 83
84 if (CSSCursorImageValue* cursorImageValue 84 if (CSSCursorImageValue* cursorImageValue
85 = pendingImage->cssCursorImageValue()) 85 = pendingImage->cssCursorImageValue())
86 return cursorImageValue->cachedImage(fetcher, deviceScaleFactor); 86 return cursorImageValue->cachedImage(fetcher, deviceScaleFactor);
87 87
88 if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue()) 88 if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue())
89 return imageSetValue->cachedImageSet(fetcher, deviceScaleFactor, options ); 89 return imageSetValue->cachedImageSet(fetcher, deviceScaleFactor, options );
90 90
91 return 0; 91 return nullptr;
92 } 92 }
93 93
94 PassRefPtr<StyleImage> StyleResourceLoader::loadPendingImage(StylePendingImage* pendingImage, float deviceScaleFactor) 94 PassRefPtr<StyleImage> StyleResourceLoader::loadPendingImage(StylePendingImage* pendingImage, float deviceScaleFactor)
95 { 95 {
96 return doLoadPendingImage(m_fetcher, pendingImage, deviceScaleFactor, Resour ceFetcher::defaultResourceOptions()); 96 return doLoadPendingImage(m_fetcher, pendingImage, deviceScaleFactor, Resour ceFetcher::defaultResourceOptions());
97 } 97 }
98 98
99 void StyleResourceLoader::loadPendingShapeImage(RenderStyle* renderStyle, ShapeV alue* shapeValue, float deviceScaleFactor) 99 void StyleResourceLoader::loadPendingShapeImage(RenderStyle* renderStyle, ShapeV alue* shapeValue, float deviceScaleFactor)
100 { 100 {
101 if (!shapeValue) 101 if (!shapeValue)
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 void StyleResourceLoader::loadPendingResources(RenderStyle* renderStyle, Element StyleResources& elementStyleResources) 201 void StyleResourceLoader::loadPendingResources(RenderStyle* renderStyle, Element StyleResources& elementStyleResources)
202 { 202 {
203 // Start loading images referenced by this style. 203 // Start loading images referenced by this style.
204 loadPendingImages(renderStyle, elementStyleResources); 204 loadPendingImages(renderStyle, elementStyleResources);
205 205
206 // Start loading the SVG Documents referenced by this style. 206 // Start loading the SVG Documents referenced by this style.
207 loadPendingSVGDocuments(renderStyle, elementStyleResources); 207 loadPendingSVGDocuments(renderStyle, elementStyleResources);
208 } 208 }
209 209
210 } 210 }
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.cpp ('k') | Source/core/css/resolver/ViewportStyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698