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

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

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 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 | « Source/core/css/CSSComputedStyleDeclaration.h ('k') | Source/core/css/CSSCustomFontData.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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 private: 71 private:
72 CSSCrossfadeValue(PassRefPtrWillBeRawPtr<CSSValue> fromValue, PassRefPtrWill BeRawPtr<CSSValue> toValue) 72 CSSCrossfadeValue(PassRefPtrWillBeRawPtr<CSSValue> fromValue, PassRefPtrWill BeRawPtr<CSSValue> toValue)
73 : CSSImageGeneratorValue(CrossfadeClass) 73 : CSSImageGeneratorValue(CrossfadeClass)
74 , m_fromValue(fromValue) 74 , m_fromValue(fromValue)
75 , m_toValue(toValue) 75 , m_toValue(toValue)
76 , m_cachedFromImage(0) 76 , m_cachedFromImage(0)
77 , m_cachedToImage(0) 77 , m_cachedToImage(0)
78 , m_crossfadeSubimageObserver(this) { } 78 , m_crossfadeSubimageObserver(this) { }
79 79
80 class CrossfadeSubimageObserverProxy FINAL : public ImageResourceClient { 80 class CrossfadeSubimageObserverProxy final : public ImageResourceClient {
81 public: 81 public:
82 CrossfadeSubimageObserverProxy(CSSCrossfadeValue* ownerValue) 82 CrossfadeSubimageObserverProxy(CSSCrossfadeValue* ownerValue)
83 : m_ownerValue(ownerValue) 83 : m_ownerValue(ownerValue)
84 , m_ready(false) { } 84 , m_ready(false) { }
85 85
86 virtual ~CrossfadeSubimageObserverProxy() { } 86 virtual ~CrossfadeSubimageObserverProxy() { }
87 virtual void imageChanged(ImageResource*, const IntRect* = 0) OVERRIDE; 87 virtual void imageChanged(ImageResource*, const IntRect* = 0) override;
88 void setReady(bool ready) { m_ready = ready; } 88 void setReady(bool ready) { m_ready = ready; }
89 private: 89 private:
90 CSSCrossfadeValue* m_ownerValue; 90 CSSCrossfadeValue* m_ownerValue;
91 bool m_ready; 91 bool m_ready;
92 }; 92 };
93 93
94 void crossfadeChanged(const IntRect&); 94 void crossfadeChanged(const IntRect&);
95 95
96 RefPtrWillBeMember<CSSValue> m_fromValue; 96 RefPtrWillBeMember<CSSValue> m_fromValue;
97 RefPtrWillBeMember<CSSValue> m_toValue; 97 RefPtrWillBeMember<CSSValue> m_toValue;
98 RefPtrWillBeMember<CSSPrimitiveValue> m_percentageValue; 98 RefPtrWillBeMember<CSSPrimitiveValue> m_percentageValue;
99 99
100 ResourcePtr<ImageResource> m_cachedFromImage; 100 ResourcePtr<ImageResource> m_cachedFromImage;
101 ResourcePtr<ImageResource> m_cachedToImage; 101 ResourcePtr<ImageResource> m_cachedToImage;
102 102
103 RefPtr<Image> m_generatedImage; 103 RefPtr<Image> m_generatedImage;
104 104
105 CrossfadeSubimageObserverProxy m_crossfadeSubimageObserver; 105 CrossfadeSubimageObserverProxy m_crossfadeSubimageObserver;
106 }; 106 };
107 107
108 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCrossfadeValue, isCrossfadeValue()); 108 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCrossfadeValue, isCrossfadeValue());
109 109
110 } // namespace blink 110 } // namespace blink
111 111
112 #endif // CSSCrossfadeValue_h 112 #endif // CSSCrossfadeValue_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.h ('k') | Source/core/css/CSSCustomFontData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698