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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

Issue 1473913003: Restore original WebView SurfaceId after showing interstitial. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 // The model object. 176 // The model object.
177 RenderWidgetHostImpl* host_; 177 RenderWidgetHostImpl* host_;
178 178
179 // Flag determining whether we render into a compositing Surface. 179 // Flag determining whether we render into a compositing Surface.
180 bool use_surfaces_; 180 bool use_surfaces_;
181 181
182 // Surface-related state. 182 // Surface-related state.
183 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_; 183 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_;
184 scoped_ptr<cc::SurfaceFactory> surface_factory_; 184 scoped_ptr<cc::SurfaceFactory> surface_factory_;
185 cc::SurfaceId surface_id_; 185 cc::SurfaceId surface_id_;
186 uint32 next_surface_sequence_; 186 cc::SurfaceSequence surface_sequence_;
187 uint32 last_output_surface_id_; 187 uint32 last_output_surface_id_;
188 gfx::Size current_surface_size_; 188 gfx::Size current_surface_size_;
189 float current_surface_scale_factor_; 189 float current_surface_scale_factor_;
190 uint32 ack_pending_count_; 190 uint32 ack_pending_count_;
191 cc::ReturnedResourceArray surface_returned_resources_; 191 cc::ReturnedResourceArray surface_returned_resources_;
192 192
193 // frame_connector_ provides a platform abstraction. Messages 193 // frame_connector_ provides a platform abstraction. Messages
194 // sent through it are routed to the embedding renderer process. 194 // sent through it are routed to the embedding renderer process.
195 CrossProcessFrameConnector* frame_connector_; 195 CrossProcessFrameConnector* frame_connector_;
196 196
197 base::WeakPtr<RenderWidgetHostViewChildFrame> AsWeakPtr() { 197 base::WeakPtr<RenderWidgetHostViewChildFrame> AsWeakPtr() {
198 return weak_factory_.GetWeakPtr(); 198 return weak_factory_.GetWeakPtr();
199 } 199 }
200 200
201 private: 201 private:
202 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; 202 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
203 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 203 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
204 }; 204 };
205 205
206 } // namespace content 206 } // namespace content
207 207
208 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 208 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698