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

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

Issue 1199963011: Force new surface on BrowserPluginGuest reattach. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test, and add check for null surface id in test. Created 5 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_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 "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/resources/returned_resource.h" 9 #include "cc/resources/returned_resource.h"
10 #include "cc/surfaces/surface_factory_client.h" 10 #include "cc/surfaces/surface_factory_client.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 // Declared 'public' instead of 'protected' here to allow derived classes 152 // Declared 'public' instead of 'protected' here to allow derived classes
153 // to Bind() to it. 153 // to Bind() to it.
154 void SurfaceDrawn(uint32 output_surface_id, cc::SurfaceDrawStatus drawn); 154 void SurfaceDrawn(uint32 output_surface_id, cc::SurfaceDrawStatus drawn);
155 155
156 protected: 156 protected:
157 friend class RenderWidgetHostView; 157 friend class RenderWidgetHostView;
158 friend class RenderWidgetHostViewChildFrameTest; 158 friend class RenderWidgetHostViewChildFrameTest;
159 friend class RenderWidgetHostViewGuestSurfaceTest; 159 friend class RenderWidgetHostViewGuestSurfaceTest;
160 160
161 // Clears current compositor surface, if one is in use.
162 void ClearCompositorSurfaceIfNecessary();
163
161 // The last scroll offset of the view. 164 // The last scroll offset of the view.
162 gfx::Vector2dF last_scroll_offset_; 165 gfx::Vector2dF last_scroll_offset_;
163 166
164 // Members will become private when RenderWidgetHostViewGuest is removed. 167 // Members will become private when RenderWidgetHostViewGuest is removed.
165 // The model object. 168 // The model object.
166 RenderWidgetHostImpl* host_; 169 RenderWidgetHostImpl* host_;
167 170
168 // Flag determining whether we render into a compositing Surface. 171 // Flag determining whether we render into a compositing Surface.
169 bool use_surfaces_; 172 bool use_surfaces_;
170 173
(...skipping 17 matching lines...) Expand all
188 } 191 }
189 192
190 private: 193 private:
191 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; 194 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
192 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 195 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
193 }; 196 };
194 197
195 } // namespace content 198 } // namespace content
196 199
197 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 200 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698