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

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

Issue 1576423005: Revert of Fix null dereference on MemoryCache. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2564
Patch Set: Created 4 years, 11 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) 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef CSSCrossfadeValue_h 26 #ifndef CSSCrossfadeValue_h
27 #define CSSCrossfadeValue_h 27 #define CSSCrossfadeValue_h
28 28
29 #include "core/CoreExport.h"
30 #include "core/css/CSSImageGeneratorValue.h" 29 #include "core/css/CSSImageGeneratorValue.h"
31 #include "core/css/CSSPrimitiveValue.h" 30 #include "core/css/CSSPrimitiveValue.h"
32 #include "core/fetch/ImageResource.h" 31 #include "core/fetch/ImageResource.h"
33 #include "core/fetch/ImageResourceClient.h" 32 #include "core/fetch/ImageResourceClient.h"
34 #include "core/fetch/ResourcePtr.h" 33 #include "core/fetch/ResourcePtr.h"
35 #include "platform/graphics/Image.h" 34 #include "platform/graphics/Image.h"
36 35
37 namespace blink { 36 namespace blink {
38 37
39 class ImageResource; 38 class ImageResource;
40 class CrossfadeSubimageObserverProxy; 39 class CrossfadeSubimageObserverProxy;
41 class LayoutObject; 40 class LayoutObject;
42 41
43 class CORE_EXPORT CSSCrossfadeValue final : public CSSImageGeneratorValue { 42 class CSSCrossfadeValue final : public CSSImageGeneratorValue {
44 friend class CrossfadeSubimageObserverProxy; 43 friend class CrossfadeSubimageObserverProxy;
45 public: 44 public:
46 static PassRefPtrWillBeRawPtr<CSSCrossfadeValue> create(PassRefPtrWillBeRawP tr<CSSValue> fromValue, PassRefPtrWillBeRawPtr<CSSValue> toValue, PassRefPtrWill BeRawPtr<CSSPrimitiveValue> percentageValue) 45 static PassRefPtrWillBeRawPtr<CSSCrossfadeValue> create(PassRefPtrWillBeRawP tr<CSSValue> fromValue, PassRefPtrWillBeRawPtr<CSSValue> toValue, PassRefPtrWill BeRawPtr<CSSPrimitiveValue> percentageValue)
47 { 46 {
48 return adoptRefWillBeNoop(new CSSCrossfadeValue(fromValue, toValue, perc entageValue)); 47 return adoptRefWillBeNoop(new CSSCrossfadeValue(fromValue, toValue, perc entageValue));
49 } 48 }
50 49
51 ~CSSCrossfadeValue(); 50 ~CSSCrossfadeValue();
52 51
53 String customCSSText() const; 52 String customCSSText() const;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 RefPtr<Image> m_generatedImage; 116 RefPtr<Image> m_generatedImage;
118 117
119 CrossfadeSubimageObserverProxy m_crossfadeSubimageObserver; 118 CrossfadeSubimageObserverProxy m_crossfadeSubimageObserver;
120 }; 119 };
121 120
122 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCrossfadeValue, isCrossfadeValue()); 121 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCrossfadeValue, isCrossfadeValue());
123 122
124 } // namespace blink 123 } // namespace blink
125 124
126 #endif // CSSCrossfadeValue_h 125 #endif // CSSCrossfadeValue_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/core.gypi ('k') | third_party/WebKit/Source/core/css/CSSImageValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698