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

Side by Side Diff: content/shell/renderer/test_runner/web_test_proxy.cc

Issue 293363016: [abort] [webkit test runner] Complete location change when a frame is detached. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « content/shell/renderer/test_runner/web_test_proxy.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 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/shell/renderer/test_runner/web_test_proxy.h" 5 #include "content/shell/renderer/test_runner/web_test_proxy.h"
6 6
7 #include <cctype> 7 #include <cctype>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 delegate_->printMessage(" - didFinishLoadForFrame\n"); 865 delegate_->printMessage(" - didFinishLoadForFrame\n");
866 } 866 }
867 LocationChangeDone(frame); 867 LocationChangeDone(frame);
868 } 868 }
869 869
870 void WebTestProxyBase::DidDetectXSS(WebLocalFrame*, const WebURL&, bool) { 870 void WebTestProxyBase::DidDetectXSS(WebLocalFrame*, const WebURL&, bool) {
871 if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) 871 if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks())
872 delegate_->printMessage("didDetectXSS\n"); 872 delegate_->printMessage("didDetectXSS\n");
873 } 873 }
874 874
875 void WebTestProxyBase::FrameDetached(blink::WebFrame* frame) {
876 LocationChangeDone(frame);
877 }
878
875 void WebTestProxyBase::DidDispatchPingLoader(WebLocalFrame*, 879 void WebTestProxyBase::DidDispatchPingLoader(WebLocalFrame*,
876 const WebURL& url) { 880 const WebURL& url) {
877 if (test_interfaces_->testRunner()->shouldDumpPingLoaderCallbacks()) 881 if (test_interfaces_->testRunner()->shouldDumpPingLoaderCallbacks())
878 delegate_->printMessage(string("PingLoader dispatched to '") + 882 delegate_->printMessage(string("PingLoader dispatched to '") +
879 URLDescription(url).c_str() + "'.\n"); 883 URLDescription(url).c_str() + "'.\n");
880 } 884 }
881 885
882 void WebTestProxyBase::WillRequestResource( 886 void WebTestProxyBase::WillRequestResource(
883 WebLocalFrame* frame, const blink::WebCachedURLRequest& request) { 887 WebLocalFrame* frame, const blink::WebCachedURLRequest& request) {
884 if (test_interfaces_->testRunner()->shouldDumpResourceRequestCallbacks()) { 888 if (test_interfaces_->testRunner()->shouldDumpResourceRequestCallbacks()) {
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 } 1111 }
1108 } 1112 }
1109 1113
1110 void WebTestProxyBase::ResetInputMethod() { 1114 void WebTestProxyBase::ResetInputMethod() {
1111 // If a composition text exists, then we need to let the browser process 1115 // If a composition text exists, then we need to let the browser process
1112 // to cancel the input method's ongoing composition session. 1116 // to cancel the input method's ongoing composition session.
1113 if (web_widget_) web_widget_->confirmComposition(); 1117 if (web_widget_) web_widget_->confirmComposition();
1114 } 1118 }
1115 1119
1116 } // namespace content 1120 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/web_test_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698