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

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

Issue 1304063014: cc: Plumbing for BeginFrameSource based on Surfaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More use-after-free. Attempt to fix mojo. Created 5 years, 2 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 #if defined(OS_WIN) 148 #if defined(OS_WIN)
149 void SetParentNativeViewAccessible( 149 void SetParentNativeViewAccessible(
150 gfx::NativeViewAccessible accessible_parent) override; 150 gfx::NativeViewAccessible accessible_parent) override;
151 gfx::NativeViewId GetParentForWindowlessPlugin() const override; 151 gfx::NativeViewId GetParentForWindowlessPlugin() const override;
152 #endif 152 #endif
153 BrowserAccessibilityManager* CreateBrowserAccessibilityManager( 153 BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
154 BrowserAccessibilityDelegate* delegate) override; 154 BrowserAccessibilityDelegate* delegate) override;
155 155
156 // cc::SurfaceFactoryClient implementation. 156 // cc::SurfaceFactoryClient implementation.
157 void ReturnResources(const cc::ReturnedResourceArray& resources) override; 157 void ReturnResources(const cc::ReturnedResourceArray& resources) override;
158 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
158 159
159 // Declared 'public' instead of 'protected' here to allow derived classes 160 // Declared 'public' instead of 'protected' here to allow derived classes
160 // to Bind() to it. 161 // to Bind() to it.
161 void SurfaceDrawn(uint32 output_surface_id, cc::SurfaceDrawStatus drawn); 162 void SurfaceDrawn(uint32 output_surface_id, cc::SurfaceDrawStatus drawn);
162 163
163 protected: 164 protected:
164 friend class RenderWidgetHostView; 165 friend class RenderWidgetHostView;
165 friend class RenderWidgetHostViewChildFrameTest; 166 friend class RenderWidgetHostViewChildFrameTest;
166 friend class RenderWidgetHostViewGuestSurfaceTest; 167 friend class RenderWidgetHostViewGuestSurfaceTest;
167 168
(...skipping 30 matching lines...) Expand all
198 } 199 }
199 200
200 private: 201 private:
201 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; 202 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
202 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 203 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
203 }; 204 };
204 205
205 } // namespace content 206 } // namespace content
206 207
207 #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