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

Unified Diff: Source/core/dom/Document.cpp

Issue 559553002: Merge ExecutionContextClient and ExecutionContext (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@tmp1
Patch Set: fix win build Created 6 years, 3 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/core/dom/Document.cpp
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
index f4b33bdbf979b63655eae795cbfd430c283a84a7..1f47a0a4e709b15296254e0161cc5938afe14db6 100644
--- a/Source/core/dom/Document.cpp
+++ b/Source/core/dom/Document.cpp
@@ -511,8 +511,6 @@ Document::Document(const DocumentInit& initializer, DocumentClassFlags documentC
, m_hasViewportUnits(false)
, m_styleRecalcElementCounter(0)
{
- setClient(this);
-
if (m_frame) {
ASSERT(m_frame->page());
provideContextFeaturesToDocumentFrom(*this, *m_frame->page());
@@ -628,8 +626,6 @@ Document::~Document()
#endif
#endif
- setClient(0);
-
InspectorCounters::decrementCounter(InspectorCounters::DocumentCounter);
}
@@ -2806,7 +2802,7 @@ void Document::logExceptionToConsole(const String& errorMessage, int scriptId, c
RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber);
consoleMessage->setScriptId(scriptId);
consoleMessage->setCallStack(callStack);
- addMessage(consoleMessage.release());
+ addConsoleMessage(consoleMessage.release());
}
void Document::setURL(const KURL& url)
@@ -3140,7 +3136,7 @@ void Document::processHttpEquivXFrameOptions(const AtomicString& content)
frame->navigationScheduler().scheduleLocationChange(this, SecurityOrigin::urlWithUniqueSecurityOrigin(), Referrer());
RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, message);
consoleMessage->setRequestIdentifier(requestIdentifier);
- addMessage(consoleMessage.release());
+ addConsoleMessage(consoleMessage.release());
}
}
@@ -5023,7 +5019,7 @@ void Document::reportBlockedScriptExecutionToInspector(const String& directiveTe
InspectorInstrumentation::scriptExecutionBlockedByCSP(this, directiveText);
}
-void Document::addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> consoleMessage)
+void Document::addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> consoleMessage)
{
if (!isContextThread()) {
m_taskRunner->postTask(AddConsoleMessageTask::create(consoleMessage->source(), consoleMessage->level(), consoleMessage->message()));

Powered by Google App Engine
This is Rietveld 408576698