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

Side by Side Diff: Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp

Issue 18110006: Remove our logic to handle stopping a load inside startProvisionaLoad callbacks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | « Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp ('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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after
1180 if (!m_testInterfaces->testRunner()->topLoadingFrame()) 1180 if (!m_testInterfaces->testRunner()->topLoadingFrame())
1181 m_testInterfaces->testRunner()->setTopLoadingFrame(frame, false); 1181 m_testInterfaces->testRunner()->setTopLoadingFrame(frame, false);
1182 1182
1183 if (m_testInterfaces->testRunner()->shouldDumpFrameLoadCallbacks()) { 1183 if (m_testInterfaces->testRunner()->shouldDumpFrameLoadCallbacks()) {
1184 printFrameDescription(m_delegate, frame); 1184 printFrameDescription(m_delegate, frame);
1185 m_delegate->printMessage(" - didStartProvisionalLoadForFrame\n"); 1185 m_delegate->printMessage(" - didStartProvisionalLoadForFrame\n");
1186 } 1186 }
1187 1187
1188 if (m_testInterfaces->testRunner()->shouldDumpUserGestureInFrameLoadCallback s()) 1188 if (m_testInterfaces->testRunner()->shouldDumpUserGestureInFrameLoadCallback s())
1189 printFrameUserGestureStatus(m_delegate, frame, " - in didStartProvisiona lLoadForFrame\n"); 1189 printFrameUserGestureStatus(m_delegate, frame, " - in didStartProvisiona lLoadForFrame\n");
1190
1191 if (m_testInterfaces->testRunner()->stopProvisionalFrameLoads()) {
1192 printFrameDescription(m_delegate, frame);
1193 m_delegate->printMessage(" - stopping load in didStartProvisionalLoadFor Frame callback\n");
1194 frame->stopLoading();
1195 }
1196 } 1190 }
1197 1191
1198 void WebTestProxyBase::didReceiveServerRedirectForProvisionalLoad(WebFrame* fram e) 1192 void WebTestProxyBase::didReceiveServerRedirectForProvisionalLoad(WebFrame* fram e)
1199 { 1193 {
1200 if (m_testInterfaces->testRunner()->shouldDumpFrameLoadCallbacks()) { 1194 if (m_testInterfaces->testRunner()->shouldDumpFrameLoadCallbacks()) {
1201 printFrameDescription(m_delegate, frame); 1195 printFrameDescription(m_delegate, frame);
1202 m_delegate->printMessage(" - didReceiveServerRedirectForProvisionalLoadF orFrame\n"); 1196 m_delegate->printMessage(" - didReceiveServerRedirectForProvisionalLoadF orFrame\n");
1203 } 1197 }
1204 } 1198 }
1205 1199
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1559 1553
1560 void WebTestProxyBase::resetInputMethod() 1554 void WebTestProxyBase::resetInputMethod()
1561 { 1555 {
1562 // If a composition text exists, then we need to let the browser process 1556 // If a composition text exists, then we need to let the browser process
1563 // to cancel the input method's ongoing composition session. 1557 // to cancel the input method's ongoing composition session.
1564 if (m_webWidget) 1558 if (m_webWidget)
1565 m_webWidget->confirmComposition(); 1559 m_webWidget->confirmComposition();
1566 } 1560 }
1567 1561
1568 } 1562 }
OLDNEW
« no previous file with comments | « Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698