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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2526163002: Rename blink::Page's load deferral to suspension (Closed)
Patch Set: Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 4fd3c4068ab5c028d8e9844ebc6f5d0d43f8f29a..0288430c3462db0d386422273fd158ef9de0c118 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -81,7 +81,7 @@
#include "core/page/Page.h"
#include "core/page/PagePopupClient.h"
#include "core/page/PointerLockController.h"
-#include "core/page/ScopedPageLoadDeferrer.h"
+#include "core/page/ScopedPageSuspender.h"
#include "core/page/TouchDisambiguation.h"
#include "core/page/scrolling/TopDocumentRootScrollerController.h"
#include "core/paint/PaintLayer.h"
@@ -228,11 +228,10 @@ const double WebView::maxTextSizeMultiplier = 3.0;
// Used to defer all page activity in cases where the embedder wishes to run
// a nested event loop. Using a stack enables nesting of message loop
// invocations.
-static Vector<std::unique_ptr<ScopedPageLoadDeferrer>>&
-pageLoadDeferrerStack() {
- DEFINE_STATIC_LOCAL(Vector<std::unique_ptr<ScopedPageLoadDeferrer>>,
- deferrerStack, ());
- return deferrerStack;
+static Vector<std::unique_ptr<ScopedPageSuspender>>& pageSuspenderStack() {
+ DEFINE_STATIC_LOCAL(Vector<std::unique_ptr<ScopedPageSuspender>>,
+ suspenderStack, ());
+ return suspenderStack;
}
static bool shouldUseExternalPopupMenus = false;
@@ -302,12 +301,12 @@ void WebView::resetVisitedLinkState(bool invalidateVisitedLinkHashes) {
}
void WebView::willEnterModalLoop() {
- pageLoadDeferrerStack().append(makeUnique<ScopedPageLoadDeferrer>());
+ pageSuspenderStack().append(makeUnique<ScopedPageSuspender>());
}
void WebView::didExitModalLoop() {
- DCHECK(pageLoadDeferrerStack().size());
- pageLoadDeferrerStack().pop_back();
+ DCHECK(pageSuspenderStack().size());
+ pageSuspenderStack().pop_back();
}
void WebViewImpl::setMainFrame(WebFrame* frame) {
« no previous file with comments | « third_party/WebKit/Source/web/ChromeClientImpl.cpp ('k') | third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698