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

Side by Side Diff: Source/core/css/resolver/ElementStyleResources.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
« no previous file with comments | « Source/core/css/resolver/CSSToStyleMap.cpp ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 return generatedOrPendingFromValue(property, toCSSGradientValue(valu e)->gradientWithStylesResolved(textLinkColors, currentColor).get()); 47 return generatedOrPendingFromValue(property, toCSSGradientValue(valu e)->gradientWithStylesResolved(textLinkColors, currentColor).get());
48 return generatedOrPendingFromValue(property, toCSSImageGeneratorValue(va lue)); 48 return generatedOrPendingFromValue(property, toCSSImageGeneratorValue(va lue));
49 } 49 }
50 50
51 if (value->isImageSetValue()) 51 if (value->isImageSetValue())
52 return setOrPendingFromValue(property, toCSSImageSetValue(value)); 52 return setOrPendingFromValue(property, toCSSImageSetValue(value));
53 53
54 if (value->isCursorImageValue()) 54 if (value->isCursorImageValue())
55 return cursorOrPendingFromValue(property, toCSSCursorImageValue(value)); 55 return cursorOrPendingFromValue(property, toCSSCursorImageValue(value));
56 56
57 return 0; 57 return nullptr;
58 } 58 }
59 59
60 PassRefPtr<StyleImage> ElementStyleResources::generatedOrPendingFromValue(CSSPro pertyID property, CSSImageGeneratorValue* value) 60 PassRefPtr<StyleImage> ElementStyleResources::generatedOrPendingFromValue(CSSPro pertyID property, CSSImageGeneratorValue* value)
61 { 61 {
62 if (value->isPending()) { 62 if (value->isPending()) {
63 m_pendingImageProperties.set(property, value); 63 m_pendingImageProperties.set(property, value);
64 return StylePendingImage::create(value); 64 return StylePendingImage::create(value);
65 } 65 }
66 return StyleGeneratedImage::create(value); 66 return StyleGeneratedImage::create(value);
67 } 67 }
(...skipping 21 matching lines...) Expand all
89 m_pendingImageProperties.set(property, value); 89 m_pendingImageProperties.set(property, value);
90 return image.release(); 90 return image.release();
91 } 91 }
92 92
93 void ElementStyleResources::addPendingSVGDocument(FilterOperation* filterOperati on, CSSSVGDocumentValue* cssSVGDocumentValue) 93 void ElementStyleResources::addPendingSVGDocument(FilterOperation* filterOperati on, CSSSVGDocumentValue* cssSVGDocumentValue)
94 { 94 {
95 m_pendingSVGDocuments.set(filterOperation, cssSVGDocumentValue); 95 m_pendingSVGDocuments.set(filterOperation, cssSVGDocumentValue);
96 } 96 }
97 97
98 } 98 }
OLDNEW
« no previous file with comments | « Source/core/css/resolver/CSSToStyleMap.cpp ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698