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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 376213002: DevTools: Make FrameConsole methods accept ConsoleMessage objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@scriptFailedToParse
Patch Set: Created 6 years, 5 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 #include "core/html/canvas/CanvasRenderingContext.h" 142 #include "core/html/canvas/CanvasRenderingContext.h"
143 #include "core/html/canvas/CanvasRenderingContext2D.h" 143 #include "core/html/canvas/CanvasRenderingContext2D.h"
144 #include "core/html/canvas/WebGLRenderingContext.h" 144 #include "core/html/canvas/WebGLRenderingContext.h"
145 #include "core/html/forms/FormController.h" 145 #include "core/html/forms/FormController.h"
146 #include "core/html/imports/HTMLImportLoader.h" 146 #include "core/html/imports/HTMLImportLoader.h"
147 #include "core/html/imports/HTMLImportsController.h" 147 #include "core/html/imports/HTMLImportsController.h"
148 #include "core/html/parser/HTMLDocumentParser.h" 148 #include "core/html/parser/HTMLDocumentParser.h"
149 #include "core/html/parser/HTMLParserIdioms.h" 149 #include "core/html/parser/HTMLParserIdioms.h"
150 #include "core/html/parser/NestingLevelIncrementer.h" 150 #include "core/html/parser/NestingLevelIncrementer.h"
151 #include "core/html/parser/TextResourceDecoder.h" 151 #include "core/html/parser/TextResourceDecoder.h"
152 #include "core/inspector/ConsoleMessage.h"
152 #include "core/inspector/InspectorCounters.h" 153 #include "core/inspector/InspectorCounters.h"
153 #include "core/inspector/InspectorInstrumentation.h" 154 #include "core/inspector/InspectorInstrumentation.h"
154 #include "core/inspector/InspectorTraceEvents.h" 155 #include "core/inspector/InspectorTraceEvents.h"
155 #include "core/inspector/ScriptCallStack.h" 156 #include "core/inspector/ScriptCallStack.h"
156 #include "core/loader/CookieJar.h" 157 #include "core/loader/CookieJar.h"
157 #include "core/loader/DocumentLoader.h" 158 #include "core/loader/DocumentLoader.h"
158 #include "core/loader/FrameLoader.h" 159 #include "core/loader/FrameLoader.h"
159 #include "core/loader/FrameLoaderClient.h" 160 #include "core/loader/FrameLoaderClient.h"
160 #include "core/loader/ImageLoader.h" 161 #include "core/loader/ImageLoader.h"
161 #include "core/loader/appcache/ApplicationCacheHost.h" 162 #include "core/loader/appcache/ApplicationCacheHost.h"
(...skipping 4856 matching lines...) Expand 10 before | Expand all | Expand 10 after
5018 5019
5019 String messageURL = sourceURL; 5020 String messageURL = sourceURL;
5020 if (!scriptState && sourceURL.isNull() && !lineNumber) { 5021 if (!scriptState && sourceURL.isNull() && !lineNumber) {
5021 messageURL = url().string(); 5022 messageURL = url().string();
5022 if (parsing() && !isInDocumentWrite() && scriptableDocumentParser()) { 5023 if (parsing() && !isInDocumentWrite() && scriptableDocumentParser()) {
5023 ScriptableDocumentParser* parser = scriptableDocumentParser(); 5024 ScriptableDocumentParser* parser = scriptableDocumentParser();
5024 if (!parser->isWaitingForScripts() && !parser->isExecutingScript()) 5025 if (!parser->isWaitingForScripts() && !parser->isExecutingScript())
5025 lineNumber = parser->lineNumber().oneBasedInt(); 5026 lineNumber = parser->lineNumber().oneBasedInt();
5026 } 5027 }
5027 } 5028 }
5028 m_frame->console().addMessage(source, level, message, messageURL, lineNumber , 0, callStack, scriptState, 0); 5029 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(source, level , message, messageURL, lineNumber);
5030 consoleMessage->setCallStack(callStack);
5031 consoleMessage->setScriptState(scriptState);
5032 m_frame->console().addMessage(consoleMessage.release());
5029 } 5033 }
5030 5034
5031 void Document::addConsoleMessageWithRequestIdentifier(MessageSource source, Mess ageLevel level, const String& message, unsigned long requestIdentifier) 5035 void Document::addConsoleMessageWithRequestIdentifier(MessageSource source, Mess ageLevel level, const String& message, unsigned long requestIdentifier)
5032 { 5036 {
5033 if (!isContextThread()) { 5037 if (!isContextThread()) {
5034 m_taskRunner->postTask(AddConsoleMessageTask::create(source, level, mess age)); 5038 m_taskRunner->postTask(AddConsoleMessageTask::create(source, level, mess age));
5035 return; 5039 return;
5036 } 5040 }
5037 5041
5038 if (m_frame) 5042 if (m_frame) {
5039 m_frame->console().addMessage(source, level, message, String(), 0, 0, nu llptr, 0, requestIdentifier); 5043 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(source, l evel, message);
5044 consoleMessage->setRequestIdentifier(requestIdentifier);
5045 m_frame->console().addMessage(consoleMessage.release());
5046 }
5040 } 5047 }
5041 5048
5042 // FIXME(crbug.com/305497): This should be removed after ExecutionContext-LocalD OMWindow migration. 5049 // FIXME(crbug.com/305497): This should be removed after ExecutionContext-LocalD OMWindow migration.
5043 void Document::postTask(PassOwnPtr<ExecutionContextTask> task) 5050 void Document::postTask(PassOwnPtr<ExecutionContextTask> task)
5044 { 5051 {
5045 m_taskRunner->postTask(task); 5052 m_taskRunner->postTask(task);
5046 } 5053 }
5047 5054
5048 void Document::postInspectorTask(PassOwnPtr<ExecutionContextTask> task) 5055 void Document::postInspectorTask(PassOwnPtr<ExecutionContextTask> task)
5049 { 5056 {
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
5887 using namespace blink; 5894 using namespace blink;
5888 void showLiveDocumentInstances() 5895 void showLiveDocumentInstances()
5889 { 5896 {
5890 WeakDocumentSet& set = liveDocumentSet(); 5897 WeakDocumentSet& set = liveDocumentSet();
5891 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5898 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5892 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) { 5899 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) {
5893 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data()); 5900 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data());
5894 } 5901 }
5895 } 5902 }
5896 #endif 5903 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698