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

Side by Side Diff: Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Pawel Hajdan (phajdan.jr@chromium.org) 3 * Copyright (C) 2010 Pawel Hajdan (phajdan.jr@chromium.org)
4 * Copyright (C) 2012 Apple Inc. All Rights Reserved. 4 * Copyright (C) 2012 Apple Inc. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are 7 * modification, are permitted provided that the following conditions are
8 * met: 8 * met:
9 * 9 *
10 * * Redistributions of source code must retain the above copyright 10 * * Redistributions of source code must retain the above copyright
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 // The following modify the state of the TestRunner. 229 // The following modify the state of the TestRunner.
230 bindMethod("dumpEditingCallbacks", &TestRunner::dumpEditingCallbacks); 230 bindMethod("dumpEditingCallbacks", &TestRunner::dumpEditingCallbacks);
231 bindMethod("dumpAsText", &TestRunner::dumpAsText); 231 bindMethod("dumpAsText", &TestRunner::dumpAsText);
232 bindMethod("dumpChildFramesAsText", &TestRunner::dumpChildFramesAsText); 232 bindMethod("dumpChildFramesAsText", &TestRunner::dumpChildFramesAsText);
233 bindMethod("dumpChildFrameScrollPositions", &TestRunner::dumpChildFrameScrol lPositions); 233 bindMethod("dumpChildFrameScrollPositions", &TestRunner::dumpChildFrameScrol lPositions);
234 bindMethod("dumpIconChanges", &TestRunner::dumpIconChanges); 234 bindMethod("dumpIconChanges", &TestRunner::dumpIconChanges);
235 bindMethod("setAudioData", &TestRunner::setAudioData); 235 bindMethod("setAudioData", &TestRunner::setAudioData);
236 bindMethod("dumpFrameLoadCallbacks", &TestRunner::dumpFrameLoadCallbacks); 236 bindMethod("dumpFrameLoadCallbacks", &TestRunner::dumpFrameLoadCallbacks);
237 bindMethod("dumpUserGestureInFrameLoadCallbacks", &TestRunner::dumpUserGestu reInFrameLoadCallbacks); 237 bindMethod("dumpUserGestureInFrameLoadCallbacks", &TestRunner::dumpUserGestu reInFrameLoadCallbacks);
238 bindMethod("setStopProvisionalFrameLoads", &TestRunner::setStopProvisionalFr ameLoads);
239 bindMethod("dumpTitleChanges", &TestRunner::dumpTitleChanges); 238 bindMethod("dumpTitleChanges", &TestRunner::dumpTitleChanges);
240 bindMethod("dumpCreateView", &TestRunner::dumpCreateView); 239 bindMethod("dumpCreateView", &TestRunner::dumpCreateView);
241 bindMethod("setCanOpenWindows", &TestRunner::setCanOpenWindows); 240 bindMethod("setCanOpenWindows", &TestRunner::setCanOpenWindows);
242 bindMethod("dumpResourceLoadCallbacks", &TestRunner::dumpResourceLoadCallbac ks); 241 bindMethod("dumpResourceLoadCallbacks", &TestRunner::dumpResourceLoadCallbac ks);
243 bindMethod("dumpResourceRequestCallbacks", &TestRunner::dumpResourceRequestC allbacks); 242 bindMethod("dumpResourceRequestCallbacks", &TestRunner::dumpResourceRequestC allbacks);
244 bindMethod("dumpResourceResponseMIMETypes", &TestRunner::dumpResourceRespons eMIMETypes); 243 bindMethod("dumpResourceResponseMIMETypes", &TestRunner::dumpResourceRespons eMIMETypes);
245 bindMethod("dumpPermissionClientCallbacks", &TestRunner::dumpPermissionClien tCallbacks); 244 bindMethod("dumpPermissionClientCallbacks", &TestRunner::dumpPermissionClien tCallbacks);
246 bindMethod("setImagesAllowed", &TestRunner::setImagesAllowed); 245 bindMethod("setImagesAllowed", &TestRunner::setImagesAllowed);
247 bindMethod("setScriptsAllowed", &TestRunner::setScriptsAllowed); 246 bindMethod("setScriptsAllowed", &TestRunner::setScriptsAllowed);
248 bindMethod("setStorageAllowed", &TestRunner::setStorageAllowed); 247 bindMethod("setStorageAllowed", &TestRunner::setStorageAllowed);
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 383
385 m_dumpEditingCallbacks = false; 384 m_dumpEditingCallbacks = false;
386 m_dumpAsText = false; 385 m_dumpAsText = false;
387 m_generatePixelResults = true; 386 m_generatePixelResults = true;
388 m_dumpChildFrameScrollPositions = false; 387 m_dumpChildFrameScrollPositions = false;
389 m_dumpChildFramesAsText = false; 388 m_dumpChildFramesAsText = false;
390 m_dumpIconChanges = false; 389 m_dumpIconChanges = false;
391 m_dumpAsAudio = false; 390 m_dumpAsAudio = false;
392 m_dumpFrameLoadCallbacks = false; 391 m_dumpFrameLoadCallbacks = false;
393 m_dumpUserGestureInFrameLoadCallbacks = false; 392 m_dumpUserGestureInFrameLoadCallbacks = false;
394 m_stopProvisionalFrameLoads = false;
395 m_dumpTitleChanges = false; 393 m_dumpTitleChanges = false;
396 m_dumpCreateView = false; 394 m_dumpCreateView = false;
397 m_canOpenWindows = false; 395 m_canOpenWindows = false;
398 m_dumpResourceLoadCallbacks = false; 396 m_dumpResourceLoadCallbacks = false;
399 m_dumpResourceRequestCallbacks = false; 397 m_dumpResourceRequestCallbacks = false;
400 m_dumpResourceResponseMIMETypes = false; 398 m_dumpResourceResponseMIMETypes = false;
401 m_dumpWindowStatusChanges = false; 399 m_dumpWindowStatusChanges = false;
402 m_dumpProgressFinishedCallback = false; 400 m_dumpProgressFinishedCallback = false;
403 m_dumpBackForwardList = false; 401 m_dumpBackForwardList = false;
404 m_deferMainResourceDataLoad = true; 402 m_deferMainResourceDataLoad = true;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 void TestRunner::setShouldDumpFrameLoadCallbacks(bool value) 511 void TestRunner::setShouldDumpFrameLoadCallbacks(bool value)
514 { 512 {
515 m_dumpFrameLoadCallbacks = value; 513 m_dumpFrameLoadCallbacks = value;
516 } 514 }
517 515
518 bool TestRunner::shouldDumpUserGestureInFrameLoadCallbacks() const 516 bool TestRunner::shouldDumpUserGestureInFrameLoadCallbacks() const
519 { 517 {
520 return m_testIsRunning && m_dumpUserGestureInFrameLoadCallbacks; 518 return m_testIsRunning && m_dumpUserGestureInFrameLoadCallbacks;
521 } 519 }
522 520
523 bool TestRunner::stopProvisionalFrameLoads() const
524 {
525 return m_stopProvisionalFrameLoads;
526 }
527
528 bool TestRunner::shouldDumpTitleChanges() const 521 bool TestRunner::shouldDumpTitleChanges() const
529 { 522 {
530 return m_dumpTitleChanges; 523 return m_dumpTitleChanges;
531 } 524 }
532 525
533 bool TestRunner::shouldDumpIconChanges() const 526 bool TestRunner::shouldDumpIconChanges() const
534 { 527 {
535 return m_dumpIconChanges; 528 return m_dumpIconChanges;
536 } 529 }
537 530
(...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after
1900 m_dumpFrameLoadCallbacks = true; 1893 m_dumpFrameLoadCallbacks = true;
1901 result->setNull(); 1894 result->setNull();
1902 } 1895 }
1903 1896
1904 void TestRunner::dumpUserGestureInFrameLoadCallbacks(const CppArgumentList&, Cpp Variant* result) 1897 void TestRunner::dumpUserGestureInFrameLoadCallbacks(const CppArgumentList&, Cpp Variant* result)
1905 { 1898 {
1906 m_dumpUserGestureInFrameLoadCallbacks = true; 1899 m_dumpUserGestureInFrameLoadCallbacks = true;
1907 result->setNull(); 1900 result->setNull();
1908 } 1901 }
1909 1902
1910 void TestRunner::setStopProvisionalFrameLoads(const CppArgumentList&, CppVariant * result)
1911 {
1912 result->setNull();
1913 m_stopProvisionalFrameLoads = true;
1914 }
1915
1916 void TestRunner::dumpTitleChanges(const CppArgumentList&, CppVariant* result) 1903 void TestRunner::dumpTitleChanges(const CppArgumentList&, CppVariant* result)
1917 { 1904 {
1918 m_dumpTitleChanges = true; 1905 m_dumpTitleChanges = true;
1919 result->setNull(); 1906 result->setNull();
1920 } 1907 }
1921 1908
1922 void TestRunner::dumpCreateView(const CppArgumentList&, CppVariant* result) 1909 void TestRunner::dumpCreateView(const CppArgumentList&, CppVariant* result)
1923 { 1910 {
1924 m_dumpCreateView = true; 1911 m_dumpCreateView = true;
1925 result->setNull(); 1912 result->setNull();
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
2033 result->setNull(); 2020 result->setNull();
2034 } 2021 }
2035 2022
2036 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, Cpp Variant* result) 2023 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, Cpp Variant* result)
2037 { 2024 {
2038 m_pointerLockPlannedResult = PointerLockWillFailSync; 2025 m_pointerLockPlannedResult = PointerLockWillFailSync;
2039 result->setNull(); 2026 result->setNull();
2040 } 2027 }
2041 2028
2042 } 2029 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698