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/shell/renderer/layout_test/blink_test_runner.h" | 5 #include "content/shell/renderer/layout_test/blink_test_runner.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <clocale> | 9 #include <clocale> |
10 #include <cmath> | 10 #include <cmath> |
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
604 result.substr(strlen("file:////")); | 604 result.substr(strlen("file:////")); |
605 } | 605 } |
606 return RewriteLayoutTestsURL(result).string().utf8(); | 606 return RewriteLayoutTestsURL(result).string().utf8(); |
607 } | 607 } |
608 | 608 |
609 void BlinkTestRunner::SetLocale(const std::string& locale) { | 609 void BlinkTestRunner::SetLocale(const std::string& locale) { |
610 setlocale(LC_ALL, locale.c_str()); | 610 setlocale(LC_ALL, locale.c_str()); |
611 } | 611 } |
612 | 612 |
613 void BlinkTestRunner::TestFinished() { | 613 void BlinkTestRunner::TestFinished() { |
614 if (!is_main_window_) { | 614 if (!is_main_window_ || !render_view()->GetMainRenderFrame()) { |
615 Send(new ShellViewHostMsg_TestFinishedInSecondaryWindow(routing_id())); | 615 Send(new ShellViewHostMsg_TestFinishedInSecondaryRenderer(routing_id())); |
616 return; | 616 return; |
617 } | 617 } |
618 test_runner::WebTestInterfaces* interfaces = | 618 test_runner::WebTestInterfaces* interfaces = |
619 LayoutTestRenderProcessObserver::GetInstance()->test_interfaces(); | 619 LayoutTestRenderProcessObserver::GetInstance()->test_interfaces(); |
620 interfaces->SetTestIsRunning(false); | 620 interfaces->SetTestIsRunning(false); |
621 if (interfaces->TestRunner()->ShouldDumpBackForwardList()) { | 621 if (interfaces->TestRunner()->ShouldDumpBackForwardList()) { |
622 SyncNavigationStateVisitor visitor; | 622 SyncNavigationStateVisitor visitor; |
623 RenderView::ForEach(&visitor); | 623 RenderView::ForEach(&visitor); |
624 Send(new ShellViewHostMsg_CaptureSessionHistory(routing_id())); | 624 Send(new ShellViewHostMsg_CaptureSessionHistory(routing_id())); |
625 } else { | 625 } else { |
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1030 get_bluetooth_events_callbacks_.pop_front(); | 1030 get_bluetooth_events_callbacks_.pop_front(); |
1031 callback.Run(events); | 1031 callback.Run(events); |
1032 } | 1032 } |
1033 | 1033 |
1034 void BlinkTestRunner::ReportLeakDetectionResult( | 1034 void BlinkTestRunner::ReportLeakDetectionResult( |
1035 const LeakDetectionResult& report) { | 1035 const LeakDetectionResult& report) { |
1036 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report)); | 1036 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report)); |
1037 } | 1037 } |
1038 | 1038 |
1039 } // namespace content | 1039 } // namespace content |
OLD | NEW |