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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 172513002: Rename PageGroupLoadDeferrer to ScopedPageLoadDeferrer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/page/ScopedPageLoadDeferrer.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index b9d88cb69d97e41fd97432c0604109ea0ea9c4ce..8a734385035dfd489167ffc5b73efed755420f9c 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -111,9 +111,9 @@
#include "core/page/InjectedStyleSheets.h"
#include "core/page/Page.h"
#include "core/page/PageGroup.h"
-#include "core/page/PageGroupLoadDeferrer.h"
#include "core/page/PagePopupClient.h"
#include "core/page/PointerLockController.h"
+#include "core/page/ScopedPageLoadDeferrer.h"
#include "core/page/TouchDisambiguation.h"
#include "core/rendering/RenderLayerCompositor.h"
#include "core/rendering/RenderView.h"
@@ -202,9 +202,9 @@ 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<PageGroupLoadDeferrer*>& pageGroupLoadDeferrerStack()
+static Vector<ScopedPageLoadDeferrer*>& pageLoadDeferrerStack()
{
- DEFINE_STATIC_LOCAL(Vector<PageGroupLoadDeferrer*>, deferrerStack, ());
+ DEFINE_STATIC_LOCAL(Vector<ScopedPageLoadDeferrer*>, deferrerStack, ());
return deferrerStack;
}
@@ -268,21 +268,15 @@ void WebView::resetVisitedLinkState()
void WebView::willEnterModalLoop()
{
- PageGroup* pageGroup = PageGroup::sharedGroup();
- if (pageGroup->pages().isEmpty())
- pageGroupLoadDeferrerStack().append(static_cast<PageGroupLoadDeferrer*>(0));
- else {
- // Pick any page in the page group since we are deferring all pages.
- pageGroupLoadDeferrerStack().append(new PageGroupLoadDeferrer(*pageGroup->pages().begin(), true));
- }
+ pageLoadDeferrerStack().append(new ScopedPageLoadDeferrer());
}
void WebView::didExitModalLoop()
{
- ASSERT(pageGroupLoadDeferrerStack().size());
+ ASSERT(pageLoadDeferrerStack().size());
- delete pageGroupLoadDeferrerStack().last();
- pageGroupLoadDeferrerStack().removeLast();
+ delete pageLoadDeferrerStack().last();
+ pageLoadDeferrerStack().removeLast();
}
void WebViewImpl::setMainFrame(WebFrame* frame)
« no previous file with comments | « Source/core/page/ScopedPageLoadDeferrer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698