| OLD | NEW |
| 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 5191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5202 void Document::addConsoleMessage(ConsoleMessage* consoleMessage) | 5202 void Document::addConsoleMessage(ConsoleMessage* consoleMessage) |
| 5203 { | 5203 { |
| 5204 if (!isContextThread()) { | 5204 if (!isContextThread()) { |
| 5205 m_taskRunner->postTask(BLINK_FROM_HERE, AddConsoleMessageTask::create(co
nsoleMessage->source(), consoleMessage->level(), consoleMessage->message())); | 5205 m_taskRunner->postTask(BLINK_FROM_HERE, AddConsoleMessageTask::create(co
nsoleMessage->source(), consoleMessage->level(), consoleMessage->message())); |
| 5206 return; | 5206 return; |
| 5207 } | 5207 } |
| 5208 | 5208 |
| 5209 if (!m_frame) | 5209 if (!m_frame) |
| 5210 return; | 5210 return; |
| 5211 | 5211 |
| 5212 if (!consoleMessage->messageId() && !consoleMessage->relatedMessageId() && c
onsoleMessage->url().isNull() && !consoleMessage->lineNumber()) { | 5212 if (!consoleMessage->messageId() && !consoleMessage->relatedMessageId() && c
onsoleMessage->location()->isUnknown()) { |
| 5213 // TODO(dgozman): capture correct location at call places instead. |
| 5213 unsigned lineNumber = 0; | 5214 unsigned lineNumber = 0; |
| 5214 if (!isInDocumentWrite() && scriptableDocumentParser()) { | 5215 if (!isInDocumentWrite() && scriptableDocumentParser()) { |
| 5215 ScriptableDocumentParser* parser = scriptableDocumentParser(); | 5216 ScriptableDocumentParser* parser = scriptableDocumentParser(); |
| 5216 if (parser->isParsingAtLineNumber()) | 5217 if (parser->isParsingAtLineNumber()) |
| 5217 lineNumber = parser->lineNumber().oneBasedInt(); | 5218 lineNumber = parser->lineNumber().oneBasedInt(); |
| 5218 } | 5219 } |
| 5219 consoleMessage = ConsoleMessage::create(consoleMessage->source(), consol
eMessage->level(), consoleMessage->message(), url().getString(), lineNumber, 0,
consoleMessage->stackTrace() ? consoleMessage->stackTrace()->clone() : nullptr,
0, consoleMessage->scriptArguments()); | 5220 consoleMessage = ConsoleMessage::create(consoleMessage->source(), consol
eMessage->level(), consoleMessage->message(), SourceLocation::create(url().getSt
ring(), lineNumber, 0, nullptr), consoleMessage->scriptArguments()); |
| 5220 } | 5221 } |
| 5221 m_frame->console().addMessage(consoleMessage); | 5222 m_frame->console().addMessage(consoleMessage); |
| 5222 } | 5223 } |
| 5223 | 5224 |
| 5224 // FIXME(crbug.com/305497): This should be removed after ExecutionContext-LocalD
OMWindow migration. | 5225 // FIXME(crbug.com/305497): This should be removed after ExecutionContext-LocalD
OMWindow migration. |
| 5225 void Document::postTask(const WebTraceLocation& location, std::unique_ptr<Execut
ionContextTask> task) | 5226 void Document::postTask(const WebTraceLocation& location, std::unique_ptr<Execut
ionContextTask> task) |
| 5226 { | 5227 { |
| 5227 m_taskRunner->postTask(location, std::move(task)); | 5228 m_taskRunner->postTask(location, std::move(task)); |
| 5228 } | 5229 } |
| 5229 | 5230 |
| (...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6018 #ifndef NDEBUG | 6019 #ifndef NDEBUG |
| 6019 using namespace blink; | 6020 using namespace blink; |
| 6020 void showLiveDocumentInstances() | 6021 void showLiveDocumentInstances() |
| 6021 { | 6022 { |
| 6022 Document::WeakDocumentSet& set = Document::liveDocumentSet(); | 6023 Document::WeakDocumentSet& set = Document::liveDocumentSet(); |
| 6023 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); | 6024 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); |
| 6024 for (Document* document : set) | 6025 for (Document* document : set) |
| 6025 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get
String().utf8().data()); | 6026 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get
String().utf8().data()); |
| 6026 } | 6027 } |
| 6027 #endif | 6028 #endif |
| OLD | NEW |