| Index: third_party/WebKit/Source/core/page/ScopedPageSuspender.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/ScopedPageLoadDeferrer.cpp b/third_party/WebKit/Source/core/page/ScopedPageSuspender.cpp
|
| similarity index 79%
|
| rename from third_party/WebKit/Source/core/page/ScopedPageLoadDeferrer.cpp
|
| rename to third_party/WebKit/Source/core/page/ScopedPageSuspender.cpp
|
| index cb1156e530a32bb94343d4b9e7cb9db06efe6d0e..f03dd2431bce5e98dcfc2eee8b126cf0bf743081 100644
|
| --- a/third_party/WebKit/Source/core/page/ScopedPageLoadDeferrer.cpp
|
| +++ b/third_party/WebKit/Source/core/page/ScopedPageSuspender.cpp
|
| @@ -18,7 +18,7 @@
|
| * Boston, MA 02110-1301, USA.
|
| */
|
|
|
| -#include "core/page/ScopedPageLoadDeferrer.h"
|
| +#include "core/page/ScopedPageSuspender.h"
|
|
|
| #include "core/dom/Document.h"
|
| #include "core/loader/FrameLoader.h"
|
| @@ -33,37 +33,37 @@ namespace blink {
|
|
|
| namespace {
|
|
|
| -unsigned s_deferralCount = 0;
|
| +unsigned s_suspensionCount = 0;
|
|
|
| -void setDefersLoading(bool isDeferred) {
|
| +void setSuspended(bool isSuspended) {
|
| // Make a copy of the collection. Undeferring loads can cause script to run,
|
| // which would mutate ordinaryPages() in the middle of iteration.
|
| HeapVector<Member<Page>> pages;
|
| copyToVector(Page::ordinaryPages(), pages);
|
| for (const auto& page : pages)
|
| - page->setDefersLoading(isDeferred);
|
| + page->setSuspended(isSuspended);
|
| }
|
|
|
| } // namespace
|
|
|
| -ScopedPageLoadDeferrer::ScopedPageLoadDeferrer() {
|
| - if (++s_deferralCount > 1)
|
| +ScopedPageSuspender::ScopedPageSuspender() {
|
| + if (++s_suspensionCount > 1)
|
| return;
|
|
|
| - setDefersLoading(true);
|
| + setSuspended(true);
|
| Platform::current()->currentThread()->scheduler()->suspendTimerQueue();
|
| }
|
|
|
| -ScopedPageLoadDeferrer::~ScopedPageLoadDeferrer() {
|
| - if (--s_deferralCount > 0)
|
| +ScopedPageSuspender::~ScopedPageSuspender() {
|
| + if (--s_suspensionCount > 0)
|
| return;
|
|
|
| - setDefersLoading(false);
|
| + setSuspended(false);
|
| Platform::current()->currentThread()->scheduler()->resumeTimerQueue();
|
| }
|
|
|
| -bool ScopedPageLoadDeferrer::isActive() {
|
| - return s_deferralCount > 0;
|
| +bool ScopedPageSuspender::isActive() {
|
| + return s_suspensionCount > 0;
|
| }
|
|
|
| } // namespace blink
|
|
|