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

Side by Side Diff: android_webview/browser/shared_renderer_state.h

Issue 1816283005: Move SharedRendererState ownership to AwContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
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 ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_
6 #define ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_ 6 #define ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "android_webview/browser/gl_view_renderer_manager.h" 10 #include "android_webview/browser/gl_view_renderer_manager.h"
11 #include "android_webview/browser/parent_compositor_draw_constraints.h" 11 #include "android_webview/browser/parent_compositor_draw_constraints.h"
12 #include "base/cancelable_callback.h" 12 #include "base/cancelable_callback.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
16 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
17 #include "cc/output/compositor_frame_ack.h" 17 #include "cc/output/compositor_frame_ack.h"
18 #include "ui/gfx/geometry/rect.h" 18 #include "ui/gfx/geometry/rect.h"
19 #include "ui/gfx/geometry/vector2d.h" 19 #include "ui/gfx/geometry/vector2d.h"
20 20
21 struct AwDrawGLInfo; 21 struct AwDrawGLInfo;
22
23 namespace android_webview { 22 namespace android_webview {
24 23
25 namespace internal { 24 namespace internal {
26 class RequestDrawGLTracker; 25 class RequestDrawGLTracker;
27 } 26 }
28 27
29 class BrowserViewRenderer; 28 class BrowserViewRenderer;
30 class ChildFrame; 29 class ChildFrame;
31 class HardwareRenderer; 30 class HardwareRenderer;
32 class InsideHardwareReleaseReset; 31 class InsideHardwareReleaseReset;
33 32
34 // This class is used to pass data between UI thread and RenderThread. 33 // This class is used to pass data between UI thread and RenderThread.
35 class SharedRendererState { 34 class SharedRendererState {
36 public: 35 public:
37 struct ReturnedResources { 36 struct ReturnedResources {
38 ReturnedResources(); 37 ReturnedResources();
39 ~ReturnedResources(); 38 ~ReturnedResources();
40 39
41 uint32_t output_surface_id; 40 uint32_t output_surface_id;
42 cc::ReturnedResourceArray resources; 41 cc::ReturnedResourceArray resources;
43 }; 42 };
44 using ReturnedResourcesMap = std::map<uint32_t, ReturnedResources>; 43 using ReturnedResourcesMap = std::map<uint32_t, ReturnedResources>;
45 44
46 SharedRendererState( 45 SharedRendererState(
47 const scoped_refptr<base::SingleThreadTaskRunner>& ui_loop, 46 const scoped_refptr<base::SingleThreadTaskRunner>& ui_loop);
48 BrowserViewRenderer* browser_view_renderer);
49 ~SharedRendererState(); 47 ~SharedRendererState();
50 48
51 // This function can be called from any thread. 49 // This function can be called from any thread.
52 void ClientRequestDrawGL(bool for_idle); 50 void ClientRequestDrawGL(bool for_idle);
53 51
54 // UI thread methods. 52 // UI thread methods.
53 void SetBrowserViewRendererOnUI(BrowserViewRenderer* browser_view_renderer);
55 void SetScrollOffsetOnUI(gfx::Vector2d scroll_offset); 54 void SetScrollOffsetOnUI(gfx::Vector2d scroll_offset);
56 void SetCompositorFrameOnUI(scoped_ptr<ChildFrame> frame); 55 void SetCompositorFrameOnUI(scoped_ptr<ChildFrame> frame);
57 void InitializeHardwareDrawIfNeededOnUI(); 56 void InitializeHardwareDrawIfNeededOnUI();
58 void ReleaseHardwareDrawIfNeededOnUI(); 57 void ReleaseHardwareDrawIfNeededOnUI();
59 ParentCompositorDrawConstraints GetParentDrawConstraintsOnUI() const; 58 ParentCompositorDrawConstraints GetParentDrawConstraintsOnUI() const;
60 void SwapReturnedResourcesOnUI(ReturnedResourcesMap* returned_resource_map); 59 void SwapReturnedResourcesOnUI(ReturnedResourcesMap* returned_resource_map);
61 bool ReturnedResourcesEmptyOnUI() const; 60 bool ReturnedResourcesEmptyOnUI() const;
62 scoped_ptr<ChildFrame> PassUncommittedFrameOnUI(); 61 scoped_ptr<ChildFrame> PassUncommittedFrameOnUI();
63 void DeleteHardwareRendererOnUI(); 62 void DeleteHardwareRendererOnUI();
64 bool HasFrameOnUI() const; 63 bool HasFrameOnUI() const;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 base::Closure request_draw_gl_closure_; 118 base::Closure request_draw_gl_closure_;
120 119
121 base::WeakPtrFactory<SharedRendererState> weak_factory_on_ui_thread_; 120 base::WeakPtrFactory<SharedRendererState> weak_factory_on_ui_thread_;
122 121
123 DISALLOW_COPY_AND_ASSIGN(SharedRendererState); 122 DISALLOW_COPY_AND_ASSIGN(SharedRendererState);
124 }; 123 };
125 124
126 } // namespace android_webview 125 } // namespace android_webview
127 126
128 #endif // ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_ 127 #endif // ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698