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

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 1642283002: Deal with frame removal by content scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add more runScriptsAtDocumentElementAvailable + comments Created 4 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
Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 038cf60a8afc2b21412fab348d49efb7f0661d53..0cdca1c3c84e30ce55f07372e1a07eae4bf2c06a 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -83,6 +83,7 @@
#include "core/xml/parser/XMLDocumentParser.h"
#include "platform/Logging.h"
#include "platform/PluginScriptForbiddenScope.h"
+#include "platform/ScriptForbiddenScope.h"
#include "platform/UserGestureIndicator.h"
#include "platform/network/HTTPParsers.h"
#include "platform/network/ResourceRequest.h"
@@ -488,8 +489,13 @@ void FrameLoader::finishedParsing()
m_progressTracker->finishedParsing();
- if (client())
+ if (client()) {
+ ScriptForbiddenScope forbidScripts;
client()->dispatchDidFinishDocumentLoad(m_documentLoader ? m_documentLoader->isCommittedButEmpty() : true);
+ }
+
+ if (client())
+ client()->runScriptsAtDocumentReady();
checkCompleted();
@@ -1485,9 +1491,16 @@ bool FrameLoader::shouldTreatURLAsSrcdocDocument(const KURL& url) const
void FrameLoader::dispatchDocumentElementAvailable()
{
+ ScriptForbiddenScope forbidScripts;
client()->documentElementAvailable();
}
+void FrameLoader::runScriptsAtDocumentElementAvailable()
+{
+ client()->runScriptsAtDocumentElementAvailable();
+ // The frame might be detached at this point.
+}
+
void FrameLoader::dispatchDidClearDocumentOfWindowObject()
{
if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))

Powered by Google App Engine
This is Rietveld 408576698