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

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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 226
227 // The following modify the state of the TestRunner. 227 // The following modify the state of the TestRunner.
228 bindMethod("dumpEditingCallbacks", &TestRunner::dumpEditingCallbacks); 228 bindMethod("dumpEditingCallbacks", &TestRunner::dumpEditingCallbacks);
229 bindMethod("dumpAsText", &TestRunner::dumpAsText); 229 bindMethod("dumpAsText", &TestRunner::dumpAsText);
230 bindMethod("dumpChildFramesAsText", &TestRunner::dumpChildFramesAsText); 230 bindMethod("dumpChildFramesAsText", &TestRunner::dumpChildFramesAsText);
231 bindMethod("dumpChildFrameScrollPositions", &TestRunner::dumpChildFrameScrol lPositions); 231 bindMethod("dumpChildFrameScrollPositions", &TestRunner::dumpChildFrameScrol lPositions);
232 bindMethod("dumpIconChanges", &TestRunner::dumpIconChanges); 232 bindMethod("dumpIconChanges", &TestRunner::dumpIconChanges);
233 bindMethod("setAudioData", &TestRunner::setAudioData); 233 bindMethod("setAudioData", &TestRunner::setAudioData);
234 bindMethod("dumpFrameLoadCallbacks", &TestRunner::dumpFrameLoadCallbacks); 234 bindMethod("dumpFrameLoadCallbacks", &TestRunner::dumpFrameLoadCallbacks);
235 bindMethod("dumpUserGestureInFrameLoadCallbacks", &TestRunner::dumpUserGestu reInFrameLoadCallbacks); 235 bindMethod("dumpUserGestureInFrameLoadCallbacks", &TestRunner::dumpUserGestu reInFrameLoadCallbacks);
236 bindMethod("setStopProvisionalFrameLoads", &TestRunner::setStopProvisionalFr ameLoads);
237 bindMethod("dumpTitleChanges", &TestRunner::dumpTitleChanges); 236 bindMethod("dumpTitleChanges", &TestRunner::dumpTitleChanges);
238 bindMethod("dumpCreateView", &TestRunner::dumpCreateView); 237 bindMethod("dumpCreateView", &TestRunner::dumpCreateView);
239 bindMethod("setCanOpenWindows", &TestRunner::setCanOpenWindows); 238 bindMethod("setCanOpenWindows", &TestRunner::setCanOpenWindows);
240 bindMethod("dumpResourceLoadCallbacks", &TestRunner::dumpResourceLoadCallbac ks); 239 bindMethod("dumpResourceLoadCallbacks", &TestRunner::dumpResourceLoadCallbac ks);
241 bindMethod("dumpResourceRequestCallbacks", &TestRunner::dumpResourceRequestC allbacks); 240 bindMethod("dumpResourceRequestCallbacks", &TestRunner::dumpResourceRequestC allbacks);
242 bindMethod("dumpResourceResponseMIMETypes", &TestRunner::dumpResourceRespons eMIMETypes); 241 bindMethod("dumpResourceResponseMIMETypes", &TestRunner::dumpResourceRespons eMIMETypes);
243 bindMethod("dumpPermissionClientCallbacks", &TestRunner::dumpPermissionClien tCallbacks); 242 bindMethod("dumpPermissionClientCallbacks", &TestRunner::dumpPermissionClien tCallbacks);
244 bindMethod("setImagesAllowed", &TestRunner::setImagesAllowed); 243 bindMethod("setImagesAllowed", &TestRunner::setImagesAllowed);
245 bindMethod("setScriptsAllowed", &TestRunner::setScriptsAllowed); 244 bindMethod("setScriptsAllowed", &TestRunner::setScriptsAllowed);
246 bindMethod("setStorageAllowed", &TestRunner::setStorageAllowed); 245 bindMethod("setStorageAllowed", &TestRunner::setStorageAllowed);
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 381
383 m_dumpEditingCallbacks = false; 382 m_dumpEditingCallbacks = false;
384 m_dumpAsText = false; 383 m_dumpAsText = false;
385 m_generatePixelResults = true; 384 m_generatePixelResults = true;
386 m_dumpChildFrameScrollPositions = false; 385 m_dumpChildFrameScrollPositions = false;
387 m_dumpChildFramesAsText = false; 386 m_dumpChildFramesAsText = false;
388 m_dumpIconChanges = false; 387 m_dumpIconChanges = false;
389 m_dumpAsAudio = false; 388 m_dumpAsAudio = false;
390 m_dumpFrameLoadCallbacks = false; 389 m_dumpFrameLoadCallbacks = false;
391 m_dumpUserGestureInFrameLoadCallbacks = false; 390 m_dumpUserGestureInFrameLoadCallbacks = false;
392 m_stopProvisionalFrameLoads = false;
393 m_dumpTitleChanges = false; 391 m_dumpTitleChanges = false;
394 m_dumpCreateView = false; 392 m_dumpCreateView = false;
395 m_canOpenWindows = false; 393 m_canOpenWindows = false;
396 m_dumpResourceLoadCallbacks = false; 394 m_dumpResourceLoadCallbacks = false;
397 m_dumpResourceRequestCallbacks = false; 395 m_dumpResourceRequestCallbacks = false;
398 m_dumpResourceResponseMIMETypes = false; 396 m_dumpResourceResponseMIMETypes = false;
399 m_dumpWindowStatusChanges = false; 397 m_dumpWindowStatusChanges = false;
400 m_dumpProgressFinishedCallback = false; 398 m_dumpProgressFinishedCallback = false;
401 m_dumpBackForwardList = false; 399 m_dumpBackForwardList = false;
402 m_deferMainResourceDataLoad = true; 400 m_deferMainResourceDataLoad = true;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 void TestRunner::setShouldDumpFrameLoadCallbacks(bool value) 509 void TestRunner::setShouldDumpFrameLoadCallbacks(bool value)
512 { 510 {
513 m_dumpFrameLoadCallbacks = value; 511 m_dumpFrameLoadCallbacks = value;
514 } 512 }
515 513
516 bool TestRunner::shouldDumpUserGestureInFrameLoadCallbacks() const 514 bool TestRunner::shouldDumpUserGestureInFrameLoadCallbacks() const
517 { 515 {
518 return m_testIsRunning && m_dumpUserGestureInFrameLoadCallbacks; 516 return m_testIsRunning && m_dumpUserGestureInFrameLoadCallbacks;
519 } 517 }
520 518
521 bool TestRunner::stopProvisionalFrameLoads() const
522 {
523 return m_stopProvisionalFrameLoads;
524 }
525
526 bool TestRunner::shouldDumpTitleChanges() const 519 bool TestRunner::shouldDumpTitleChanges() const
527 { 520 {
528 return m_dumpTitleChanges; 521 return m_dumpTitleChanges;
529 } 522 }
530 523
531 bool TestRunner::shouldDumpIconChanges() const 524 bool TestRunner::shouldDumpIconChanges() const
532 { 525 {
533 return m_dumpIconChanges; 526 return m_dumpIconChanges;
534 } 527 }
535 528
(...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after
1898 m_dumpFrameLoadCallbacks = true; 1891 m_dumpFrameLoadCallbacks = true;
1899 result->setNull(); 1892 result->setNull();
1900 } 1893 }
1901 1894
1902 void TestRunner::dumpUserGestureInFrameLoadCallbacks(const CppArgumentList&, Cpp Variant* result) 1895 void TestRunner::dumpUserGestureInFrameLoadCallbacks(const CppArgumentList&, Cpp Variant* result)
1903 { 1896 {
1904 m_dumpUserGestureInFrameLoadCallbacks = true; 1897 m_dumpUserGestureInFrameLoadCallbacks = true;
1905 result->setNull(); 1898 result->setNull();
1906 } 1899 }
1907 1900
1908 void TestRunner::setStopProvisionalFrameLoads(const CppArgumentList&, CppVariant * result)
1909 {
1910 result->setNull();
1911 m_stopProvisionalFrameLoads = true;
1912 }
1913
1914 void TestRunner::dumpTitleChanges(const CppArgumentList&, CppVariant* result) 1901 void TestRunner::dumpTitleChanges(const CppArgumentList&, CppVariant* result)
1915 { 1902 {
1916 m_dumpTitleChanges = true; 1903 m_dumpTitleChanges = true;
1917 result->setNull(); 1904 result->setNull();
1918 } 1905 }
1919 1906
1920 void TestRunner::dumpCreateView(const CppArgumentList&, CppVariant* result) 1907 void TestRunner::dumpCreateView(const CppArgumentList&, CppVariant* result)
1921 { 1908 {
1922 m_dumpCreateView = true; 1909 m_dumpCreateView = true;
1923 result->setNull(); 1910 result->setNull();
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 result->setNull(); 2018 result->setNull();
2032 } 2019 }
2033 2020
2034 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, Cpp Variant* result) 2021 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, Cpp Variant* result)
2035 { 2022 {
2036 m_pointerLockPlannedResult = PointerLockWillFailSync; 2023 m_pointerLockPlannedResult = PointerLockWillFailSync;
2037 result->setNull(); 2024 result->setNull();
2038 } 2025 }
2039 2026
2040 } 2027 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698