| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/shell/renderer/layout_test/layout_test_render_frame_observer.h
" | 5 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h
" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "content/public/common/associated_interface_registry.h" | 9 #include "content/public/common/associated_interface_registry.h" |
| 10 #include "content/public/renderer/render_frame.h" | 10 #include "content/public/renderer/render_frame.h" |
| 11 #include "content/shell/common/shell_messages.h" | |
| 12 #include "content/shell/renderer/layout_test/blink_test_runner.h" | 11 #include "content/shell/renderer/layout_test/blink_test_runner.h" |
| 13 #include "content/shell/renderer/layout_test/layout_test_render_thread_observer.
h" | 12 #include "content/shell/renderer/layout_test/layout_test_render_thread_observer.
h" |
| 14 #include "content/shell/test_runner/web_test_interfaces.h" | 13 #include "content/shell/test_runner/web_test_interfaces.h" |
| 15 #include "content/shell/test_runner/web_test_runner.h" | 14 #include "content/shell/test_runner/web_test_runner.h" |
| 16 #include "ipc/ipc_message_macros.h" | |
| 17 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 15 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
| 18 | 16 |
| 19 namespace content { | 17 namespace content { |
| 20 | 18 |
| 21 LayoutTestRenderFrameObserver::LayoutTestRenderFrameObserver( | 19 LayoutTestRenderFrameObserver::LayoutTestRenderFrameObserver( |
| 22 RenderFrame* render_frame) | 20 RenderFrame* render_frame) |
| 23 : RenderFrameObserver(render_frame), binding_(this) { | 21 : RenderFrameObserver(render_frame), binding_(this) { |
| 24 test_runner::WebTestRunner* test_runner = | 22 test_runner::WebTestRunner* test_runner = |
| 25 LayoutTestRenderThreadObserver::GetInstance() | 23 LayoutTestRenderThreadObserver::GetInstance() |
| 26 ->test_interfaces() | 24 ->test_interfaces() |
| (...skipping 10 matching lines...) Expand all Loading... |
| 37 | 35 |
| 38 void LayoutTestRenderFrameObserver::BindRequest( | 36 void LayoutTestRenderFrameObserver::BindRequest( |
| 39 mojom::LayoutTestControlAssociatedRequest request) { | 37 mojom::LayoutTestControlAssociatedRequest request) { |
| 40 binding_.Bind(std::move(request)); | 38 binding_.Bind(std::move(request)); |
| 41 } | 39 } |
| 42 | 40 |
| 43 void LayoutTestRenderFrameObserver::OnDestruct() { | 41 void LayoutTestRenderFrameObserver::OnDestruct() { |
| 44 delete this; | 42 delete this; |
| 45 } | 43 } |
| 46 | 44 |
| 47 void LayoutTestRenderFrameObserver::LayoutDumpRequest() { | 45 void LayoutTestRenderFrameObserver::DumpFrameLayout( |
| 46 DumpFrameLayoutCallback callback) { |
| 48 std::string dump = | 47 std::string dump = |
| 49 LayoutTestRenderThreadObserver::GetInstance() | 48 LayoutTestRenderThreadObserver::GetInstance() |
| 50 ->test_interfaces() | 49 ->test_interfaces() |
| 51 ->TestRunner() | 50 ->TestRunner() |
| 52 ->DumpLayout(render_frame()->GetWebFrame()); | 51 ->DumpLayout(render_frame()->GetWebFrame()); |
| 53 Send(new ShellViewHostMsg_LayoutDumpResponse(routing_id(), dump)); | 52 std::move(callback).Run(dump); |
| 54 } | 53 } |
| 55 | 54 |
| 56 void LayoutTestRenderFrameObserver::ReplicateTestConfiguration( | 55 void LayoutTestRenderFrameObserver::ReplicateTestConfiguration( |
| 57 mojom::ShellTestConfigurationPtr config) { | 56 mojom::ShellTestConfigurationPtr config) { |
| 58 BlinkTestRunner::Get(render_frame()->GetRenderView()) | 57 BlinkTestRunner::Get(render_frame()->GetRenderView()) |
| 59 ->OnReplicateTestConfiguration(std::move(config)); | 58 ->OnReplicateTestConfiguration(std::move(config)); |
| 60 } | 59 } |
| 61 | 60 |
| 62 void LayoutTestRenderFrameObserver::SetTestConfiguration( | 61 void LayoutTestRenderFrameObserver::SetTestConfiguration( |
| 63 mojom::ShellTestConfigurationPtr config) { | 62 mojom::ShellTestConfigurationPtr config) { |
| 64 BlinkTestRunner::Get(render_frame()->GetRenderView()) | 63 BlinkTestRunner::Get(render_frame()->GetRenderView()) |
| 65 ->OnSetTestConfiguration(std::move(config)); | 64 ->OnSetTestConfiguration(std::move(config)); |
| 66 } | 65 } |
| 67 | 66 |
| 68 void LayoutTestRenderFrameObserver::SetupSecondaryRenderer() { | 67 void LayoutTestRenderFrameObserver::SetupSecondaryRenderer() { |
| 69 BlinkTestRunner::Get(render_frame()->GetRenderView()) | 68 BlinkTestRunner::Get(render_frame()->GetRenderView()) |
| 70 ->OnSetupSecondaryRenderer(); | 69 ->OnSetupSecondaryRenderer(); |
| 71 } | 70 } |
| 72 | 71 |
| 73 } // namespace content | 72 } // namespace content |
| OLD | NEW |