| 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 | 169 |
| 170 // cc::SurfaceFactoryClient implementation. | 170 // cc::SurfaceFactoryClient implementation. |
| 171 void ReturnResources(const cc::ReturnedResourceArray& resources) override; | 171 void ReturnResources(const cc::ReturnedResourceArray& resources) override; |
| 172 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override; | 172 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override; |
| 173 | 173 |
| 174 // Declared 'public' instead of 'protected' here to allow derived classes | 174 // Declared 'public' instead of 'protected' here to allow derived classes |
| 175 // to Bind() to it. | 175 // to Bind() to it. |
| 176 void SurfaceDrawn(uint32_t output_surface_id, cc::SurfaceDrawStatus drawn); | 176 void SurfaceDrawn(uint32_t output_surface_id, cc::SurfaceDrawStatus drawn); |
| 177 | 177 |
| 178 // Exposed for tests. | 178 // Exposed for tests. |
| 179 bool IsChildFrameForTesting() const override; |
| 179 cc::SurfaceId SurfaceIdForTesting() const override; | 180 cc::SurfaceId SurfaceIdForTesting() const override; |
| 180 CrossProcessFrameConnector* FrameConnectorForTesting() const { | 181 CrossProcessFrameConnector* FrameConnectorForTesting() const { |
| 181 return frame_connector_; | 182 return frame_connector_; |
| 182 } | 183 } |
| 183 | 184 |
| 184 void RegisterSurfaceNamespaceId(); | 185 void RegisterSurfaceNamespaceId(); |
| 185 void UnregisterSurfaceNamespaceId(); | 186 void UnregisterSurfaceNamespaceId(); |
| 186 | 187 |
| 187 protected: | 188 protected: |
| 188 friend class RenderWidgetHostView; | 189 friend class RenderWidgetHostView; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 // it convenient to swap() when processing the list. | 233 // it convenient to swap() when processing the list. |
| 233 FrameSwappedCallbackList frame_swapped_callbacks_; | 234 FrameSwappedCallbackList frame_swapped_callbacks_; |
| 234 | 235 |
| 235 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; | 236 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; |
| 236 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); | 237 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); |
| 237 }; | 238 }; |
| 238 | 239 |
| 239 } // namespace content | 240 } // namespace content |
| 240 | 241 |
| 241 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ | 242 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
| OLD | NEW |