| 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 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 base::RunLoop().RunUntilIdle(); | 109 base::RunLoop().RunUntilIdle(); |
| 110 #if !defined(OS_ANDROID) | 110 #if !defined(OS_ANDROID) |
| 111 ImageTransportFactory::Terminate(); | 111 ImageTransportFactory::Terminate(); |
| 112 #else | 112 #else |
| 113 ui::ContextProviderFactory::SetInstance(nullptr); | 113 ui::ContextProviderFactory::SetInstance(nullptr); |
| 114 ContextProviderFactoryImpl::Terminate(); | 114 ContextProviderFactoryImpl::Terminate(); |
| 115 #endif | 115 #endif |
| 116 } | 116 } |
| 117 | 117 |
| 118 cc::SurfaceId GetSurfaceId() const { | 118 cc::SurfaceId GetSurfaceId() const { |
| 119 return cc::SurfaceId(view_->frame_sink_id_, view_->local_frame_id_); | 119 return cc::SurfaceId(view_->frame_sink_id_, view_->local_surface_id_); |
| 120 } | 120 } |
| 121 | 121 |
| 122 protected: | 122 protected: |
| 123 base::MessageLoopForUI message_loop_; | 123 base::MessageLoopForUI message_loop_; |
| 124 std::unique_ptr<BrowserContext> browser_context_; | 124 std::unique_ptr<BrowserContext> browser_context_; |
| 125 MockRenderWidgetHostDelegate delegate_; | 125 MockRenderWidgetHostDelegate delegate_; |
| 126 | 126 |
| 127 // Tests should set these to NULL if they've already triggered their | 127 // Tests should set these to NULL if they've already triggered their |
| 128 // destruction. | 128 // destruction. |
| 129 RenderWidgetHostImpl* widget_host_; | 129 RenderWidgetHostImpl* widget_host_; |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 #endif | 184 #endif |
| 185 | 185 |
| 186 // Surface ID should have been passed to CrossProcessFrameConnector to | 186 // Surface ID should have been passed to CrossProcessFrameConnector to |
| 187 // be sent to the embedding renderer. | 187 // be sent to the embedding renderer. |
| 188 EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size), | 188 EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size), |
| 189 test_frame_connector_->last_surface_info_); | 189 test_frame_connector_->last_surface_info_); |
| 190 } | 190 } |
| 191 } | 191 } |
| 192 | 192 |
| 193 } // namespace content | 193 } // namespace content |
| OLD | NEW |