| OLD | NEW | 
|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 5 #ifndef CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 
| 6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 
| 7 | 7 | 
| 8 #include "cc/layer_tree_host_client.h" | 8 #include "cc/layer_tree_host_client.h" | 
| 9 #include "cc/layer_tree_settings.h" | 9 #include "cc/layer_tree_settings.h" | 
| 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" | 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" | 
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 76   virtual void applyScrollAndScale(gfx::Vector2d scroll_delta, | 76   virtual void applyScrollAndScale(gfx::Vector2d scroll_delta, | 
| 77                                    float page_scale) OVERRIDE; | 77                                    float page_scale) OVERRIDE; | 
| 78   virtual scoped_ptr<cc::OutputSurface> createOutputSurface() OVERRIDE; | 78   virtual scoped_ptr<cc::OutputSurface> createOutputSurface() OVERRIDE; | 
| 79   virtual void didRecreateOutputSurface(bool success) OVERRIDE; | 79   virtual void didRecreateOutputSurface(bool success) OVERRIDE; | 
| 80   virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE; | 80   virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE; | 
| 81   virtual void willCommit() OVERRIDE; | 81   virtual void willCommit() OVERRIDE; | 
| 82   virtual void didCommit() OVERRIDE; | 82   virtual void didCommit() OVERRIDE; | 
| 83   virtual void didCommitAndDrawFrame() OVERRIDE; | 83   virtual void didCommitAndDrawFrame() OVERRIDE; | 
| 84   virtual void didCompleteSwapBuffers() OVERRIDE; | 84   virtual void didCompleteSwapBuffers() OVERRIDE; | 
| 85   virtual void scheduleComposite() OVERRIDE; | 85   virtual void scheduleComposite() OVERRIDE; | 
|  | 86   virtual scoped_refptr<ui::ContextProvider> | 
|  | 87       OffscreenContextProviderForMainThread() OVERRIDE; | 
|  | 88   virtual scoped_refptr<ui::ContextProvider> | 
|  | 89       OffscreenContextProviderForCompositorThread() OVERRIDE; | 
| 86 | 90 | 
| 87 private: | 91 private: | 
| 88   RenderWidgetCompositor(RenderWidget* widget, | 92   RenderWidgetCompositor(RenderWidget* widget, | 
| 89                          WebKit::WebLayerTreeViewClient* client); | 93                          WebKit::WebLayerTreeViewClient* client); | 
| 90 | 94 | 
| 91   bool initialize(cc::LayerTreeSettings settings); | 95   bool initialize(cc::LayerTreeSettings settings); | 
| 92 | 96 | 
| 93   bool threaded_; | 97   bool threaded_; | 
| 94   RenderWidget* widget_; | 98   RenderWidget* widget_; | 
| 95   WebKit::WebLayerTreeViewClient* client_; | 99   WebKit::WebLayerTreeViewClient* client_; | 
| 96   scoped_ptr<cc::LayerTreeHost> layer_tree_host_; | 100   scoped_ptr<cc::LayerTreeHost> layer_tree_host_; | 
|  | 101 | 
|  | 102   class MainThreadContextProvider; | 
|  | 103   scoped_refptr<MainThreadContextProvider> contexts_main_thread_; | 
|  | 104   class CompositorThreadContextProvider; | 
|  | 105   scoped_refptr<CompositorThreadContextProvider> contexts_compositor_thread_; | 
| 97 }; | 106 }; | 
| 98 | 107 | 
| 99 }  // namespace content | 108 }  // namespace content | 
| 100 | 109 | 
| 101 #endif  // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 110 #endif  // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 
| 102 | 111 | 
| OLD | NEW | 
|---|