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

Side by Side Diff: third_party/WebKit/Source/core/loader/NavigationScheduler.cpp

Issue 2526163002: Rename blink::Page's load deferral to suspension (Closed)
Patch Set: Created 4 years 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) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
5 * (http://www.torchmobile.com/) 5 * (http://www.torchmobile.com/)
6 * Copyright (C) 2009 Adam Barth. All rights reserved. 6 * Copyright (C) 2009 Adam Barth. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 return; 478 return;
479 schedule(ScheduledReload::create()); 479 schedule(ScheduledReload::create());
480 } 480 }
481 481
482 void NavigationScheduler::navigateTask() { 482 void NavigationScheduler::navigateTask() {
483 Platform::current()->currentThread()->scheduler()->removePendingNavigation( 483 Platform::current()->currentThread()->scheduler()->removePendingNavigation(
484 m_frameType); 484 m_frameType);
485 485
486 if (!m_frame->page()) 486 if (!m_frame->page())
487 return; 487 return;
488 if (m_frame->page()->defersLoading()) { 488 if (m_frame->page()->suspended()) {
489 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); 489 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
490 return; 490 return;
491 } 491 }
492 492
493 ScheduledNavigation* redirect(m_redirect.release()); 493 ScheduledNavigation* redirect(m_redirect.release());
494 redirect->fire(m_frame); 494 redirect->fire(m_frame);
495 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); 495 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
496 } 496 }
497 497
498 void NavigationScheduler::schedule(ScheduledNavigation* redirect) { 498 void NavigationScheduler::schedule(ScheduledNavigation* redirect) {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 m_navigateTaskHandle.cancel(); 550 m_navigateTaskHandle.cancel();
551 m_redirect.clear(); 551 m_redirect.clear();
552 } 552 }
553 553
554 DEFINE_TRACE(NavigationScheduler) { 554 DEFINE_TRACE(NavigationScheduler) {
555 visitor->trace(m_frame); 555 visitor->trace(m_frame);
556 visitor->trace(m_redirect); 556 visitor->trace(m_redirect);
557 } 557 }
558 558
559 } // namespace blink 559 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoader.cpp ('k') | third_party/WebKit/Source/core/page/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698