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

Side by Side Diff: Source/core/css/CSSCrossfadeValue.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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 if (m_cachedToImage) 160 if (m_cachedToImage)
161 m_cachedToImage->addClient(&m_crossfadeSubimageObserver); 161 m_cachedToImage->addClient(&m_crossfadeSubimageObserver);
162 } 162 }
163 163
164 m_crossfadeSubimageObserver.setReady(true); 164 m_crossfadeSubimageObserver.setReady(true);
165 } 165 }
166 166
167 PassRefPtr<Image> CSSCrossfadeValue::image(RenderObject* renderer, const IntSize & size) 167 PassRefPtr<Image> CSSCrossfadeValue::image(RenderObject* renderer, const IntSize & size)
168 { 168 {
169 if (size.isEmpty()) 169 if (size.isEmpty())
170 return 0; 170 return nullptr;
171 171
172 ResourceFetcher* fetcher = renderer->document().fetcher(); 172 ResourceFetcher* fetcher = renderer->document().fetcher();
173 ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), f etcher); 173 ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), f etcher);
174 ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue.get(), fetch er); 174 ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue.get(), fetch er);
175 175
176 if (!cachedFromImage || !cachedToImage) 176 if (!cachedFromImage || !cachedToImage)
177 return Image::nullImage(); 177 return Image::nullImage();
178 178
179 Image* fromImage = cachedFromImage->imageForRenderer(renderer); 179 Image* fromImage = cachedFromImage->imageForRenderer(renderer);
180 Image* toImage = cachedToImage->imageForRenderer(renderer); 180 Image* toImage = cachedToImage->imageForRenderer(renderer);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 void CSSCrossfadeValue::traceAfterDispatch(Visitor* visitor) 221 void CSSCrossfadeValue::traceAfterDispatch(Visitor* visitor)
222 { 222 {
223 visitor->trace(m_fromValue); 223 visitor->trace(m_fromValue);
224 visitor->trace(m_toValue); 224 visitor->trace(m_toValue);
225 visitor->trace(m_percentageValue); 225 visitor->trace(m_percentageValue);
226 CSSImageGeneratorValue::traceAfterDispatch(visitor); 226 CSSImageGeneratorValue::traceAfterDispatch(visitor);
227 } 227 }
228 228
229 } // namespace WebCore 229 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSCursorImageValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698