Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1072)

Side by Side Diff: content/shell/renderer/layout_test/blink_test_runner.cc

Issue 1297173002: html_viewer: Make sure window.internals is set-up correctly in layout-tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/shell/renderer/layout_test/blink_test_runner.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 7 #include <algorithm>
8 #include <clocale> 8 #include <clocale>
9 #include <cmath> 9 #include <cmath>
10 10
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 blink::WebLocalFrame* frame, const blink::WebPluginParams& params) { 693 blink::WebLocalFrame* frame, const blink::WebPluginParams& params) {
694 if (params.mimeType != "application/x-plugin-placeholder-test") 694 if (params.mimeType != "application/x-plugin-placeholder-test")
695 return nullptr; 695 return nullptr;
696 696
697 plugins::PluginPlaceholder* placeholder = 697 plugins::PluginPlaceholder* placeholder =
698 new plugins::PluginPlaceholder(render_view()->GetMainRenderFrame(), frame, 698 new plugins::PluginPlaceholder(render_view()->GetMainRenderFrame(), frame,
699 params, "<div>Test content</div>"); 699 params, "<div>Test content</div>");
700 return placeholder->plugin(); 700 return placeholder->plugin();
701 } 701 }
702 702
703 void BlinkTestRunner::OnWebTestProxyBaseDestroy(
704 test_runner::WebTestProxyBase* proxy) {
705 }
706
703 // RenderViewObserver -------------------------------------------------------- 707 // RenderViewObserver --------------------------------------------------------
704 708
705 void BlinkTestRunner::DidClearWindowObject(WebLocalFrame* frame) { 709 void BlinkTestRunner::DidClearWindowObject(WebLocalFrame* frame) {
706 WebTestingSupport::injectInternalsObject(frame); 710 WebTestingSupport::injectInternalsObject(frame);
707 LayoutTestRenderProcessObserver::GetInstance()->test_interfaces()->BindTo( 711 LayoutTestRenderProcessObserver::GetInstance()->test_interfaces()->BindTo(
708 frame); 712 frame);
709 GCController::Install(frame); 713 GCController::Install(frame);
710 } 714 }
711 715
712 bool BlinkTestRunner::OnMessageReceived(const IPC::Message& message) { 716 bool BlinkTestRunner::OnMessageReceived(const IPC::Message& message) {
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 904
901 leak_detector_->TryLeakDetection(main_frame); 905 leak_detector_->TryLeakDetection(main_frame);
902 } 906 }
903 907
904 void BlinkTestRunner::ReportLeakDetectionResult( 908 void BlinkTestRunner::ReportLeakDetectionResult(
905 const LeakDetectionResult& report) { 909 const LeakDetectionResult& report) {
906 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report)); 910 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
907 } 911 }
908 912
909 } // namespace content 913 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/layout_test/blink_test_runner.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698