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

Unified Diff: Source/bindings/core/v8/ScriptController.cpp

Issue 561813003: Prepare blink to unify definitions of load completion (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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
Index: Source/bindings/core/v8/ScriptController.cpp
diff --git a/Source/bindings/core/v8/ScriptController.cpp b/Source/bindings/core/v8/ScriptController.cpp
index d75986cbda40693c66b2441da8379aeaa18d12b3..a87d301991751f9a6fc1759568cdc0db3ff0f3da 100644
--- a/Source/bindings/core/v8/ScriptController.cpp
+++ b/Source/bindings/core/v8/ScriptController.cpp
@@ -66,6 +66,7 @@
#include "core/loader/DocumentLoader.h"
#include "core/loader/FrameLoader.h"
#include "core/loader/FrameLoaderClient.h"
+#include "core/loader/ProgressTracker.h"
#include "core/plugins/PluginView.h"
#include "platform/NotImplemented.h"
#include "platform/TraceEvent.h"
@@ -542,6 +543,9 @@ bool ScriptController::executeScriptIfJavaScriptURL(const KURL& url)
|| !m_frame->document()->contentSecurityPolicy()->allowJavaScriptURLs(m_frame->document()->url(), eventHandlerPosition().m_line))
return true;
+ if (m_frame->loader().stateMachine()->isDisplayingInitialEmptyDocument())
+ m_frame->loader().progress().progressStarted();
dcheng 2014/10/20 18:35:14 What's the significance to calling this now for JS
+
// We need to hold onto the LocalFrame here because executing script can
// destroy the frame.
RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get());

Powered by Google App Engine
This is Rietveld 408576698