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

Side by Side Diff: third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp

Issue 1480043002: [WIP] Call WebTestProxyBase::CheckDone() in didStopLoading() Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 if (type == DetachType::Remove && frame->parent()) 324 if (type == DetachType::Remove && frame->parent())
325 frame->parent()->removeChild(frame); 325 frame->parent()->removeChild(frame);
326 frame->close(); 326 frame->close();
327 } 327 }
328 328
329 void TestWebFrameClient::didStartLoading(bool) 329 void TestWebFrameClient::didStartLoading(bool)
330 { 330 {
331 ++m_loadsInProgress; 331 ++m_loadsInProgress;
332 } 332 }
333 333
334 void TestWebFrameClient::didStopLoading() 334 void TestWebFrameClient::didStopLoading(WebLocalFrame*)
335 { 335 {
336 ASSERT(m_loadsInProgress > 0); 336 ASSERT(m_loadsInProgress > 0);
337 --m_loadsInProgress; 337 --m_loadsInProgress;
338 } 338 }
339 339
340 void TestWebFrameClient::waitForLoadToComplete() 340 void TestWebFrameClient::waitForLoadToComplete()
341 { 341 {
342 for (;;) { 342 for (;;) {
343 // We call runPendingTasks multiple times as single call of 343 // We call runPendingTasks multiple times as single call of
344 // runPendingTasks may not be enough. 344 // runPendingTasks may not be enough.
(...skipping 20 matching lines...) Expand all
365 } 365 }
366 366
367 void TestWebViewClient::initializeLayerTreeView() 367 void TestWebViewClient::initializeLayerTreeView()
368 { 368 {
369 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay erTreeViewForTesting()); 369 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay erTreeViewForTesting());
370 ASSERT(m_layerTreeView); 370 ASSERT(m_layerTreeView);
371 } 371 }
372 372
373 } // namespace FrameTestHelpers 373 } // namespace FrameTestHelpers
374 } // namespace blink 374 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/tests/FrameTestHelpers.h ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698