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

Side by Side Diff: Source/testing/runner/TestRunner.cpp

Issue 22159002: Add 'didDispatchPingLoader' callback to FrameLoaderClient. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/testing/runner/TestRunner.h ('k') | Source/testing/runner/WebTestProxy.cpp » ('j') | 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) 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 bindMethod("setPluginsEnabled", &TestRunner::setPluginsEnabled); 227 bindMethod("setPluginsEnabled", &TestRunner::setPluginsEnabled);
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("dumpPingLoaderCallbacks", &TestRunner::dumpPingLoaderCallbacks);
237 bindMethod("dumpUserGestureInFrameLoadCallbacks", &TestRunner::dumpUserGestu reInFrameLoadCallbacks); 238 bindMethod("dumpUserGestureInFrameLoadCallbacks", &TestRunner::dumpUserGestu reInFrameLoadCallbacks);
238 bindMethod("dumpTitleChanges", &TestRunner::dumpTitleChanges); 239 bindMethod("dumpTitleChanges", &TestRunner::dumpTitleChanges);
239 bindMethod("dumpCreateView", &TestRunner::dumpCreateView); 240 bindMethod("dumpCreateView", &TestRunner::dumpCreateView);
240 bindMethod("setCanOpenWindows", &TestRunner::setCanOpenWindows); 241 bindMethod("setCanOpenWindows", &TestRunner::setCanOpenWindows);
241 bindMethod("dumpResourceLoadCallbacks", &TestRunner::dumpResourceLoadCallbac ks); 242 bindMethod("dumpResourceLoadCallbacks", &TestRunner::dumpResourceLoadCallbac ks);
242 bindMethod("dumpResourceRequestCallbacks", &TestRunner::dumpResourceRequestC allbacks); 243 bindMethod("dumpResourceRequestCallbacks", &TestRunner::dumpResourceRequestC allbacks);
243 bindMethod("dumpResourceResponseMIMETypes", &TestRunner::dumpResourceRespons eMIMETypes); 244 bindMethod("dumpResourceResponseMIMETypes", &TestRunner::dumpResourceRespons eMIMETypes);
244 bindMethod("dumpPermissionClientCallbacks", &TestRunner::dumpPermissionClien tCallbacks); 245 bindMethod("dumpPermissionClientCallbacks", &TestRunner::dumpPermissionClien tCallbacks);
245 bindMethod("setImagesAllowed", &TestRunner::setImagesAllowed); 246 bindMethod("setImagesAllowed", &TestRunner::setImagesAllowed);
246 bindMethod("setScriptsAllowed", &TestRunner::setScriptsAllowed); 247 bindMethod("setScriptsAllowed", &TestRunner::setScriptsAllowed);
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 } 395 }
395 396
396 m_dumpEditingCallbacks = false; 397 m_dumpEditingCallbacks = false;
397 m_dumpAsText = false; 398 m_dumpAsText = false;
398 m_generatePixelResults = true; 399 m_generatePixelResults = true;
399 m_dumpChildFrameScrollPositions = false; 400 m_dumpChildFrameScrollPositions = false;
400 m_dumpChildFramesAsText = false; 401 m_dumpChildFramesAsText = false;
401 m_dumpIconChanges = false; 402 m_dumpIconChanges = false;
402 m_dumpAsAudio = false; 403 m_dumpAsAudio = false;
403 m_dumpFrameLoadCallbacks = false; 404 m_dumpFrameLoadCallbacks = false;
405 m_dumpPingLoaderCallbacks = false;
404 m_dumpUserGestureInFrameLoadCallbacks = false; 406 m_dumpUserGestureInFrameLoadCallbacks = false;
405 m_dumpTitleChanges = false; 407 m_dumpTitleChanges = false;
406 m_dumpCreateView = false; 408 m_dumpCreateView = false;
407 m_canOpenWindows = false; 409 m_canOpenWindows = false;
408 m_dumpResourceLoadCallbacks = false; 410 m_dumpResourceLoadCallbacks = false;
409 m_dumpResourceRequestCallbacks = false; 411 m_dumpResourceRequestCallbacks = false;
410 m_dumpResourceResponseMIMETypes = false; 412 m_dumpResourceResponseMIMETypes = false;
411 m_dumpWindowStatusChanges = false; 413 m_dumpWindowStatusChanges = false;
412 m_dumpProgressFinishedCallback = false; 414 m_dumpProgressFinishedCallback = false;
413 m_dumpBackForwardList = false; 415 m_dumpBackForwardList = false;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 bool TestRunner::shouldDumpFrameLoadCallbacks() const 519 bool TestRunner::shouldDumpFrameLoadCallbacks() const
518 { 520 {
519 return m_testIsRunning && m_dumpFrameLoadCallbacks; 521 return m_testIsRunning && m_dumpFrameLoadCallbacks;
520 } 522 }
521 523
522 void TestRunner::setShouldDumpFrameLoadCallbacks(bool value) 524 void TestRunner::setShouldDumpFrameLoadCallbacks(bool value)
523 { 525 {
524 m_dumpFrameLoadCallbacks = value; 526 m_dumpFrameLoadCallbacks = value;
525 } 527 }
526 528
529 bool TestRunner::shouldDumpPingLoaderCallbacks() const
530 {
531 return m_testIsRunning && m_dumpPingLoaderCallbacks;
532 }
533
534 void TestRunner::setShouldDumpPingLoaderCallbacks(bool value)
535 {
536 m_dumpPingLoaderCallbacks = value;
537 }
538
527 bool TestRunner::shouldDumpUserGestureInFrameLoadCallbacks() const 539 bool TestRunner::shouldDumpUserGestureInFrameLoadCallbacks() const
528 { 540 {
529 return m_testIsRunning && m_dumpUserGestureInFrameLoadCallbacks; 541 return m_testIsRunning && m_dumpUserGestureInFrameLoadCallbacks;
530 } 542 }
531 543
532 bool TestRunner::shouldDumpTitleChanges() const 544 bool TestRunner::shouldDumpTitleChanges() const
533 { 545 {
534 return m_dumpTitleChanges; 546 return m_dumpTitleChanges;
535 } 547 }
536 548
(...skipping 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
1957 1969
1958 m_dumpAsAudio = true; 1970 m_dumpAsAudio = true;
1959 } 1971 }
1960 1972
1961 void TestRunner::dumpFrameLoadCallbacks(const CppArgumentList&, CppVariant* resu lt) 1973 void TestRunner::dumpFrameLoadCallbacks(const CppArgumentList&, CppVariant* resu lt)
1962 { 1974 {
1963 m_dumpFrameLoadCallbacks = true; 1975 m_dumpFrameLoadCallbacks = true;
1964 result->setNull(); 1976 result->setNull();
1965 } 1977 }
1966 1978
1979 void TestRunner::dumpPingLoaderCallbacks(const CppArgumentList&, CppVariant* res ult)
1980 {
1981 m_dumpPingLoaderCallbacks = true;
1982 result->setNull();
1983 }
1984
1967 void TestRunner::dumpUserGestureInFrameLoadCallbacks(const CppArgumentList&, Cpp Variant* result) 1985 void TestRunner::dumpUserGestureInFrameLoadCallbacks(const CppArgumentList&, Cpp Variant* result)
1968 { 1986 {
1969 m_dumpUserGestureInFrameLoadCallbacks = true; 1987 m_dumpUserGestureInFrameLoadCallbacks = true;
1970 result->setNull(); 1988 result->setNull();
1971 } 1989 }
1972 1990
1973 void TestRunner::dumpTitleChanges(const CppArgumentList&, CppVariant* result) 1991 void TestRunner::dumpTitleChanges(const CppArgumentList&, CppVariant* result)
1974 { 1992 {
1975 m_dumpTitleChanges = true; 1993 m_dumpTitleChanges = true;
1976 result->setNull(); 1994 result->setNull();
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
2090 result->setNull(); 2108 result->setNull();
2091 } 2109 }
2092 2110
2093 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, Cpp Variant* result) 2111 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, Cpp Variant* result)
2094 { 2112 {
2095 m_pointerLockPlannedResult = PointerLockWillFailSync; 2113 m_pointerLockPlannedResult = PointerLockWillFailSync;
2096 result->setNull(); 2114 result->setNull();
2097 } 2115 }
2098 2116
2099 } 2117 }
OLDNEW
« no previous file with comments | « Source/testing/runner/TestRunner.h ('k') | Source/testing/runner/WebTestProxy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698