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

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

Issue 169653004: <webview>: Speculative fix (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed compile issue. Created 6 years, 10 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
« no previous file with comments | « no previous file | content/renderer/child_frame_compositing_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 uint32 last_output_surface_id_; 144 uint32 last_output_surface_id_;
145 int last_host_id_; 145 int last_host_id_;
146 bool last_mailbox_valid_; 146 bool last_mailbox_valid_;
147 bool ack_pending_; 147 bool ack_pending_;
148 bool software_ack_pending_; 148 bool software_ack_pending_;
149 bool opaque_; 149 bool opaque_;
150 std::vector<unsigned> unacked_software_frames_; 150 std::vector<unsigned> unacked_software_frames_;
151 151
152 gfx::Size buffer_size_; 152 gfx::Size buffer_size_;
153 153
154 // The lifetime of this weak pointer should be greater than the lifetime of
155 // other member objects, as they may access this pointer during their
156 // destruction.
157 base::WeakPtr<BrowserPlugin> browser_plugin_;
158 RenderFrameImpl* render_frame_;
159
154 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_; 160 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_;
155 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_; 161 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_;
156 162
157 scoped_refptr<cc::SolidColorLayer> background_layer_; 163 scoped_refptr<cc::SolidColorLayer> background_layer_;
158 scoped_refptr<cc::TextureLayer> texture_layer_; 164 scoped_refptr<cc::TextureLayer> texture_layer_;
159 scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_; 165 scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_;
160 scoped_ptr<blink::WebLayer> web_layer_; 166 scoped_ptr<blink::WebLayer> web_layer_;
161 blink::WebFrame* frame_; 167 blink::WebFrame* frame_;
162 168
163 base::WeakPtr<BrowserPlugin> browser_plugin_;
164 RenderFrameImpl* render_frame_;
165
166 DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper); 169 DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper);
167 }; 170 };
168 171
169 } // namespace content 172 } // namespace content
170 173
171 #endif // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ 174 #endif // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/child_frame_compositing_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698