Changeset 149125 in webkit
- Timestamp:
- Apr 25, 2013 11:31:05 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 1 deleted
- 59 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r149120 r149125 1 2013-04-25 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: ConsoleMessage should include line and column number where possible 4 https://bugs.webkit.org/show_bug.cgi?id=114929 5 6 Update a test that was outputting the url and line number of console 7 method calls, to output the column number as well. Added a test that 8 verifies that console API messages have stack traces if appropriate. 9 10 Reviewed by Timothy Hatcher. 11 12 * inspector/console/console-url-and-line-expected.txt: Removed. 13 * inspector/console/console-url-line-column-expected.txt: Added. 14 * inspector/console/console-url-line-column.html: Renamed from LayoutTests/inspector/console/console-url-and-line.html. 15 * inspector/console/console-messages-stack-traces-expected.txt: Added. 16 * inspector/console/console-messages-stack-traces.html: Added. 17 1 18 2013-04-25 Lamarque V. Souza <Lamarque.Souza@basyskom.com> 2 19 -
trunk/LayoutTests/inspector/console/console-url-line-column.html
r149124 r149125 10 10 console.log("two"); 11 11 console.log("three"); 12 13 // Different types and different columns. 14 console.error("error"); console.log("log"); 15 console.info("info"); console.warn("warn"); 16 console.assert(false, "assert"); 12 17 } 13 18 … … 21 26 var lastSlashIndex = url.lastIndexOf("/"); 22 27 url = url.substring(lastSlashIndex + 1); 23 InspectorTest.addResult("Message at location: " + url + ":" + payload.line );24 if (payload.line === 1 0)28 InspectorTest.addResult("Message at location: " + url + ":" + payload.line + ":" + payload.column); 29 if (payload.line === 16) 25 30 InspectorTest.completeTest(); 26 31 } … … 34 39 <body onload="runTest()"> 35 40 <p> 36 Tests that console's url and line properties are defiend for console.log entries. Bug 72256.41 Tests that url, line, and column properties are defined for console functions. 37 42 </p> 38 43 -
trunk/Source/WebCore/ChangeLog
r149123 r149125 1 2013-04-25 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: ConsoleMessage should include line and column number where possible 4 https://bugs.webkit.org/show_bug.cgi?id=114929 5 6 - adds "m_column" to WebCore::ConsoleMessage 7 - adds "column" to Console.ConsoleMessage in the inspector protocol 8 - set the column number for console.* functions (Console.cpp) 9 - set the column number for XSLT errors (XSLTProcessor) 10 - plumb columnNumber everywhere else it is needed, set it to 0 and file 11 bugs for all cases missing columnNumber that could provide it. 12 13 Reviewed by Timothy Hatcher. 14 15 Test: inspector/console/console-url-line-column.html 16 inspector/console/console-messages-stack-traces.html 17 18 * inspector/ConsoleMessage.h: 19 * inspector/ConsoleMessage.cpp: 20 (WebCore::ConsoleMessage::ConsoleMessage): 21 (WebCore::ConsoleMessage::autogenerateMetadata): 22 (WebCore::ConsoleMessage::addToFrontend): 23 (WebCore::ConsoleMessage::isEqual): 24 Add m_column and set it where appropriate. 25 26 * inspector/Inspector.json: 27 Add column property to Console.ConsoleMessage. 28 29 * page/Console.cpp: 30 (WebCore::internalAddMessage): 31 (WebCore::Console::profile): 32 Set columnNumber like lineNumber from the last stack frame. 33 (WebCore::Console::groupEnd): 34 Line and column are unused in this message type, set both to 0. 35 36 * xml/XSLTProcessorLibxslt.cpp: 37 (WebCore::XSLTProcessor::parseErrorFunc): 38 * xml/XSLTProcessorQt.cpp: 39 (WebCore::XSLTMessageHandler::handleMessage): 40 Add real column numbers, the XSLT handlers already had it available. 41 42 * bindings/js/JSCustomXPathNSResolver.cpp: 43 (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI): 44 * css/CSSParser.cpp: 45 (WebCore::CSSParser::logError): 46 * dom/ScriptExecutionContext.h: 47 * dom/ScriptExecutionContext.cpp: 48 (WebCore::ScriptExecutionContext::addConsoleMessage): 49 * dom/Document.cpp: 50 (WebCore::Document::logExceptionToConsole): 51 (WebCore::Document::addMessage): 52 * dom/Document.h: 53 * inspector/InspectorConsoleAgent.cpp: 54 (WebCore::InspectorConsoleAgent::addMessageToConsole): 55 (WebCore::InspectorConsoleAgent::stopTiming): 56 (WebCore::InspectorConsoleAgent::didFinishXHRLoading): 57 (WebCore::InspectorConsoleAgent::didReceiveResponse): 58 (WebCore::InspectorConsoleAgent::didFailLoading): 59 * inspector/InspectorConsoleAgent.h: 60 * inspector/InspectorConsoleInstrumentation.h: 61 (WebCore::InspectorInstrumentation::addMessageToConsole): 62 (WebCore::InspectorInstrumentation::addStartProfilingMessageToConsole): 63 * inspector/InspectorInstrumentation.cpp: 64 (WebCore::InspectorInstrumentation::addMessageToConsoleImpl): 65 (WebCore::InspectorInstrumentation::addStartProfilingMessageToConsoleImpl): 66 (WebCore::InspectorInstrumentation::addProfileImpl): 67 * inspector/InspectorInstrumentation.h: 68 (InspectorInstrumentation): 69 * inspector/InspectorProfilerAgent.cpp: 70 (WebCore::InspectorProfilerAgent::addProfile): 71 (WebCore::InspectorProfilerAgent::addProfileFinishedMessageToConsole): 72 (WebCore::InspectorProfilerAgent::addStartProfilingMessageToConsole): 73 (WebCore::InspectorProfilerAgent::start): 74 (WebCore::InspectorProfilerAgent::stop): 75 * inspector/InspectorProfilerAgent.h: 76 (InspectorProfilerAgent): 77 * loader/EmptyClients.h: 78 (WebCore::EmptyChromeClient::addMessageToConsole): 79 * page/ChromeClient.h: 80 (WebCore::ChromeClient::addMessageToConsole): 81 * page/ContentSecurityPolicy.cpp: 82 (WebCore::ContentSecurityPolicy::logToConsole): 83 * page/PageConsole.cpp: 84 (WebCore::PageConsole::addMessage): 85 * page/PageConsole.h: 86 * workers/DefaultSharedWorkerRepository.cpp: 87 (SharedWorkerProxy): 88 (WebCore::postExceptionTask): 89 (WebCore::SharedWorkerProxy::postExceptionToWorkerObject): 90 (WebCore::postConsoleMessageTask): 91 (WebCore::SharedWorkerProxy::postConsoleMessageToWorkerObject): 92 * workers/SharedWorkerContext.cpp: 93 (WebCore::SharedWorkerContext::logExceptionToConsole): 94 * workers/WorkerContext.cpp: 95 (WebCore::WorkerContext::logExceptionToConsole): 96 (WebCore::WorkerContext::addConsoleMessage): 97 (WebCore::WorkerContext::addMessage): 98 (WebCore::WorkerContext::addMessageToWorkerConsole): 99 * workers/WorkerContext.h: 100 * workers/WorkerMessagingProxy.cpp: 101 (WebCore::WorkerExceptionTask::create): 102 (WebCore::WorkerExceptionTask::WorkerExceptionTask): 103 (WebCore::WorkerExceptionTask::performTask): 104 (WorkerExceptionTask): 105 (WebCore::WorkerMessagingProxy::postExceptionToWorkerObject): 106 (WebCore::postConsoleMessageTask): 107 (WebCore::WorkerMessagingProxy::postConsoleMessageToWorkerObject): 108 * workers/WorkerMessagingProxy.h: 109 (WorkerMessagingProxy): 110 * workers/WorkerReportingProxy.h: 111 (WorkerReportingProxy): 112 Plumb columnNumber through where appropriate. File bugs where missing. 113 1 114 2013-04-25 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 115 -
trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
r148696 r149125 79 79 callType = m_customResolver->methodTable()->getCallData(m_customResolver.get(), callData); 80 80 if (callType == CallTypeNone) { 81 // FIXME: Pass actual line number and source URL.81 // FIXME: <http://webkit.org/b/114312> JSCustomXPathNSResolver::lookupNamespaceURI Console Message should include Line, Column, and SourceURL 82 82 if (PageConsole* console = m_globalObject->impl()->pageConsole()) 83 83 console->addMessage(JSMessageSource, ErrorMessageLevel, "XPathNSResolver does not have a lookupNamespaceURI method."); -
trunk/Source/WebCore/css/CSSParser.cpp
r149106 r149125 11511 11511 void CSSParser::logError(const String& message, int lineNumber) 11512 11512 { 11513 // FIXME: <http://webkit.org/b/114313> CSS Parser ConsoleMessage errors should include column numbers 11513 11514 PageConsole* console = m_styleSheet->singleOwnerDocument()->page()->console(); 11514 console->addMessage(CSSMessageSource, WarningMessageLevel, message, m_styleSheet->baseURL().string(), lineNumber + 1 );11515 console->addMessage(CSSMessageSource, WarningMessageLevel, message, m_styleSheet->baseURL().string(), lineNumber + 1, 0); 11515 11516 } 11516 11517 -
trunk/Source/WebCore/dom/Document.cpp
r149101 r149125 2658 2658 void Document::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack> callStack) 2659 2659 { 2660 addMessage(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, callStack);2660 addMessage(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, 0, callStack); 2661 2661 } 2662 2662 … … 4844 4844 } 4845 4845 4846 void Document::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier)4846 void Document::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier) 4847 4847 { 4848 4848 if (!isContextThread()) { … … 4852 4852 4853 4853 if (Page* page = this->page()) 4854 page->console()->addMessage(source, level, message, sourceURL, lineNumber, c allStack, state, requestIdentifier);4854 page->console()->addMessage(source, level, message, sourceURL, lineNumber, columnNumber, callStack, state, requestIdentifier); 4855 4855 } 4856 4856 -
trunk/Source/WebCore/dom/Document.h
r148921 r149125 1249 1249 virtual KURL virtualCompleteURL(const String&) const; // Same as completeURL() for the same reason as above. 1250 1250 1251 virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0);1251 virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0); 1252 1252 1253 1253 virtual double minimumTimerInterval() const; -
trunk/Source/WebCore/dom/ScriptExecutionContext.cpp
r148921 r149125 303 303 } 304 304 305 void ScriptExecutionContext::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, ScriptState* state, unsigned long requestIdentifier)306 { 307 addMessage(source, level, message, sourceURL, lineNumber, 0, state, requestIdentifier);305 void ScriptExecutionContext::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, ScriptState* state, unsigned long requestIdentifier) 306 { 307 addMessage(source, level, message, sourceURL, lineNumber, columnNumber, 0, state, requestIdentifier); 308 308 } 309 309 -
trunk/Source/WebCore/dom/ScriptExecutionContext.h
r148921 r149125 77 77 78 78 bool sanitizeScriptError(String& errorMessage, int& lineNumber, String& sourceURL, CachedScript* = 0); 79 // FIXME: <http://webkit.org/b/114315> ScriptExecutionContext log exception should include a column number 79 80 void reportException(const String& errorMessage, int lineNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>, CachedScript* = 0); 80 81 81 void addConsoleMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, ScriptState* = 0, unsigned long requestIdentifier = 0);82 void addConsoleMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, ScriptState* = 0, unsigned long requestIdentifier = 0); 82 83 virtual void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) = 0; 83 84 … … 183 184 virtual KURL virtualCompleteURL(const String&) const = 0; 184 185 185 virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0) = 0;186 virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0) = 0; 186 187 virtual EventTarget* errorEventTarget() = 0; 188 // FIXME: <http://webkit.org/b/114315> ScriptExecutionContext log exception should include a column number 187 189 virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack>) = 0; 188 190 bool dispatchErrorEvent(const String& errorMessage, int lineNumber, const String& sourceURL, CachedScript*); -
trunk/Source/WebCore/inspector/ConsoleMessage.cpp
r144949 r149125 57 57 , m_url() 58 58 , m_line(0) 59 , m_column(0) 59 60 , m_repeatCount(1) 60 61 , m_requestId(IdentifiersFactory::requestId(requestIdentifier)) … … 63 64 } 64 65 65 ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& url, unsigned line, ScriptState* state, unsigned long requestIdentifier)66 ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& url, unsigned line, unsigned column, ScriptState* state, unsigned long requestIdentifier) 66 67 : m_source(source) 67 68 , m_type(type) … … 70 71 , m_url(url) 71 72 , m_line(line) 73 , m_column(column) 72 74 , m_repeatCount(1) 73 75 , m_requestId(IdentifiersFactory::requestId(requestIdentifier)) … … 83 85 , m_arguments(0) 84 86 , m_line(0) 87 , m_column(0) 85 88 , m_repeatCount(1) 86 89 , m_requestId(IdentifiersFactory::requestId(requestIdentifier)) … … 90 93 m_url = frame.sourceURL(); 91 94 m_line = frame.lineNumber(); 95 m_column = frame.columnNumber(); 92 96 } 93 97 m_callStack = callStack; … … 102 106 , m_url() 103 107 , m_line(0) 108 , m_column(0) 104 109 , m_repeatCount(1) 105 110 , m_requestId(IdentifiersFactory::requestId(requestIdentifier)) … … 128 133 m_url = frame.sourceURL(); 129 134 m_line = frame.lineNumber(); 135 m_column = frame.columnNumber(); 130 136 return; 131 137 } … … 192 198 jsonObj->setType(messageTypeValue(m_type)); 193 199 jsonObj->setLine(static_cast<int>(m_line)); 200 jsonObj->setColumn(static_cast<int>(m_column)); 194 201 jsonObj->setUrl(m_url); 195 202 jsonObj->setRepeatCount(static_cast<int>(m_repeatCount)); … … 256 263 && msg->m_message == m_message 257 264 && msg->m_line == m_line 265 && msg->m_column == m_column 258 266 && msg->m_url == m_url 259 267 && msg->m_requestId == m_requestId; -
trunk/Source/WebCore/inspector/ConsoleMessage.h
r137318 r149125 54 54 public: 55 55 ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, unsigned long requestIdentifier = 0); 56 ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, const String& url, unsigned line, ScriptState* = 0, unsigned long requestIdentifier = 0);56 ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, const String& url, unsigned line, unsigned column, ScriptState* = 0, unsigned long requestIdentifier = 0); 57 57 ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0); 58 58 ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, ScriptState*, unsigned long requestIdentifier = 0); … … 83 83 String m_url; 84 84 unsigned m_line; 85 unsigned m_column; 85 86 unsigned m_repeatCount; 86 87 String m_requestId; -
trunk/Source/WebCore/inspector/Inspector.json
r148921 r149125 767 767 { "name": "url", "type": "string", "optional": true, "description": "URL of the message origin." }, 768 768 { "name": "line", "type": "integer", "optional": true, "description": "Line number in the resource that generated this message." }, 769 { "name": "column", "type": "integer", "optional": true, "description": "Column number on the line in the resource that generated this message." }, 769 770 { "name": "repeatCount", "type": "integer", "optional": true, "description": "Repeat count for repeated messages." }, 770 771 { "name": "parameters", "type": "array", "items": { "$ref": "Runtime.RemoteObject" }, "optional": true, "description": "Message parameters in case of the formatted message." }, -
trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp
r146781 r149125 179 179 } 180 180 181 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, ScriptState* state, unsigned long requestIdentifier)181 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* state, unsigned long requestIdentifier) 182 182 { 183 183 if (!developerExtrasEnabled()) … … 194 194 195 195 bool canGenerateCallStack = !isWorkerAgent() && m_frontend; 196 addConsoleMessage(adoptPtr(new ConsoleMessage(canGenerateCallStack, source, type, level, message, scriptId, lineNumber, state, requestIdentifier)));196 addConsoleMessage(adoptPtr(new ConsoleMessage(canGenerateCallStack, source, type, level, message, scriptId, lineNumber, columnNumber, state, requestIdentifier))); 197 197 } 198 198 … … 231 231 double elapsed = monotonicallyIncreasingTime() - startTime; 232 232 String message = title + String::format(": %.3fms", elapsed * 1000); 233 const ScriptCallFrame& lastCaller = callStack->at(0); 234 addMessageToConsole(ConsoleAPIMessageSource, TimingMessageType, DebugMessageLevel, message, lastCaller.sourceURL(), lastCaller.lineNumber()); 233 addMessageToConsole(ConsoleAPIMessageSource, TimingMessageType, DebugMessageLevel, message, callStack); 235 234 } 236 235 … … 274 273 if (m_frontend && m_state->getBoolean(ConsoleAgentState::monitoringXHR)) { 275 274 String message = "XHR finished loading: \"" + url + "\"."; 276 addMessageToConsole(NetworkMessageSource, LogMessageType, DebugMessageLevel, message, sendURL, sendLineNumber, 0, requestIdentifier); 277 } 278 279 275 // FIXME: <http://webkit.org/b/114316> InspectorConsoleAgent::didFinishXHRLoading ConsoleMessage should include a column number 276 addMessageToConsole(NetworkMessageSource, LogMessageType, DebugMessageLevel, message, sendURL, sendLineNumber, 0, 0, requestIdentifier); 277 } 280 278 } 281 279 … … 287 285 if (response.httpStatusCode() >= 400) { 288 286 String message = "Failed to load resource: the server responded with a status of " + String::number(response.httpStatusCode()) + " (" + response.httpStatusText() + ')'; 289 addMessageToConsole(NetworkMessageSource, LogMessageType, ErrorMessageLevel, message, response.url().string(), 0, 0, requestIdentifier);287 addMessageToConsole(NetworkMessageSource, LogMessageType, ErrorMessageLevel, message, response.url().string(), 0, 0, 0, requestIdentifier); 290 288 } 291 289 } … … 303 301 message.append(error.localizedDescription()); 304 302 } 305 addMessageToConsole(NetworkMessageSource, LogMessageType, ErrorMessageLevel, message.toString(), error.failingURL(), 0, 0, requestIdentifier);303 addMessageToConsole(NetworkMessageSource, LogMessageType, ErrorMessageLevel, message.toString(), error.failingURL(), 0, 0, 0, requestIdentifier); 306 304 } 307 305 -
trunk/Source/WebCore/inspector/InspectorConsoleAgent.h
r138457 r149125 72 72 73 73 void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, ScriptState*, PassRefPtr<ScriptArguments>, unsigned long requestIdentifier = 0); 74 void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, const String& scriptId, unsigned lineNumber, ScriptState* = 0, unsigned long requestIdentifier = 0);74 void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* = 0, unsigned long requestIdentifier = 0); 75 75 76 76 // FIXME: Remove once we no longer generate stacks outside of Inspector. … … 89 89 void didFailLoading(unsigned long requestIdentifier, const ResourceError&); 90 90 #if ENABLE(JAVASCRIPT_DEBUGGER) 91 void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, const String& sourceURL);92 void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, const String& sourceURL);91 void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, unsigned columnNumber, const String& sourceURL); 92 void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL); 93 93 #endif 94 94 virtual void setMonitoringXHREnabled(ErrorString*, bool enabled); -
trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h
r137534 r149125 74 74 } 75 75 76 inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, ScriptState* state, unsigned long requestIdentifier)77 { 78 #if ENABLE(INSPECTOR) 79 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page)) 80 addMessageToConsoleImpl(instrumentingAgents, source, type, level, message, scriptId, lineNumber, state, requestIdentifier);76 inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* state, unsigned long requestIdentifier) 77 { 78 #if ENABLE(INSPECTOR) 79 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page)) 80 addMessageToConsoleImpl(instrumentingAgents, source, type, level, message, scriptId, lineNumber, columnNumber, state, requestIdentifier); 81 81 #else 82 82 UNUSED_PARAM(page); … … 109 109 } 110 110 111 inline void InspectorInstrumentation::addMessageToConsole(WorkerContext* workerContext, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, ScriptState* state, unsigned long requestIdentifier)111 inline void InspectorInstrumentation::addMessageToConsole(WorkerContext* workerContext, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* state, unsigned long requestIdentifier) 112 112 { 113 113 #if ENABLE(INSPECTOR) 114 114 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForWorkerContext(workerContext)) 115 addMessageToConsoleImpl(instrumentingAgents, source, type, level, message, scriptId, lineNumber, state, requestIdentifier);115 addMessageToConsoleImpl(instrumentingAgents, source, type, level, message, scriptId, lineNumber, columnNumber, state, requestIdentifier); 116 116 #else 117 117 UNUSED_PARAM(workerContext); … … 122 122 UNUSED_PARAM(scriptId); 123 123 UNUSED_PARAM(lineNumber); 124 UNUSED_PARAM(columnNumber); 124 125 UNUSED_PARAM(state); 125 126 UNUSED_PARAM(requestIdentifier); … … 176 177 177 178 #if ENABLE(JAVASCRIPT_DEBUGGER) 178 inline void InspectorInstrumentation::addStartProfilingMessageToConsole(Page* page, const String& title, unsigned lineNumber, const String& sourceURL)179 { 180 #if ENABLE(INSPECTOR) 181 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page)) 182 addStartProfilingMessageToConsoleImpl(instrumentingAgents, title, lineNumber, sourceURL);179 inline void InspectorInstrumentation::addStartProfilingMessageToConsole(Page* page, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL) 180 { 181 #if ENABLE(INSPECTOR) 182 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page)) 183 addStartProfilingMessageToConsoleImpl(instrumentingAgents, title, lineNumber, columnNumber, sourceURL); 183 184 #else 184 185 UNUSED_PARAM(page); 185 186 UNUSED_PARAM(title); 186 187 UNUSED_PARAM(lineNumber); 188 UNUSED_PARAM(columnNumber); 187 189 UNUSED_PARAM(sourceURL); 188 190 #endif -
trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp
r148373 r149125 1031 1031 } 1032 1032 1033 void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, ScriptState* state, unsigned long requestIdentifier)1033 void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* state, unsigned long requestIdentifier) 1034 1034 { 1035 1035 if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent()) 1036 consoleAgent->addMessageToConsole(source, type, level, message, scriptId, lineNumber, state, requestIdentifier);1036 consoleAgent->addMessageToConsole(source, type, level, message, scriptId, lineNumber, columnNumber, state, requestIdentifier); 1037 1037 } 1038 1038 … … 1069 1069 1070 1070 #if ENABLE(JAVASCRIPT_DEBUGGER) 1071 void InspectorInstrumentation::addStartProfilingMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, const String& title, unsigned lineNumber, const String& sourceURL)1071 void InspectorInstrumentation::addStartProfilingMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL) 1072 1072 { 1073 1073 if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent()) 1074 profilerAgent->addStartProfilingMessageToConsole(title, lineNumber, sourceURL);1074 profilerAgent->addStartProfilingMessageToConsole(title, lineNumber, columnNumber, sourceURL); 1075 1075 } 1076 1076 … … 1079 1079 if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent()) { 1080 1080 const ScriptCallFrame& lastCaller = callStack->at(0); 1081 profilerAgent->addProfile(profile, lastCaller.lineNumber(), lastCaller. sourceURL());1081 profilerAgent->addProfile(profile, lastCaller.lineNumber(), lastCaller.columnNumber(), lastCaller.sourceURL()); 1082 1082 } 1083 1083 } -
trunk/Source/WebCore/inspector/InspectorInstrumentation.h
r148133 r149125 234 234 static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0); 235 235 static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, ScriptState*, PassRefPtr<ScriptArguments>, unsigned long requestIdentifier = 0); 236 static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, const String& , unsigned lineNumber, ScriptState* = 0, unsigned long requestIdentifier = 0);236 static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* = 0, unsigned long requestIdentifier = 0); 237 237 #if ENABLE(WORKERS) 238 238 // FIXME: Convert to ScriptArguments to match non-worker context. 239 239 static void addMessageToConsole(WorkerContext*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0); 240 static void addMessageToConsole(WorkerContext*, MessageSource, MessageType, MessageLevel, const String& message, const String& , unsigned lineNumber, ScriptState* = 0, unsigned long requestIdentifier = 0);240 static void addMessageToConsole(WorkerContext*, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* = 0, unsigned long requestIdentifier = 0); 241 241 #endif 242 242 static void consoleCount(Page*, ScriptState*, PassRefPtr<ScriptArguments>); … … 251 251 252 252 #if ENABLE(JAVASCRIPT_DEBUGGER) 253 static void addStartProfilingMessageToConsole(Page*, const String& title, unsigned lineNumber, const String& sourceURL);253 static void addStartProfilingMessageToConsole(Page*, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL); 254 254 static void addProfile(Page*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>); 255 255 static String getCurrentUserInitiatedProfileName(Page*, bool incrementProfileNumber); … … 435 435 436 436 static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, ScriptState*, PassRefPtr<ScriptArguments>, unsigned long requestIdentifier); 437 static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptId, unsigned lineNumber, ScriptState*, unsigned long requestIdentifier);437 static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState*, unsigned long requestIdentifier); 438 438 439 439 // FIXME: Remove once we no longer generate stacks outside of Inspector. … … 451 451 452 452 #if ENABLE(JAVASCRIPT_DEBUGGER) 453 static void addStartProfilingMessageToConsoleImpl(InstrumentingAgents*, const String& title, unsigned lineNumber, const String& sourceURL);453 static void addStartProfilingMessageToConsoleImpl(InstrumentingAgents*, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL); 454 454 static void addProfileImpl(InstrumentingAgents*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>); 455 455 static String getCurrentUserInitiatedProfileNameImpl(InstrumentingAgents*, bool incrementProfileNumber); -
trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp
r148921 r149125 149 149 } 150 150 151 void InspectorProfilerAgent::addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, const String& sourceURL)151 void InspectorProfilerAgent::addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, unsigned columnNumber, const String& sourceURL) 152 152 { 153 153 RefPtr<ScriptProfile> profile = prpProfile; … … 155 155 if (m_frontend && m_state->getBoolean(ProfilerAgentState::profileHeadersRequested)) 156 156 m_frontend->addProfileHeader(createProfileHeader(*profile)); 157 addProfileFinishedMessageToConsole(profile, lineNumber, sourceURL);158 } 159 160 void InspectorProfilerAgent::addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, const String& sourceURL)157 addProfileFinishedMessageToConsole(profile, lineNumber, columnNumber, sourceURL); 158 } 159 160 void InspectorProfilerAgent::addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, unsigned columnNumber, const String& sourceURL) 161 161 { 162 162 if (!m_frontend) … … 164 164 RefPtr<ScriptProfile> profile = prpProfile; 165 165 String message = makeString(profile->title(), '#', String::number(profile->uid())); 166 m_consoleAgent->addMessageToConsole(ConsoleAPIMessageSource, ProfileEndMessageType, DebugMessageLevel, message, sourceURL, lineNumber );167 } 168 169 void InspectorProfilerAgent::addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, const String& sourceURL)166 m_consoleAgent->addMessageToConsole(ConsoleAPIMessageSource, ProfileEndMessageType, DebugMessageLevel, message, sourceURL, lineNumber, columnNumber); 167 } 168 169 void InspectorProfilerAgent::addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL) 170 170 { 171 171 if (!m_frontend) 172 172 return; 173 m_consoleAgent->addMessageToConsole(ConsoleAPIMessageSource, ProfileMessageType, DebugMessageLevel, title, sourceURL, lineNumber );173 m_consoleAgent->addMessageToConsole(ConsoleAPIMessageSource, ProfileMessageType, DebugMessageLevel, title, sourceURL, lineNumber, columnNumber); 174 174 } 175 175 … … 384 384 String title = getCurrentUserInitiatedProfileName(true); 385 385 startProfiling(title); 386 addStartProfilingMessageToConsole(title, 0, String());386 addStartProfilingMessageToConsole(title, 0, 0, String()); 387 387 toggleRecordButton(true); 388 388 m_state->setBoolean(ProfilerAgentState::userInitiatedProfiling, true); … … 397 397 RefPtr<ScriptProfile> profile = stopProfiling(title); 398 398 if (profile) 399 addProfile(profile, 0, String());399 addProfile(profile, 0, 0, String()); 400 400 toggleRecordButton(false); 401 401 m_state->setBoolean(ProfilerAgentState::userInitiatedProfiling, false); -
trunk/Source/WebCore/inspector/InspectorProfilerAgent.h
r148921 r149125 66 66 virtual ~InspectorProfilerAgent(); 67 67 68 void addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, const String& sourceURL);69 void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, const String& sourceURL);70 void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, const String& sourceURL);68 void addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, unsigned columnNumber, const String& sourceURL); 69 void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, unsigned columnNumber, const String& sourceURL); 70 void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL); 71 71 virtual void collectGarbage(ErrorString*); 72 72 virtual void clearProfiles(ErrorString*) { resetState(); } -
trunk/Source/WebCore/loader/EmptyClients.h
r148731 r149125 102 102 virtual void setResizable(bool) { } 103 103 104 virtual void addMessageToConsole(MessageSource, MessageLevel, const String&, unsigned, const String&) { }104 virtual void addMessageToConsole(MessageSource, MessageLevel, const String&, unsigned, unsigned, const String&) { } 105 105 106 106 virtual bool canRunBeforeUnloadConfirmPanel() { return false; } -
trunk/Source/WebCore/page/ChromeClient.h
r149123 r149125 130 130 virtual void setResizable(bool) = 0; 131 131 132 virtual void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID) = 0;132 virtual void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) = 0; 133 133 // FIXME: Remove this MessageType variant once all the clients are updated. 134 virtual void addMessageToConsole(MessageSource source, MessageType, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID)134 virtual void addMessageToConsole(MessageSource source, MessageType, MessageLevel level, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) 135 135 { 136 addMessageToConsole(source, level, message, lineNumber, sourceID);136 addMessageToConsole(source, level, message, lineNumber, columnNumber, sourceID); 137 137 } 138 138 -
trunk/Source/WebCore/page/Console.cpp
r147749 r149125 90 90 91 91 if (gotMessage) 92 page->chrome()->client()->addMessageToConsole(ConsoleAPIMessageSource, type, level, message, lastCaller.lineNumber(), lastCaller. sourceURL());92 page->chrome()->client()->addMessageToConsole(ConsoleAPIMessageSource, type, level, message, lastCaller.lineNumber(), lastCaller.columnNumber(), lastCaller.sourceURL()); 93 93 94 94 if (!page->settings()->logsPageMessagesToSystemConsoleEnabled() && !PageConsole::shouldPrintExceptions()) … … 202 202 RefPtr<ScriptCallStack> callStack(createScriptCallStack(state, 1)); 203 203 const ScriptCallFrame& lastCaller = callStack->at(0); 204 InspectorInstrumentation::addStartProfilingMessageToConsole(page, resolvedTitle, lastCaller.lineNumber(), lastCaller. sourceURL());204 InspectorInstrumentation::addStartProfilingMessageToConsole(page, resolvedTitle, lastCaller.lineNumber(), lastCaller.columnNumber(), lastCaller.sourceURL()); 205 205 } 206 206 … … 253 253 void Console::groupEnd() 254 254 { 255 InspectorInstrumentation::addMessageToConsole(page(), ConsoleAPIMessageSource, EndGroupMessageType, LogMessageLevel, String(), String(), 0 );255 InspectorInstrumentation::addMessageToConsole(page(), ConsoleAPIMessageSource, EndGroupMessageType, LogMessageLevel, String(), String(), 0, 0); 256 256 } 257 257 -
trunk/Source/WebCore/page/ContentSecurityPolicy.cpp
r147346 r149125 1894 1894 void ContentSecurityPolicy::logToConsole(const String& message, const String& contextURL, const WTF::OrdinalNumber& contextLine, ScriptState* state) const 1895 1895 { 1896 m_scriptExecutionContext->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message, contextURL, contextLine.oneBasedInt(), state); 1896 // FIXME: <http://webkit.org/b/114317> ContentSecurityPolicy::logToConsole should include a column number 1897 m_scriptExecutionContext->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message, contextURL, contextLine.oneBasedInt(), 0, state); 1897 1898 } 1898 1899 -
trunk/Source/WebCore/page/PageConsole.cpp
r147749 r149125 138 138 if (document) 139 139 url = document->url().string(); 140 // FIXME: <http://webkit.org/b/114319> PageConsole::addMessage should automatically determine column number alongside line number 140 141 unsigned line = 0; 141 142 if (document && document->parsing() && !document->isInDocumentWrite() && document->scriptableDocumentParser()) { … … 144 145 line = parser->lineNumber().oneBasedInt(); 145 146 } 146 addMessage(source, level, message, url, line, 0, 0, requestIdentifier);147 addMessage(source, level, message, url, line, 0, 0, 0, requestIdentifier); 147 148 } 148 149 149 150 void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack) 150 151 { 151 addMessage(source, level, message, String(), 0, callStack, 0);152 } 153 154 void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message, const String& url, unsigned lineNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier)152 addMessage(source, level, message, String(), 0, 0, callStack, 0); 153 } 154 155 void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier) 155 156 { 156 157 if (muteCount && source != ConsoleAPIMessageSource) … … 164 165 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageType, level, message, callStack, requestIdentifier); 165 166 else 166 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageType, level, message, url, lineNumber, state, requestIdentifier);167 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageType, level, message, url, lineNumber, columnNumber, state, requestIdentifier); 167 168 168 169 if (source == CSSMessageSource) … … 172 173 return; 173 174 174 page->chrome()->client()->addMessageToConsole(source, level, message, lineNumber, url);175 page->chrome()->client()->addMessageToConsole(source, level, message, lineNumber, columnNumber, url); 175 176 176 177 if (!page->settings()->logsPageMessagesToSystemConsoleEnabled() && !shouldPrintExceptions()) -
trunk/Source/WebCore/page/PageConsole.h
r146208 r149125 49 49 static void printMessageSourceAndLevelPrefix(MessageSource, MessageLevel); 50 50 51 void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack> = 0, ScriptState* = 0, unsigned long requestIdentifier = 0);51 void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> = 0, ScriptState* = 0, unsigned long requestIdentifier = 0); 52 52 void addMessage(MessageSource, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>); 53 53 void addMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0, Document* = 0); -
trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp
r145466 r149125 82 82 83 83 // WorkerReportingProxy 84 virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, const String& sourceURL);85 virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, const String& sourceURL);84 virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL); 85 virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL); 86 86 #if ENABLE(INSPECTOR) 87 87 virtual void postMessageToPageInspector(const String&); … … 177 177 } 178 178 179 static void postExceptionTask(ScriptExecutionContext* context, const String& errorMessage, int lineNumber, const String& sourceURL) 180 { 179 static void postExceptionTask(ScriptExecutionContext* context, const String& errorMessage, int lineNumber, int /*columnNumber*/, const String& sourceURL) 180 { 181 // FIXME: <http://webkit.org/b/114315> ScriptExecutionContext log exception should include a column number 181 182 context->reportException(errorMessage, lineNumber, sourceURL, 0); 182 183 } 183 184 184 void SharedWorkerProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, const String& sourceURL)185 void SharedWorkerProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) 185 186 { 186 187 MutexLocker lock(m_workerDocumentsLock); 187 188 for (HashSet<Document*>::iterator iter = m_workerDocuments.begin(); iter != m_workerDocuments.end(); ++iter) 188 (*iter)->postTask(createCallbackTask(&postExceptionTask, errorMessage, lineNumber, sourceURL));189 } 190 191 static void postConsoleMessageTask(ScriptExecutionContext* document, MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber )192 { 193 document->addConsoleMessage(source, level, message, sourceURL, lineNumber );194 } 195 196 void SharedWorkerProxy::postConsoleMessageToWorkerObject(MessageSource source, MessageLevel level, const String& message, int lineNumber, const String& sourceURL)189 (*iter)->postTask(createCallbackTask(&postExceptionTask, errorMessage, lineNumber, columnNumber, sourceURL)); 190 } 191 192 static void postConsoleMessageTask(ScriptExecutionContext* document, MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber) 193 { 194 document->addConsoleMessage(source, level, message, sourceURL, lineNumber, columnNumber); 195 } 196 197 void SharedWorkerProxy::postConsoleMessageToWorkerObject(MessageSource source, MessageLevel level, const String& message, int lineNumber, int columnNumber, const String& sourceURL) 197 198 { 198 199 MutexLocker lock(m_workerDocumentsLock); 199 200 for (HashSet<Document*>::iterator iter = m_workerDocuments.begin(); iter != m_workerDocuments.end(); ++iter) 200 (*iter)->postTask(createCallbackTask(&postConsoleMessageTask, source, level, message, sourceURL, lineNumber ));201 (*iter)->postTask(createCallbackTask(&postConsoleMessageTask, source, level, message, sourceURL, lineNumber, columnNumber)); 201 202 } 202 203 -
trunk/Source/WebCore/workers/SharedWorkerContext.cpp
r137318 r149125 81 81 void SharedWorkerContext::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack> callStack) 82 82 { 83 // FIXME: <http://webkit.org/b/114315> ScriptExecutionContext log exception should include a column number 83 84 WorkerContext::logExceptionToConsole(errorMessage, sourceURL, lineNumber, callStack); 84 addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, callStack);85 addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, 0, callStack); 85 86 } 86 87 -
trunk/Source/WebCore/workers/WorkerContext.cpp
r147761 r149125 276 276 void WorkerContext::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack>) 277 277 { 278 thread()->workerReportingProxy().postExceptionToWorkerObject(errorMessage, lineNumber, sourceURL); 278 // FIXME: <http://webkit.org/b/114315> ScriptExecutionContext log exception should include a column number 279 thread()->workerReportingProxy().postExceptionToWorkerObject(errorMessage, lineNumber, 0, sourceURL); 279 280 } 280 281 … … 285 286 return; 286 287 } 287 thread()->workerReportingProxy().postConsoleMessageToWorkerObject(source, level, message, 0, String()); 288 289 addMessageToWorkerConsole(source, level, message, String(), 0, 0, 0, requestIdentifier);290 } 291 292 void WorkerContext::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier)288 289 thread()->workerReportingProxy().postConsoleMessageToWorkerObject(source, level, message, 0, 0, String()); 290 addMessageToWorkerConsole(source, level, message, String(), 0, 0, 0, 0, requestIdentifier); 291 } 292 293 void WorkerContext::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier) 293 294 { 294 295 if (!isContextThread()) { … … 296 297 return; 297 298 } 298 thread()->workerReportingProxy().postConsoleMessageToWorkerObject(source, level, message, lineNumber, sourceURL); 299 addMessageToWorkerConsole(source, level, message, sourceURL, lineNumber, callStack, state, requestIdentifier); 300 } 301 302 void WorkerContext::addMessageToWorkerConsole(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier) 299 300 thread()->workerReportingProxy().postConsoleMessageToWorkerObject(source, level, message, lineNumber, columnNumber, sourceURL); 301 addMessageToWorkerConsole(source, level, message, sourceURL, lineNumber, columnNumber, callStack, state, requestIdentifier); 302 } 303 304 void WorkerContext::addMessageToWorkerConsole(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier) 303 305 { 304 306 ASSERT(isContextThread()); … … 306 308 InspectorInstrumentation::addMessageToConsole(this, source, LogMessageType, level, message, callStack, requestIdentifier); 307 309 else 308 InspectorInstrumentation::addMessageToConsole(this, source, LogMessageType, level, message, sourceURL, lineNumber, state, requestIdentifier);310 InspectorInstrumentation::addMessageToConsole(this, source, LogMessageType, level, message, sourceURL, lineNumber, columnNumber, state, requestIdentifier); 309 311 } 310 312 -
trunk/Source/WebCore/workers/WorkerContext.h
r145930 r149125 146 146 147 147 virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack>) OVERRIDE; 148 void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0);148 void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0); 149 149 150 150 private: … … 160 160 virtual KURL virtualCompleteURL(const String&) const; 161 161 162 virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0) OVERRIDE;162 virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0) OVERRIDE; 163 163 virtual void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) OVERRIDE; 164 164 -
trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp
r147761 r149125 114 114 class WorkerExceptionTask : public ScriptExecutionContext::Task { 115 115 public: 116 static PassOwnPtr<WorkerExceptionTask> create(const String& errorMessage, int lineNumber, const String& sourceURL, WorkerMessagingProxy* messagingProxy)117 { 118 return adoptPtr(new WorkerExceptionTask(errorMessage, lineNumber, sourceURL, messagingProxy));119 } 120 121 private: 122 WorkerExceptionTask(const String& errorMessage, int lineNumber, const String& sourceURL, WorkerMessagingProxy* messagingProxy)116 static PassOwnPtr<WorkerExceptionTask> create(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, WorkerMessagingProxy* messagingProxy) 117 { 118 return adoptPtr(new WorkerExceptionTask(errorMessage, lineNumber, columnNumber, sourceURL, messagingProxy)); 119 } 120 121 private: 122 WorkerExceptionTask(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, WorkerMessagingProxy* messagingProxy) 123 123 : m_errorMessage(errorMessage.isolatedCopy()) 124 124 , m_lineNumber(lineNumber) 125 , m_columnNumber(columnNumber) 125 126 , m_sourceURL(sourceURL.isolatedCopy()) 126 127 , m_messagingProxy(messagingProxy) … … 138 139 139 140 bool errorHandled = !workerObject->dispatchEvent(ErrorEvent::create(m_errorMessage, m_sourceURL, m_lineNumber)); 140 if (!errorHandled) 141 if (!errorHandled) { 142 // FIXME: <http://webkit.org/b/114315> ScriptExecutionContext log exception should include a column number 141 143 context->reportException(m_errorMessage, m_lineNumber, m_sourceURL, 0); 144 } 142 145 } 143 146 144 147 String m_errorMessage; 145 148 int m_lineNumber; 149 int m_columnNumber; 146 150 String m_sourceURL; 147 151 WorkerMessagingProxy* m_messagingProxy; … … 318 322 } 319 323 320 void WorkerMessagingProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, const String& sourceURL)321 { 322 m_scriptExecutionContext->postTask(WorkerExceptionTask::create(errorMessage, lineNumber, sourceURL, this));323 } 324 325 static void postConsoleMessageTask(ScriptExecutionContext* context, WorkerMessagingProxy* messagingProxy, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL)324 void WorkerMessagingProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) 325 { 326 m_scriptExecutionContext->postTask(WorkerExceptionTask::create(errorMessage, lineNumber, columnNumber, sourceURL, this)); 327 } 328 329 static void postConsoleMessageTask(ScriptExecutionContext* context, WorkerMessagingProxy* messagingProxy, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceURL) 326 330 { 327 331 if (messagingProxy->askedToTerminate()) 328 332 return; 329 context->addConsoleMessage(source, level, message, sourceURL, lineNumber );330 } 331 332 void WorkerMessagingProxy::postConsoleMessageToWorkerObject(MessageSource source, MessageLevel level, const String& message, int lineNumber, const String& sourceURL)333 { 334 m_scriptExecutionContext->postTask(createCallbackTask(&postConsoleMessageTask, AllowCrossThreadAccess(this), source, level, message, lineNumber, sourceURL));333 context->addConsoleMessage(source, level, message, sourceURL, lineNumber, columnNumber); 334 } 335 336 void WorkerMessagingProxy::postConsoleMessageToWorkerObject(MessageSource source, MessageLevel level, const String& message, int lineNumber, int columnNumber, const String& sourceURL) 337 { 338 m_scriptExecutionContext->postTask(createCallbackTask(&postConsoleMessageTask, AllowCrossThreadAccess(this), source, level, message, lineNumber, columnNumber, sourceURL)); 335 339 } 336 340 -
trunk/Source/WebCore/workers/WorkerMessagingProxy.h
r145930 r149125 68 68 // (Only use these methods in the worker context thread.) 69 69 virtual void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, PassOwnPtr<MessagePortChannelArray>) OVERRIDE; 70 virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, const String& sourceURL) OVERRIDE;71 virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, const String& sourceURL) OVERRIDE;70 virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) OVERRIDE; 71 virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL) OVERRIDE; 72 72 #if ENABLE(INSPECTOR) 73 73 virtual void postMessageToPageInspector(const String&) OVERRIDE; -
trunk/Source/WebCore/workers/WorkerReportingProxy.h
r137318 r149125 44 44 virtual ~WorkerReportingProxy() {} 45 45 46 virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, const String& sourceURL) = 0;46 virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) = 0; 47 47 48 virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, const String& sourceURL) = 0;48 virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL) = 0; 49 49 #if ENABLE(INSPECTOR) 50 50 virtual void postMessageToPageInspector(const String&) = 0; -
trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
r148209 r149125 101 101 } 102 102 103 console->addMessage(XMLMessageSource, level, error->message, error->file, error->line); 103 // xmlError->int2 is the column number of the error or 0 if N/A. 104 console->addMessage(XMLMessageSource, level, error->message, error->file, error->line, error->int2); 104 105 } 105 106 -
trunk/Source/WebCore/xml/XSLTProcessorQt.cpp
r144064 r149125 85 85 86 86 Console* console = m_document->domWindow()->console(); 87 console->addMessage(XMLMessageSource, level, description, sourceLocation.uri().toString(), sourceLocation.line() );87 console->addMessage(XMLMessageSource, level, description, sourceLocation.uri().toString(), sourceLocation.line(), sourceLocation.column()); 88 88 } 89 89 -
trunk/Source/WebKit/blackberry/Api/DumpRenderTreeClient.h
r145849 r149125 62 62 63 63 // ChromeClient delegates 64 virtual void addMessageToConsole(const String& message, unsigned lineNumber, const String& sourceID) = 0;64 virtual void addMessageToConsole(const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) = 0; 65 65 virtual void runJavaScriptAlert(const String& message) = 0; 66 66 virtual bool runJavaScriptConfirm(const String& message) = 0; -
trunk/Source/WebKit/blackberry/Api/WebPageClient.h
r148451 r149125 110 110 virtual void notifyWindowObjectCleared() = 0; 111 111 112 virtual void addMessageToConsole(const unsigned short* message, unsigned messageLength, const unsigned short* source, unsigned sourceLength, unsigned lineNumber ) = 0;112 virtual void addMessageToConsole(const unsigned short* message, unsigned messageLength, const unsigned short* source, unsigned sourceLength, unsigned lineNumber, unsigned columnNumber) = 0; 113 113 virtual int showAlertDialog(AlertType) = 0; 114 114 -
trunk/Source/WebKit/blackberry/ChangeLog
r149124 r149125 1 2013-04-25 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: ConsoleMessage should include line and column number where possible 4 https://bugs.webkit.org/show_bug.cgi?id=114929 5 6 Reviewed by Timothy Hatcher. 7 8 * Api/DumpRenderTreeClient.h: 9 * Api/WebPageClient.h: 10 * WebCoreSupport/ChromeClientBlackBerry.cpp: 11 (WebCore::ChromeClientBlackBerry::addMessageToConsole): 12 * WebCoreSupport/ChromeClientBlackBerry.h: 13 (ChromeClientBlackBerry): 14 1 15 2013-04-25 Konrad Piascik <kpiascik@blackberry.com> 2 16 -
trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp
r148667 r149125 92 92 } 93 93 94 void ChromeClientBlackBerry::addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID)94 void ChromeClientBlackBerry::addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) 95 95 { 96 96 #if !defined(PUBLIC_BUILD) || !PUBLIC_BUILD 97 97 if (m_webPagePrivate->m_dumpRenderTree) { 98 m_webPagePrivate->m_dumpRenderTree->addMessageToConsole(message, lineNumber, sourceID);99 return; 100 } 101 #endif 102 103 m_webPagePrivate->m_client->addMessageToConsole(message.characters(), message.length(), sourceID.characters(), sourceID.length(), lineNumber );98 m_webPagePrivate->m_dumpRenderTree->addMessageToConsole(message, lineNumber, columnNumber, sourceID); 99 return; 100 } 101 #endif 102 103 m_webPagePrivate->m_client->addMessageToConsole(message.characters(), message.length(), sourceID.characters(), sourceID.length(), lineNumber, columnNumber); 104 104 } 105 105 -
trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h
r147960 r149125 62 62 virtual bool menubarVisible(); 63 63 virtual void setResizable(bool); 64 virtual void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID);64 virtual void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID); 65 65 virtual bool canRunBeforeUnloadConfirmPanel(); 66 66 virtual bool runBeforeUnloadConfirmPanel(const String&, Frame*); -
trunk/Source/WebKit/efl/ChangeLog
r149094 r149125 1 2013-04-25 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: ConsoleMessage should include line and column number where possible 4 https://bugs.webkit.org/show_bug.cgi?id=114929 5 6 Reviewed by Timothy Hatcher. 7 8 * WebCoreSupport/ChromeClientEfl.cpp: 9 (WebCore::ChromeClientEfl::addMessageToConsole): 10 * WebCoreSupport/ChromeClientEfl.h: 11 (ChromeClientEfl): 12 1 13 2013-04-25 Commit Queue <rniwa@webkit.org> 2 14 -
trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
r146320 r149125 275 275 276 276 void ChromeClientEfl::addMessageToConsole(MessageSource, MessageLevel, const String& message, 277 unsigned int lineNumber, const String& sourceID) 278 { 277 unsigned lineNumber, unsigned columnNumber, const String& sourceID) 278 { 279 UNUSED_PARAM(columnNumber); 279 280 ewk_view_add_console_message(m_view, message.utf8().data(), lineNumber, sourceID.utf8().data()); 280 281 } -
trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
r146320 r149125 85 85 86 86 virtual void addMessageToConsole(MessageSource, MessageLevel, const String& message, 87 unsigned int lineNumber, const String& sourceID);87 unsigned lineNumber, unsigned columnNumber, const String& sourceID); 88 88 89 89 virtual bool canRunBeforeUnloadConfirmPanel(); -
trunk/Source/WebKit/gtk/ChangeLog
r148935 r149125 1 2013-04-25 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: ConsoleMessage should include line and column number where possible 4 https://bugs.webkit.org/show_bug.cgi?id=114929 5 6 Reviewed by Timothy Hatcher. 7 8 * WebCoreSupport/ChromeClientGtk.cpp: 9 (WebKit::ChromeClient::addMessageToConsole): 10 * WebCoreSupport/ChromeClientGtk.h: 11 (ChromeClient): 12 1 13 2013-04-22 Martin Robinson <mrobinson@igalia.com> 2 14 -
trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
r148545 r149125 335 335 } 336 336 337 void ChromeClient::addMessageToConsole(WebCore::MessageSource source, WebCore::MessageLevel level, const WTF::String& message, unsigned lineNumber, const WTF::String& sourceId)337 void ChromeClient::addMessageToConsole(WebCore::MessageSource source, WebCore::MessageLevel level, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceId) 338 338 { 339 339 gboolean retval; -
trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
r141566 r149125 83 83 virtual void setResizable(bool); 84 84 85 virtual void addMessageToConsole(MessageSource, MessageLevel, const WTF::String& message, unsigned lineNumber, const WTF::String& sourceID);85 virtual void addMessageToConsole(MessageSource, MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceID); 86 86 87 87 virtual bool canRunBeforeUnloadConfirmPanel(); -
trunk/Source/WebKit/mac/ChangeLog
r149035 r149125 1 2013-04-25 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: ConsoleMessage should include line and column number where possible 4 https://bugs.webkit.org/show_bug.cgi?id=114929 5 6 Reviewed by Timothy Hatcher. 7 8 * WebCoreSupport/WebChromeClient.h: 9 * WebCoreSupport/WebChromeClient.mm: 10 (WebChromeClient::addMessageToConsole): 11 1 12 2013-04-24 Jessie Berlin <jberlin@apple.com> 2 13 -
trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h
r144795 r149125 75 75 virtual void setResizable(bool) OVERRIDE; 76 76 77 virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const WTF::String& message, unsigned lineNumber, const WTF::String& sourceURL) OVERRIDE;77 virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceURL) OVERRIDE; 78 78 79 79 virtual bool canRunBeforeUnloadConfirmPanel() OVERRIDE; -
trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
r147447 r149125 386 386 } 387 387 388 void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned int lineNumber, const String& sourceURL)388 void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned int lineNumber, unsigned columnNumber, const String& sourceURL) 389 389 { 390 390 id delegate = [m_webView UIDelegate]; … … 407 407 (NSString *)message, @"message", 408 408 [NSNumber numberWithUnsignedInt:lineNumber], @"lineNumber", 409 [NSNumber numberWithUnsignedInt:columnNumber], @"columnNumber", 409 410 (NSString *)sourceURL, @"sourceURL", 410 411 messageSource, @"MessageSource", -
trunk/Source/WebKit/qt/ChangeLog
r149123 r149125 1 2013-04-25 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: ConsoleMessage should include line and column number where possible 4 https://bugs.webkit.org/show_bug.cgi?id=114929 5 6 Reviewed by Timothy Hatcher. 7 8 * WebCoreSupport/ChromeClientQt.cpp: 9 (WebCore::ChromeClientQt::addMessageToConsole): 10 * WebCoreSupport/ChromeClientQt.h: 11 1 12 2013-04-25 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 13 -
trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
r149123 r149125 309 309 } 310 310 311 void ChromeClientQt::addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID)311 void ChromeClientQt::addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) 312 312 { 313 313 QString x = message; 314 314 QString y = sourceID; 315 UNUSED_PARAM(columnNumber); 315 316 m_webPage->javaScriptConsoleMessage(x, lineNumber, y); 316 317 } -
trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
r141265 r149125 102 102 virtual void setResizable(bool); 103 103 104 virtual void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID);104 virtual void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID); 105 105 106 106 virtual bool canRunBeforeUnloadConfirmPanel(); -
trunk/Source/WebKit/win/ChangeLog
r149037 r149125 1 2013-04-25 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: ConsoleMessage should include line and column number where possible 4 https://bugs.webkit.org/show_bug.cgi?id=114929 5 6 Reviewed by Timothy Hatcher. 7 8 * WebCoreSupport/WebChromeClient.cpp: 9 (WebChromeClient::addMessageToConsole): 10 * WebCoreSupport/WebChromeClient.h: 11 1 12 2013-04-24 Andreas Kling <akling@apple.com> 2 13 -
trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
r139078 r149125 335 335 } 336 336 337 void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned line, const String& url) 338 { 337 void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, unsigned columnNumber, const String& url) 338 { 339 UNUSED_PARAM(columnNumber); 340 339 341 COMPtr<IWebUIDelegate> uiDelegate; 340 342 if (SUCCEEDED(m_webView->uiDelegate(&uiDelegate))) { 341 343 COMPtr<IWebUIDelegatePrivate> uiPrivate; 342 344 if (SUCCEEDED(uiDelegate->QueryInterface(IID_IWebUIDelegatePrivate, (void**)&uiPrivate))) 343 uiPrivate->webViewAddMessageToConsole(m_webView, BString(message), line , BString(url), true);345 uiPrivate->webViewAddMessageToConsole(m_webView, BString(message), lineNumber, BString(url), true); 344 346 } 345 347 } -
trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h
r149037 r149125 80 80 virtual void setResizable(bool); 81 81 82 virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const WTF::String& message, unsigned line , const WTF::String& url);82 virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& url); 83 83 84 84 virtual bool canRunBeforeUnloadConfirmPanel(); -
trunk/Source/WebKit/wince/ChangeLog
r148702 r149125 1 2013-04-25 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: ConsoleMessage should include line and column number where possible 4 https://bugs.webkit.org/show_bug.cgi?id=114929 5 6 Reviewed by Timothy Hatcher. 7 8 * WebCoreSupport/ChromeClientWinCE.cpp: 9 (WebKit::ChromeClientWinCE::addMessageToConsole): 10 * WebCoreSupport/ChromeClientWinCE.h: 11 1 12 2013-04-18 Patrick Gansterer <paroga@webkit.org> 2 13 -
trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
r139078 r149125 185 185 } 186 186 187 void ChromeClientWinCE::addMessageToConsole(MessageSource, MessageLevel, const String&, unsigned, const String&)187 void ChromeClientWinCE::addMessageToConsole(MessageSource, MessageLevel, const String&, unsigned, unsigned, const String&) 188 188 { 189 189 notImplemented(); -
trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
r140909 r149125 77 77 virtual void setResizable(bool); 78 78 79 virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const WTF::String& message, unsigned lineNumber, const WTF::String& sourceID);79 virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceID); 80 80 81 81 virtual bool canRunBeforeUnloadConfirmPanel(); -
trunk/Source/WebKit2/ChangeLog
r149121 r149125 1 2013-04-25 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: ConsoleMessage should include line and column number where possible 4 https://bugs.webkit.org/show_bug.cgi?id=114929 5 6 Reviewed by Timothy Hatcher. 7 8 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 9 (WebKit::WebChromeClient::addMessageToConsole): 10 * WebProcess/WebCoreSupport/WebChromeClient.h: 11 1 12 2013-04-25 Brady Eidson <beidson@apple.com> 2 13 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r148278 r149125 283 283 } 284 284 285 void WebChromeClient::addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& /*sourceID*/)285 void WebChromeClient::addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, unsigned /*columnNumber*/, const String& /*sourceID*/) 286 286 { 287 287 // Notify the bundle client. -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
r144397 r149125 91 91 virtual void setResizable(bool) OVERRIDE; 92 92 93 virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const String& message, unsigned lineNumber, const String& sourceID) OVERRIDE;93 virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) OVERRIDE; 94 94 95 95 virtual bool canRunBeforeUnloadConfirmPanel() OVERRIDE;
Note: See TracChangeset
for help on using the changeset viewer.