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

Side by Side Diff: cc/blink/web_layer_impl.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « cc/blink/web_external_texture_layer_impl.h ('k') | cc/blink/web_layer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_BLINK_WEB_LAYER_IMPL_H_ 5 #ifndef CC_BLINK_WEB_LAYER_IMPL_H_
6 #define CC_BLINK_WEB_LAYER_IMPL_H_ 6 #define CC_BLINK_WEB_LAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 virtual bool isContainerForFixedPositionLayers() const; 130 virtual bool isContainerForFixedPositionLayers() const;
131 virtual void setPositionConstraint( 131 virtual void setPositionConstraint(
132 const blink::WebLayerPositionConstraint& constraint); 132 const blink::WebLayerPositionConstraint& constraint);
133 virtual blink::WebLayerPositionConstraint positionConstraint() const; 133 virtual blink::WebLayerPositionConstraint positionConstraint() const;
134 virtual void setScrollClient(blink::WebLayerScrollClient* client); 134 virtual void setScrollClient(blink::WebLayerScrollClient* client);
135 virtual bool isOrphan() const; 135 virtual bool isOrphan() const;
136 virtual void setWebLayerClient(blink::WebLayerClient* client); 136 virtual void setWebLayerClient(blink::WebLayerClient* client);
137 137
138 // LayerClient implementation. 138 // LayerClient implementation.
139 virtual scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo() 139 virtual scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo()
140 OVERRIDE; 140 override;
141 141
142 virtual void setScrollParent(blink::WebLayer* parent); 142 virtual void setScrollParent(blink::WebLayer* parent);
143 virtual void setClipParent(blink::WebLayer* parent); 143 virtual void setClipParent(blink::WebLayer* parent);
144 144
145 protected: 145 protected:
146 scoped_refptr<cc::Layer> layer_; 146 scoped_refptr<cc::Layer> layer_;
147 blink::WebLayerClient* web_layer_client_; 147 blink::WebLayerClient* web_layer_client_;
148 148
149 private: 149 private:
150 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; 150 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_;
151 151
152 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); 152 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl);
153 }; 153 };
154 154
155 } // namespace cc_blink 155 } // namespace cc_blink
156 156
157 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ 157 #endif // CC_BLINK_WEB_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/blink/web_external_texture_layer_impl.h ('k') | cc/blink/web_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698