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

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

Issue 1226293002: Fix virtual/override/final usage in Source/core/{animation,css,style}/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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/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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 , m_cachedFromImage(0) 81 , m_cachedFromImage(0)
82 , m_cachedToImage(0) 82 , m_cachedToImage(0)
83 , m_crossfadeSubimageObserver(this) { } 83 , m_crossfadeSubimageObserver(this) { }
84 84
85 class CrossfadeSubimageObserverProxy final : public ImageResourceClient { 85 class CrossfadeSubimageObserverProxy final : public ImageResourceClient {
86 public: 86 public:
87 CrossfadeSubimageObserverProxy(CSSCrossfadeValue* ownerValue) 87 CrossfadeSubimageObserverProxy(CSSCrossfadeValue* ownerValue)
88 : m_ownerValue(ownerValue) 88 : m_ownerValue(ownerValue)
89 , m_ready(false) { } 89 , m_ready(false) { }
90 90
91 virtual ~CrossfadeSubimageObserverProxy() { } 91 ~CrossfadeSubimageObserverProxy() override { }
92 virtual void imageChanged(ImageResource*, const IntRect* = nullptr) over ride; 92 void imageChanged(ImageResource*, const IntRect* = nullptr) override;
93 void setReady(bool ready) { m_ready = ready; } 93 void setReady(bool ready) { m_ready = ready; }
94 private: 94 private:
95 CSSCrossfadeValue* m_ownerValue; 95 CSSCrossfadeValue* m_ownerValue;
96 bool m_ready; 96 bool m_ready;
97 }; 97 };
98 98
99 void crossfadeChanged(const IntRect&); 99 void crossfadeChanged(const IntRect&);
100 100
101 RefPtrWillBeMember<CSSValue> m_fromValue; 101 RefPtrWillBeMember<CSSValue> m_fromValue;
102 RefPtrWillBeMember<CSSValue> m_toValue; 102 RefPtrWillBeMember<CSSValue> m_toValue;
103 RefPtrWillBeMember<CSSPrimitiveValue> m_percentageValue; 103 RefPtrWillBeMember<CSSPrimitiveValue> m_percentageValue;
104 104
105 ResourcePtr<ImageResource> m_cachedFromImage; 105 ResourcePtr<ImageResource> m_cachedFromImage;
106 ResourcePtr<ImageResource> m_cachedToImage; 106 ResourcePtr<ImageResource> m_cachedToImage;
107 107
108 RefPtr<Image> m_generatedImage; 108 RefPtr<Image> m_generatedImage;
109 109
110 CrossfadeSubimageObserverProxy m_crossfadeSubimageObserver; 110 CrossfadeSubimageObserverProxy m_crossfadeSubimageObserver;
111 }; 111 };
112 112
113 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCrossfadeValue, isCrossfadeValue()); 113 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCrossfadeValue, isCrossfadeValue());
114 114
115 } // namespace blink 115 } // namespace blink
116 116
117 #endif // CSSCrossfadeValue_h 117 #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