| 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 <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 #if defined(OS_WIN) | 164 #if defined(OS_WIN) |
| 165 void SetParentNativeViewAccessible( | 165 void SetParentNativeViewAccessible( |
| 166 gfx::NativeViewAccessible accessible_parent) override; | 166 gfx::NativeViewAccessible accessible_parent) override; |
| 167 gfx::NativeViewId GetParentForWindowlessPlugin() const override; | 167 gfx::NativeViewId GetParentForWindowlessPlugin() const override; |
| 168 #endif | 168 #endif |
| 169 BrowserAccessibilityManager* CreateBrowserAccessibilityManager( | 169 BrowserAccessibilityManager* CreateBrowserAccessibilityManager( |
| 170 BrowserAccessibilityDelegate* delegate) override; | 170 BrowserAccessibilityDelegate* delegate) override; |
| 171 | 171 |
| 172 // cc::SurfaceFactoryClient implementation. | 172 // cc::SurfaceFactoryClient implementation. |
| 173 void ReturnResources(const cc::ReturnedResourceArray& resources) override; | 173 void ReturnResources(const cc::ReturnedResourceArray& resources) override; |
| 174 void SetBeginFrameSource(cc::SurfaceId surface_id, | 174 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override; |
| 175 cc::BeginFrameSource* begin_frame_source) override; | |
| 176 | 175 |
| 177 // Declared 'public' instead of 'protected' here to allow derived classes | 176 // Declared 'public' instead of 'protected' here to allow derived classes |
| 178 // to Bind() to it. | 177 // to Bind() to it. |
| 179 void SurfaceDrawn(uint32_t output_surface_id, cc::SurfaceDrawStatus drawn); | 178 void SurfaceDrawn(uint32_t output_surface_id, cc::SurfaceDrawStatus drawn); |
| 180 | 179 |
| 181 // Exposed for tests. | 180 // Exposed for tests. |
| 182 cc::SurfaceId SurfaceIdForTesting() const override; | 181 cc::SurfaceId SurfaceIdForTesting() const override; |
| 183 CrossProcessFrameConnector* FrameConnectorForTesting() const { | 182 CrossProcessFrameConnector* FrameConnectorForTesting() const { |
| 184 return frame_connector_; | 183 return frame_connector_; |
| 185 } | 184 } |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 // it convenient to swap() when processing the list. | 230 // it convenient to swap() when processing the list. |
| 232 FrameSwappedCallbackList frame_swapped_callbacks_; | 231 FrameSwappedCallbackList frame_swapped_callbacks_; |
| 233 | 232 |
| 234 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; | 233 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; |
| 235 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); | 234 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); |
| 236 }; | 235 }; |
| 237 | 236 |
| 238 } // namespace content | 237 } // namespace content |
| 239 | 238 |
| 240 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ | 239 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
| OLD | NEW |