| 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 // cc::SurfaceFactoryClient implementation. | 176 // cc::SurfaceFactoryClient implementation. |
| 177 void ReturnResources(const cc::ReturnedResourceArray& resources) override; | 177 void ReturnResources(const cc::ReturnedResourceArray& resources) override; |
| 178 void SetBeginFrameSource(cc::SurfaceId surface_id, | 178 void SetBeginFrameSource(cc::SurfaceId surface_id, |
| 179 cc::BeginFrameSource* begin_frame_source) override; | 179 cc::BeginFrameSource* begin_frame_source) override; |
| 180 | 180 |
| 181 // Declared 'public' instead of 'protected' here to allow derived classes | 181 // Declared 'public' instead of 'protected' here to allow derived classes |
| 182 // to Bind() to it. | 182 // to Bind() to it. |
| 183 void SurfaceDrawn(uint32_t output_surface_id, cc::SurfaceDrawStatus drawn); | 183 void SurfaceDrawn(uint32_t output_surface_id, cc::SurfaceDrawStatus drawn); |
| 184 | 184 |
| 185 // Exposed for tests. | 185 // Exposed for tests. |
| 186 bool IsChildFrameForTesting() const override; |
| 186 cc::SurfaceId SurfaceIdForTesting() const override; | 187 cc::SurfaceId SurfaceIdForTesting() const override; |
| 187 CrossProcessFrameConnector* FrameConnectorForTesting() const { | 188 CrossProcessFrameConnector* FrameConnectorForTesting() const { |
| 188 return frame_connector_; | 189 return frame_connector_; |
| 189 } | 190 } |
| 190 | 191 |
| 191 void RegisterSurfaceNamespaceId(); | 192 void RegisterSurfaceNamespaceId(); |
| 192 void UnregisterSurfaceNamespaceId(); | 193 void UnregisterSurfaceNamespaceId(); |
| 193 | 194 |
| 194 protected: | 195 protected: |
| 195 friend class RenderWidgetHostView; | 196 friend class RenderWidgetHostView; |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 // it convenient to swap() when processing the list. | 239 // it convenient to swap() when processing the list. |
| 239 FrameSwappedCallbackList frame_swapped_callbacks_; | 240 FrameSwappedCallbackList frame_swapped_callbacks_; |
| 240 | 241 |
| 241 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; | 242 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; |
| 242 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); | 243 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); |
| 243 }; | 244 }; |
| 244 | 245 |
| 245 } // namespace content | 246 } // namespace content |
| 246 | 247 |
| 247 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ | 248 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
| OLD | NEW |