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

Side by Side Diff: webkit/compositor_bindings/web_layer_tree_view_impl.h

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Apply code review comments Created 8 years, 1 month 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 // 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 WebLayerTreeViewImpl_h 5 #ifndef WebLayerTreeViewImpl_h
6 #define WebLayerTreeViewImpl_h 6 #define WebLayerTreeViewImpl_h
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/layer_tree_host_client.h" 9 #include "cc/layer_tree_host_client.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
11 11
12 namespace cc { 12 namespace cc {
13 class LayerTreeHost; 13 class LayerTreeHost;
14 class Thread;
14 } 15 }
15 16
16 namespace WebKit { 17 namespace WebKit {
17 class WebLayer; 18 class WebLayer;
18 class WebLayerTreeViewClient; 19 class WebLayerTreeViewClient;
19 class WebLayerTreeViewClientAdapter; 20 class WebLayerTreeViewClientAdapter;
20 21
21 class WebLayerTreeViewImpl : public WebLayerTreeView, public cc::LayerTreeHostCl ient { 22 class WebLayerTreeViewImpl : public WebLayerTreeView, public cc::LayerTreeHostCl ient {
22 public: 23 public:
23 explicit WebLayerTreeViewImpl(WebLayerTreeViewClient*); 24 explicit WebLayerTreeViewImpl(WebLayerTreeViewClient*);
24 virtual ~WebLayerTreeViewImpl(); 25 virtual ~WebLayerTreeViewImpl();
25 26
26 bool initialize(const Settings&); 27 bool initialize(const Settings&, scoped_ptr<cc::Thread> implThread);
27 28
28 // WebLayerTreeView implementation. 29 // WebLayerTreeView implementation.
29 virtual void setSurfaceReady() OVERRIDE; 30 virtual void setSurfaceReady() OVERRIDE;
30 virtual void setRootLayer(const WebLayer&) OVERRIDE; 31 virtual void setRootLayer(const WebLayer&) OVERRIDE;
31 virtual void clearRootLayer() OVERRIDE; 32 virtual void clearRootLayer() OVERRIDE;
32 virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSiz e& deviceViewportSize = WebSize()) OVERRIDE; 33 virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSiz e& deviceViewportSize = WebSize()) OVERRIDE;
33 virtual WebSize layoutViewportSize() const OVERRIDE; 34 virtual WebSize layoutViewportSize() const OVERRIDE;
34 virtual WebSize deviceViewportSize() const OVERRIDE; 35 virtual WebSize deviceViewportSize() const OVERRIDE;
35 virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& poin t) const OVERRIDE; 36 virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& poin t) const OVERRIDE;
36 virtual void setDeviceScaleFactor(float) OVERRIDE; 37 virtual void setDeviceScaleFactor(float) OVERRIDE;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 virtual void scheduleComposite() OVERRIDE; 71 virtual void scheduleComposite() OVERRIDE;
71 72
72 private: 73 private:
73 WebLayerTreeViewClient* m_client; 74 WebLayerTreeViewClient* m_client;
74 scoped_ptr<cc::LayerTreeHost> m_layerTreeHost; 75 scoped_ptr<cc::LayerTreeHost> m_layerTreeHost;
75 }; 76 };
76 77
77 } // namespace WebKit 78 } // namespace WebKit
78 79
79 #endif // WebLayerTreeViewImpl_h 80 #endif // WebLayerTreeViewImpl_h
OLDNEW
« no previous file with comments | « webkit/compositor_bindings/web_compositor_support_impl.cc ('k') | webkit/compositor_bindings/web_layer_tree_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698