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

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

Issue 1169983006: Convert BrowserPlugin to render using cc::Surfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update test to always call UpdateGuestSizeIfNecessary(). Created 5 years, 6 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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 float device_scale_factor, 107 float device_scale_factor,
108 cc::Layer* layer); 108 cc::Layer* layer);
109 void SendReturnedDelegatedResources(); 109 void SendReturnedDelegatedResources();
110 static void SatisfyCallback(scoped_refptr<ThreadSafeSender> sender, 110 static void SatisfyCallback(scoped_refptr<ThreadSafeSender> sender,
111 int host_routing_id, 111 int host_routing_id,
112 cc::SurfaceSequence sequence); 112 cc::SurfaceSequence sequence);
113 static void RequireCallback(scoped_refptr<ThreadSafeSender> sender, 113 static void RequireCallback(scoped_refptr<ThreadSafeSender> sender,
114 int host_routing_id, 114 int host_routing_id,
115 cc::SurfaceId id, 115 cc::SurfaceId id,
116 cc::SurfaceSequence sequence); 116 cc::SurfaceSequence sequence);
117 static void RequireCallbackBrowserPlugin(
118 scoped_refptr<ThreadSafeSender> sender,
119 int host_routing_id,
120 int browser_plugin_instance_id,
121 cc::SurfaceId id,
122 cc::SurfaceSequence sequence);
117 123
118 int host_routing_id_; 124 int host_routing_id_;
119 int last_route_id_; 125 int last_route_id_;
120 uint32 last_output_surface_id_; 126 uint32 last_output_surface_id_;
121 int last_host_id_; 127 int last_host_id_;
122 bool ack_pending_; 128 bool ack_pending_;
123 bool opaque_; 129 bool opaque_;
124 130
125 gfx::Size buffer_size_; 131 gfx::Size buffer_size_;
126 132
(...skipping 13 matching lines...) Expand all
140 scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_; 146 scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_;
141 scoped_ptr<blink::WebLayer> web_layer_; 147 scoped_ptr<blink::WebLayer> web_layer_;
142 blink::WebFrame* frame_; 148 blink::WebFrame* frame_;
143 149
144 DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper); 150 DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper);
145 }; 151 };
146 152
147 } // namespace content 153 } // namespace content
148 154
149 #endif // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ 155 #endif // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
OLDNEW
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin.cc ('k') | content/renderer/child_frame_compositing_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698