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

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, 4 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 #include "core/html/canvas/CanvasRenderingContext.h" 143 #include "core/html/canvas/CanvasRenderingContext.h"
144 #include "core/html/canvas/CanvasRenderingContext2D.h" 144 #include "core/html/canvas/CanvasRenderingContext2D.h"
145 #include "core/html/canvas/WebGLRenderingContext.h" 145 #include "core/html/canvas/WebGLRenderingContext.h"
146 #include "core/html/forms/FormController.h" 146 #include "core/html/forms/FormController.h"
147 #include "core/html/imports/HTMLImportLoader.h" 147 #include "core/html/imports/HTMLImportLoader.h"
148 #include "core/html/imports/HTMLImportsController.h" 148 #include "core/html/imports/HTMLImportsController.h"
149 #include "core/html/parser/HTMLDocumentParser.h" 149 #include "core/html/parser/HTMLDocumentParser.h"
150 #include "core/html/parser/HTMLParserIdioms.h" 150 #include "core/html/parser/HTMLParserIdioms.h"
151 #include "core/html/parser/NestingLevelIncrementer.h" 151 #include "core/html/parser/NestingLevelIncrementer.h"
152 #include "core/html/parser/TextResourceDecoder.h" 152 #include "core/html/parser/TextResourceDecoder.h"
153 #include "core/inspector/ConsoleMessage.h"
153 #include "core/inspector/InspectorCounters.h" 154 #include "core/inspector/InspectorCounters.h"
154 #include "core/inspector/InspectorInstrumentation.h" 155 #include "core/inspector/InspectorInstrumentation.h"
155 #include "core/inspector/InspectorTraceEvents.h" 156 #include "core/inspector/InspectorTraceEvents.h"
156 #include "core/inspector/ScriptCallStack.h" 157 #include "core/inspector/ScriptCallStack.h"
157 #include "core/loader/CookieJar.h" 158 #include "core/loader/CookieJar.h"
158 #include "core/loader/DocumentLoader.h" 159 #include "core/loader/DocumentLoader.h"
159 #include "core/loader/FrameLoader.h" 160 #include "core/loader/FrameLoader.h"
160 #include "core/loader/FrameLoaderClient.h" 161 #include "core/loader/FrameLoaderClient.h"
161 #include "core/loader/ImageLoader.h" 162 #include "core/loader/ImageLoader.h"
162 #include "core/loader/appcache/ApplicationCacheHost.h" 163 #include "core/loader/appcache/ApplicationCacheHost.h"
(...skipping 4851 matching lines...) Expand 10 before | Expand all | Expand 10 after
5014 5015
5015 String messageURL = sourceURL; 5016 String messageURL = sourceURL;
5016 if (!scriptState && sourceURL.isNull() && !lineNumber) { 5017 if (!scriptState && sourceURL.isNull() && !lineNumber) {
5017 messageURL = url().string(); 5018 messageURL = url().string();
5018 if (parsing() && !isInDocumentWrite() && scriptableDocumentParser()) { 5019 if (parsing() && !isInDocumentWrite() && scriptableDocumentParser()) {
5019 ScriptableDocumentParser* parser = scriptableDocumentParser(); 5020 ScriptableDocumentParser* parser = scriptableDocumentParser();
5020 if (!parser->isWaitingForScripts() && !parser->isExecutingScript()) 5021 if (!parser->isWaitingForScripts() && !parser->isExecutingScript())
5021 lineNumber = parser->lineNumber().oneBasedInt(); 5022 lineNumber = parser->lineNumber().oneBasedInt();
5022 } 5023 }
5023 } 5024 }
5024 m_frame->console().addMessage(source, level, message, messageURL, lineNumber , 0, callStack, scriptState, 0); 5025 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(source, level , message, messageURL, lineNumber);
5026 consoleMessage->setCallStack(callStack);
5027 consoleMessage->setScriptState(scriptState);
5028 m_frame->console().addMessage(consoleMessage.release());
5025 } 5029 }
5026 5030
5027 void Document::addConsoleMessageWithRequestIdentifier(MessageSource source, Mess ageLevel level, const String& message, unsigned long requestIdentifier) 5031 void Document::addConsoleMessageWithRequestIdentifier(MessageSource source, Mess ageLevel level, const String& message, unsigned long requestIdentifier)
5028 { 5032 {
5029 if (!isContextThread()) { 5033 if (!isContextThread()) {
5030 m_taskRunner->postTask(AddConsoleMessageTask::create(source, level, mess age)); 5034 m_taskRunner->postTask(AddConsoleMessageTask::create(source, level, mess age));
5031 return; 5035 return;
5032 } 5036 }
5033 5037
5034 if (m_frame) 5038 if (m_frame) {
5035 m_frame->console().addMessage(source, level, message, String(), 0, 0, nu llptr, 0, requestIdentifier); 5039 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(source, l evel, message);
5040 consoleMessage->setRequestIdentifier(requestIdentifier);
5041 m_frame->console().addMessage(consoleMessage.release());
5042 }
5036 } 5043 }
5037 5044
5038 // FIXME(crbug.com/305497): This should be removed after ExecutionContext-LocalD OMWindow migration. 5045 // FIXME(crbug.com/305497): This should be removed after ExecutionContext-LocalD OMWindow migration.
5039 void Document::postTask(PassOwnPtr<ExecutionContextTask> task) 5046 void Document::postTask(PassOwnPtr<ExecutionContextTask> task)
5040 { 5047 {
5041 m_taskRunner->postTask(task); 5048 m_taskRunner->postTask(task);
5042 } 5049 }
5043 5050
5044 void Document::postInspectorTask(PassOwnPtr<ExecutionContextTask> task) 5051 void Document::postInspectorTask(PassOwnPtr<ExecutionContextTask> task)
5045 { 5052 {
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
5892 using namespace blink; 5899 using namespace blink;
5893 void showLiveDocumentInstances() 5900 void showLiveDocumentInstances()
5894 { 5901 {
5895 WeakDocumentSet& set = liveDocumentSet(); 5902 WeakDocumentSet& set = liveDocumentSet();
5896 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5903 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5897 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) { 5904 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) {
5898 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data()); 5905 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data());
5899 } 5906 }
5900 } 5907 }
5901 #endif 5908 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698