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