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

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

Issue 1773503002: Shortcut ImageResource::canRender() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/fetch/ImageResource.h » ('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) 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 ASSERT_NOT_REACHED(); 82 ASSERT_NOT_REACHED();
83 83
84 return nullptr; 84 return nullptr;
85 } 85 }
86 86
87 static Image* renderableImageForCSSValue(CSSValue* value, const LayoutObject* la youtObject) 87 static Image* renderableImageForCSSValue(CSSValue* value, const LayoutObject* la youtObject)
88 { 88 {
89 ImageResource* cachedImage = cachedImageForCSSValue(value, &layoutObject->do cument()); 89 ImageResource* cachedImage = cachedImageForCSSValue(value, &layoutObject->do cument());
90 90
91 if (!cachedImage || !cachedImage->canRender()) 91 if (!cachedImage || cachedImage->errorOccurred() || cachedImage->image()->is Null())
92 return nullptr; 92 return nullptr;
93 93
94 return cachedImage->image(); 94 return cachedImage->image();
95 } 95 }
96 96
97 static KURL urlForCSSValue(const CSSValue* value) 97 static KURL urlForCSSValue(const CSSValue* value)
98 { 98 {
99 if (!value->isImageValue()) 99 if (!value->isImageValue())
100 return KURL(); 100 return KURL();
101 101
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 visitor->trace(m_fromValue); 277 visitor->trace(m_fromValue);
278 visitor->trace(m_toValue); 278 visitor->trace(m_toValue);
279 visitor->trace(m_percentageValue); 279 visitor->trace(m_percentageValue);
280 visitor->trace(m_cachedFromImage); 280 visitor->trace(m_cachedFromImage);
281 visitor->trace(m_cachedToImage); 281 visitor->trace(m_cachedToImage);
282 visitor->trace(m_crossfadeSubimageObserver); 282 visitor->trace(m_crossfadeSubimageObserver);
283 CSSImageGeneratorValue::traceAfterDispatch(visitor); 283 CSSImageGeneratorValue::traceAfterDispatch(visitor);
284 } 284 }
285 285
286 } // namespace blink 286 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/fetch/ImageResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698