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

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

Issue 11369071: A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | 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 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;
15 } 14 }
16 15
17 namespace WebKit { 16 namespace WebKit {
18 class WebLayer; 17 class WebLayer;
19 class WebLayerTreeViewClient; 18 class WebLayerTreeViewClient;
20 class WebLayerTreeViewClientAdapter; 19 class WebLayerTreeViewClientAdapter;
21 20
22 class WebLayerTreeViewImpl : public WebLayerTreeView, public cc::LayerTreeHostCl ient { 21 class WebLayerTreeViewImpl : public WebLayerTreeView, public cc::LayerTreeHostCl ient {
23 public: 22 public:
24 explicit WebLayerTreeViewImpl(WebLayerTreeViewClient*); 23 explicit WebLayerTreeViewImpl(WebLayerTreeViewClient*);
25 virtual ~WebLayerTreeViewImpl(); 24 virtual ~WebLayerTreeViewImpl();
26 25
27 bool initialize(const Settings&, scoped_ptr<cc::Thread> implThread); 26 bool initialize(const Settings&);
28 27
29 // WebLayerTreeView implementation. 28 // WebLayerTreeView implementation.
30 virtual void setSurfaceReady() OVERRIDE; 29 virtual void setSurfaceReady() OVERRIDE;
31 virtual void setRootLayer(const WebLayer&) OVERRIDE; 30 virtual void setRootLayer(const WebLayer&) OVERRIDE;
32 virtual void clearRootLayer() OVERRIDE; 31 virtual void clearRootLayer() OVERRIDE;
33 virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSiz e& deviceViewportSize = WebSize()) OVERRIDE; 32 virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSiz e& deviceViewportSize = WebSize()) OVERRIDE;
34 virtual WebSize layoutViewportSize() const OVERRIDE; 33 virtual WebSize layoutViewportSize() const OVERRIDE;
35 virtual WebSize deviceViewportSize() const OVERRIDE; 34 virtual WebSize deviceViewportSize() const OVERRIDE;
36 virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& poin t) const OVERRIDE; 35 virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& poin t) const OVERRIDE;
37 virtual void setDeviceScaleFactor(float) OVERRIDE; 36 virtual void setDeviceScaleFactor(float) OVERRIDE;
(...skipping 27 matching lines...) Expand all
65 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE; 64 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;
66 virtual void willCommit() OVERRIDE; 65 virtual void willCommit() OVERRIDE;
67 virtual void didCommit() OVERRIDE; 66 virtual void didCommit() OVERRIDE;
68 virtual void didCommitAndDrawFrame() OVERRIDE; 67 virtual void didCommitAndDrawFrame() OVERRIDE;
69 virtual void didCompleteSwapBuffers() OVERRIDE; 68 virtual void didCompleteSwapBuffers() OVERRIDE;
70 virtual void scheduleComposite() OVERRIDE; 69 virtual void scheduleComposite() OVERRIDE;
71 70
72 private: 71 private:
73 WebLayerTreeViewClient* m_client; 72 WebLayerTreeViewClient* m_client;
74 scoped_ptr<cc::LayerTreeHost> m_layerTreeHost; 73 scoped_ptr<cc::LayerTreeHost> m_layerTreeHost;
75 bool m_hasImplThread;
76 }; 74 };
77 75
78 } // namespace WebKit 76 } // namespace WebKit
79 77
80 #endif // WebLayerTreeViewImpl_h 78 #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