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

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: SurfaceAggregator tests; fix some bugs revealed by tests Created 5 years, 3 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 #if defined(OS_WIN) 145 #if defined(OS_WIN)
146 void SetParentNativeViewAccessible( 146 void SetParentNativeViewAccessible(
147 gfx::NativeViewAccessible accessible_parent) override; 147 gfx::NativeViewAccessible accessible_parent) override;
148 gfx::NativeViewId GetParentForWindowlessPlugin() const override; 148 gfx::NativeViewId GetParentForWindowlessPlugin() const override;
149 #endif 149 #endif
150 BrowserAccessibilityManager* CreateBrowserAccessibilityManager( 150 BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
151 BrowserAccessibilityDelegate* delegate) override; 151 BrowserAccessibilityDelegate* delegate) override;
152 152
153 // cc::SurfaceFactoryClient implementation. 153 // cc::SurfaceFactoryClient implementation.
154 void ReturnResources(const cc::ReturnedResourceArray& resources) override; 154 void ReturnResources(const cc::ReturnedResourceArray& resources) override;
155 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
155 156
156 // Declared 'public' instead of 'protected' here to allow derived classes 157 // Declared 'public' instead of 'protected' here to allow derived classes
157 // to Bind() to it. 158 // to Bind() to it.
158 void SurfaceDrawn(uint32 output_surface_id, cc::SurfaceDrawStatus drawn); 159 void SurfaceDrawn(uint32 output_surface_id, cc::SurfaceDrawStatus drawn);
159 160
160 protected: 161 protected:
161 friend class RenderWidgetHostView; 162 friend class RenderWidgetHostView;
162 friend class RenderWidgetHostViewChildFrameTest; 163 friend class RenderWidgetHostViewChildFrameTest;
163 friend class RenderWidgetHostViewGuestSurfaceTest; 164 friend class RenderWidgetHostViewGuestSurfaceTest;
164 165
(...skipping 30 matching lines...) Expand all
195 } 196 }
196 197
197 private: 198 private:
198 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; 199 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
199 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 200 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
200 }; 201 };
201 202
202 } // namespace content 203 } // namespace content
203 204
204 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 205 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698