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

Side by Side Diff: content/renderer/child_frame_compositing_helper.h

Issue 2102123002: Make Satisfy/Require callbacks pass Surface id and sequence by reference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 5 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 CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ 5 #ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
6 #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ 6 #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 BrowserPluginManager* GetBrowserPluginManager(); 87 BrowserPluginManager* GetBrowserPluginManager();
88 blink::WebPluginContainer* GetContainer(); 88 blink::WebPluginContainer* GetContainer();
89 int GetInstanceID(); 89 int GetInstanceID();
90 90
91 void CheckSizeAndAdjustLayerProperties(const gfx::Size& new_size, 91 void CheckSizeAndAdjustLayerProperties(const gfx::Size& new_size,
92 float device_scale_factor, 92 float device_scale_factor,
93 cc::Layer* layer); 93 cc::Layer* layer);
94 static void SatisfyCallback(scoped_refptr<ThreadSafeSender> sender, 94 static void SatisfyCallback(scoped_refptr<ThreadSafeSender> sender,
95 int host_routing_id, 95 int host_routing_id,
96 cc::SurfaceSequence sequence); 96 const cc::SurfaceSequence& sequence);
97 static void SatisfyCallbackBrowserPlugin( 97 static void SatisfyCallbackBrowserPlugin(
98 scoped_refptr<ThreadSafeSender> sender, 98 scoped_refptr<ThreadSafeSender> sender,
99 int host_routing_id, 99 int host_routing_id,
100 int browser_plugin_instance_id, 100 int browser_plugin_instance_id,
101 cc::SurfaceSequence sequence); 101 const cc::SurfaceSequence& sequence);
102 static void RequireCallback(scoped_refptr<ThreadSafeSender> sender, 102 static void RequireCallback(scoped_refptr<ThreadSafeSender> sender,
103 int host_routing_id, 103 int host_routing_id,
104 cc::SurfaceId id, 104 const cc::SurfaceId& id,
105 cc::SurfaceSequence sequence); 105 const cc::SurfaceSequence& sequence);
106 static void RequireCallbackBrowserPlugin( 106 static void RequireCallbackBrowserPlugin(
107 scoped_refptr<ThreadSafeSender> sender, 107 scoped_refptr<ThreadSafeSender> sender,
108 int host_routing_id, 108 int host_routing_id,
109 int browser_plugin_instance_id, 109 int browser_plugin_instance_id,
110 cc::SurfaceId id, 110 const cc::SurfaceId& id,
111 cc::SurfaceSequence sequence); 111 const cc::SurfaceSequence& sequence);
112 void UpdateWebLayer(blink::WebLayer* layer); 112 void UpdateWebLayer(blink::WebLayer* layer);
113 113
114 int host_routing_id_; 114 int host_routing_id_;
115 115
116 gfx::Size buffer_size_; 116 gfx::Size buffer_size_;
117 117
118 // The lifetime of this weak pointer should be greater than the lifetime of 118 // The lifetime of this weak pointer should be greater than the lifetime of
119 // other member objects, as they may access this pointer during their 119 // other member objects, as they may access this pointer during their
120 // destruction. 120 // destruction.
121 base::WeakPtr<BrowserPlugin> browser_plugin_; 121 base::WeakPtr<BrowserPlugin> browser_plugin_;
122 RenderFrameProxy* render_frame_proxy_; 122 RenderFrameProxy* render_frame_proxy_;
123 123
124 std::unique_ptr<blink::WebLayer> web_layer_; 124 std::unique_ptr<blink::WebLayer> web_layer_;
125 cc::SurfaceId surface_id_; 125 cc::SurfaceId surface_id_;
126 blink::WebFrame* frame_; 126 blink::WebFrame* frame_;
127 127
128 DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper); 128 DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper);
129 }; 129 };
130 130
131 } // namespace content 131 } // namespace content
132 132
133 #endif // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ 133 #endif // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | content/renderer/child_frame_compositing_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698