OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/public/test/render_view_test.h" | 5 #include "content/public/test/render_view_test.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <cctype> | 9 #include <cctype> |
10 | 10 |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 : RendererBlinkPlatformImpl(scheduler, nullptr) {} | 122 : RendererBlinkPlatformImpl(scheduler, nullptr) {} |
123 | 123 |
124 // Get rid of the dependency to the sandbox, which is not available in | 124 // Get rid of the dependency to the sandbox, which is not available in |
125 // RenderViewTest. | 125 // RenderViewTest. |
126 blink::WebSandboxSupport* GetSandboxSupport() override { return NULL; } | 126 blink::WebSandboxSupport* GetSandboxSupport() override { return NULL; } |
127 }; | 127 }; |
128 | 128 |
129 RenderViewTest::RendererBlinkPlatformImplTestOverride:: | 129 RenderViewTest::RendererBlinkPlatformImplTestOverride:: |
130 RendererBlinkPlatformImplTestOverride() { | 130 RendererBlinkPlatformImplTestOverride() { |
131 InitializeMojo(); | 131 InitializeMojo(); |
132 renderer_scheduler_ = blink::scheduler::RendererScheduler::Create(); | 132 renderer_scheduler_ = blink::scheduler::RendererScheduler::Create( |
| 133 blink::scheduler::RendererScheduler::RendererType:: |
| 134 kForegroundAndBackground); |
133 blink_platform_impl_.reset( | 135 blink_platform_impl_.reset( |
134 new RendererBlinkPlatformImplTestOverrideImpl(renderer_scheduler_.get())); | 136 new RendererBlinkPlatformImplTestOverrideImpl(renderer_scheduler_.get())); |
135 } | 137 } |
136 | 138 |
137 RenderViewTest::RendererBlinkPlatformImplTestOverride:: | 139 RenderViewTest::RendererBlinkPlatformImplTestOverride:: |
138 ~RendererBlinkPlatformImplTestOverride() { | 140 ~RendererBlinkPlatformImplTestOverride() { |
139 } | 141 } |
140 | 142 |
141 blink::Platform* | 143 blink::Platform* |
142 RenderViewTest::RendererBlinkPlatformImplTestOverride::Get() const { | 144 RenderViewTest::RendererBlinkPlatformImplTestOverride::Get() const { |
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); | 664 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); |
663 frame->Navigate(common_params, StartNavigationParams(), request_params); | 665 frame->Navigate(common_params, StartNavigationParams(), request_params); |
664 | 666 |
665 // The load actually happens asynchronously, so we pump messages to process | 667 // The load actually happens asynchronously, so we pump messages to process |
666 // the pending continuation. | 668 // the pending continuation. |
667 FrameLoadWaiter(frame).Wait(); | 669 FrameLoadWaiter(frame).Wait(); |
668 view_->GetWebView()->UpdateAllLifecyclePhases(); | 670 view_->GetWebView()->UpdateAllLifecyclePhases(); |
669 } | 671 } |
670 | 672 |
671 } // namespace content | 673 } // namespace content |
OLD | NEW |