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