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

Side by Side Diff: webkit/renderer/compositor_bindings/web_layer_impl.h

Issue 122063002: cc: Remove racy initialization code in cc/base/switches.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix dynamic linking problem by adding dynamic_annotations dependency to compositor_bindings Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_ 5 #ifndef WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
6 #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_ 6 #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 class WebToCCAnimationDelegateAdapter; 46 class WebToCCAnimationDelegateAdapter;
47 47
48 class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { 48 class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
49 public: 49 public:
50 WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebLayerImpl(); 50 WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebLayerImpl();
51 WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebLayerImpl( 51 WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebLayerImpl(
52 scoped_refptr<cc::Layer>); 52 scoped_refptr<cc::Layer>);
53 virtual ~WebLayerImpl(); 53 virtual ~WebLayerImpl();
54 54
55 static bool UsingPictureLayer();
56
55 WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::Layer* layer() const; 57 WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::Layer* layer() const;
56 58
57 // WebLayer implementation. 59 // WebLayer implementation.
58 virtual int id() const; 60 virtual int id() const;
59 virtual void invalidateRect(const blink::WebFloatRect&); 61 virtual void invalidateRect(const blink::WebFloatRect&);
60 virtual void invalidate(); 62 virtual void invalidate();
61 virtual void addChild(blink::WebLayer* child); 63 virtual void addChild(blink::WebLayer* child);
62 virtual void insertChild(blink::WebLayer* child, size_t index); 64 virtual void insertChild(blink::WebLayer* child, size_t index);
63 virtual void replaceChild(blink::WebLayer* reference, 65 virtual void replaceChild(blink::WebLayer* reference,
64 blink::WebLayer* new_layer); 66 blink::WebLayer* new_layer);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 149
148 private: 150 private:
149 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; 151 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_;
150 152
151 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); 153 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl);
152 }; 154 };
153 155
154 } // namespace webkit 156 } // namespace webkit
155 157
156 #endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_ 158 #endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/renderer/compositor_bindings/web_image_layer_impl.cc ('k') | webkit/renderer/compositor_bindings/web_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698