<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163568] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163568">163568</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-06 15:45:53 -0800 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add Console support to JSContext Inspection
https://bugs.webkit.org/show_bug.cgi?id=127941
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
* CMakeLists.txt:
* DerivedSources.make:
* GNUmakefile.am:
* GNUmakefile.list.am:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
Add new files.
* inspector/agents/InspectorConsoleAgent.cpp: Renamed from Source/WebCore/inspector/InspectorConsoleAgent.cpp.
* inspector/agents/InspectorConsoleAgent.h: Added.
New agent moved from WebCore. Rename a method to work in JS only context.
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
Instantiate ConsoleAgent.
* inspector/agents/JSGlobalObjectConsoleAgent.h: Copied from Source/WebCore/inspector/PageInjectedScriptHost.h.
* inspector/agents/JSGlobalObjectConsoleAgent.cpp: Copied from Source/WebCore/inspector/PageInjectedScriptHost.h.
(Inspector::JSGlobalObjectConsoleAgent::JSGlobalObjectConsoleAgent):
(Inspector::JSGlobalObjectConsoleAgent::setMonitoringXHREnabled):
(Inspector::JSGlobalObjectConsoleAgent::addInspectedNode):
(Inspector::JSGlobalObjectConsoleAgent::addInspectedHeapObject):
JSGlobalObject implementation.
* inspector/agents/JSGlobalObjectDebuggerAgent.h:
* inspector/agents/JSGlobalObjectDebuggerAgent.cpp:
(Inspector::JSGlobalObjectDebuggerAgent::JSGlobalObjectDebuggerAgent):
(Inspector::JSGlobalObjectDebuggerAgent::breakpointActionLog):
Use ConsoleAgent to report logs.
* inspector/ConsoleMessage.cpp: Renamed from Source/WebCore/inspector/ConsoleMessage.cpp.
* inspector/ConsoleMessage.h: Renamed from Source/WebCore/inspector/ConsoleMessage.h.
* inspector/ConsoleTypes.h: Copied from Source/WebCore/inspector/ConsoleAPITypes.h.
* inspector/IdentifiersFactory.cpp: Renamed from Source/WebCore/inspector/IdentifiersFactory.cpp.
* inspector/IdentifiersFactory.h: Renamed from Source/WebCore/inspector/IdentifiersFactory.h.
* inspector/ScriptArguments.cpp: Renamed from Source/WebCore/inspector/ScriptArguments.cpp.
* inspector/ScriptArguments.h: Renamed from Source/WebCore/inspector/ScriptArguments.h.
* inspector/ScriptCallFrame.cpp: Renamed from Source/WebCore/inspector/ScriptCallFrame.cpp.
* inspector/ScriptCallFrame.h: Renamed from Source/WebCore/inspector/ScriptCallFrame.h.
* inspector/ScriptCallStack.cpp: Renamed from Source/WebCore/inspector/ScriptCallStack.cpp.
* inspector/ScriptCallStack.h: Renamed from Source/WebCore/inspector/ScriptCallStack.h.
* inspector/ScriptCallStackFactory.cpp: Renamed from Source/WebCore/bindings/js/ScriptCallStackFactory.cpp.
* inspector/ScriptCallStackFactory.h: Renamed from Source/WebCore/bindings/js/ScriptCallStackFactory.h.
* inspector/protocol/Console.json: Renamed from Source/WebCore/inspector/protocol/Console.json.
* inspector/scripts/generate-combined-inspector-json.py:
Source/WebCore:
- Move InspectorConsoleAgent and dependencies to JavaScriptCore
and into the Inspector namespace.
- Update Console Message enum types to enum classes and update
all users to the new, simpler names.
- Since we are updating addConsoleMessage callsites anyways, add
ASCIILiteral where appropriate.
- Add WebConsoleAgent base of Page/Worker ConsoleAgent to implement
what could not be pushed into JavaScriptCore.
* CMakeLists.txt:
* DerivedSources.make:
* ForwardingHeaders/inspector/ConsoleMessage.h: Added.
* ForwardingHeaders/inspector/ConsoleTypes.h: Added.
* ForwardingHeaders/inspector/IdentifiersFactory.h: Added.
* ForwardingHeaders/inspector/ScriptArguments.h: Added.
* ForwardingHeaders/inspector/ScriptCallFrame.h: Added.
* ForwardingHeaders/inspector/ScriptCallStack.h: Added.
* ForwardingHeaders/inspector/ScriptCallStackFactory.h: Added.
* ForwardingHeaders/inspector/agents/InspectorConsoleAgent.h: Added.
* GNUmakefile.am:
* GNUmakefile.list.am:
Add / remove files from builds.
* inspector/WebConsoleAgent.h:
* inspector/WebConsoleAgent.cpp: Added.
(WebCore::WebConsoleAgent::WebConsoleAgent):
(WebCore::WebConsoleAgent::setMonitoringXHREnabled):
(WebCore::WebConsoleAgent::frameWindowDiscarded):
(WebCore::WebConsoleAgent::didFinishXHRLoading):
(WebCore::WebConsoleAgent::didReceiveResponse):
(WebCore::WebConsoleAgent::didFailLoading):
(WebCore::WebConsoleAgent::addInspectedHeapObject):
Implement what could not be pushed down into JavaScriptCore.
* inspector/InstrumentingAgents.h:
(WebCore::InstrumentingAgents::webConsoleAgent):
(WebCore::InstrumentingAgents::setWebConsoleAgent):
Hold a WebConsoleAgent instead of InspectorConsoleAgent.
* Modules/indexeddb/IDBCursor.cpp:
* Modules/indexeddb/IDBDatabase.cpp:
* Modules/indexeddb/IDBTransaction.cpp:
* Modules/quota/DOMWindowQuota.cpp:
(WebCore::DOMWindowQuota::webkitStorageInfo):
* Modules/webaudio/AudioBufferSourceNode.cpp:
(WebCore::AudioBufferSourceNode::looping):
(WebCore::AudioBufferSourceNode::setLooping):
* Modules/webaudio/AudioContext.cpp:
* Modules/webaudio/PannerNode.cpp:
(WebCore::PannerNode::setPanningModel):
* Modules/webdatabase/DatabaseBase.cpp:
(WebCore::DatabaseBase::logErrorMessage):
* Modules/webdatabase/DatabaseManager.cpp:
(WebCore::DatabaseManager::logErrorMessage):
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::connect):
(WebCore::WebSocket::send):
(WebCore::WebSocket::close):
(WebCore::WebSocket::setBinaryType):
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::fail):
(WebCore::WebSocketChannel::didFailSocketStream):
* Modules/websockets/WebSocketHandshake.cpp:
* WebCore.exp.in:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSAudioContextCustom.cpp:
(WebCore::JSAudioContextConstructor::constructJSAudioContext):
* bindings/js/JSCustomXPathNSResolver.cpp:
(WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
* bindings/js/JSDOMBinding.cpp:
* bindings/js/JSSubtleCryptoCustom.cpp:
(WebCore::JSSubtleCrypto::encrypt):
(WebCore::JSSubtleCrypto::decrypt):
(WebCore::JSSubtleCrypto::sign):
(WebCore::JSSubtleCrypto::verify):
(WebCore::JSSubtleCrypto::wrapKey):
(WebCore::JSSubtleCrypto::unwrapKey):
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::canExecuteScripts):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateCallWith):
* bindings/scripts/test/JS/JSTestObj.cpp:
* css/CSSParser.cpp:
(WebCore::CSSParser::logError):
* css/MediaList.cpp:
(WebCore::addResolutionWarningMessageToConsole):
* dom/Document.cpp:
(WebCore::Document::logExceptionToConsole):
(WebCore::Document::processHttpEquiv):
(WebCore::Document::addMessage):
* dom/Document.h:
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::executeScript):
(WebCore::ScriptElement::notifyFinished):
* dom/ScriptExecutionContext.cpp:
* dom/ScriptExecutionContext.h:
* dom/ViewportArguments.cpp:
(WebCore::viewportErrorMessageLevel):
(WebCore::reportViewportWarning):
* fileapi/Blob.cpp:
* fileapi/WebKitBlobBuilder.cpp:
* html/HTMLFormControlElement.cpp:
(WebCore::shouldAutofocus):
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::validateInteractively):
* html/HTMLIFrameElement.cpp:
(WebCore::HTMLIFrameElement::parseAttribute):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::getImageData):
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::printWarningToConsole):
* html/parser/XSSAuditor.cpp:
(WebCore::XSSAuditor::init):
* html/parser/XSSAuditorDelegate.cpp:
(WebCore::XSSAuditorDelegate::didBlockScript):
* inspector/CommandLineAPIHost.cpp:
* inspector/CommandLineAPIHost.h:
(WebCore::CommandLineAPIHost::init):
* inspector/InspectorAllInOne.cpp:
* inspector/InspectorConsoleAgent.h: Removed.
* inspector/InspectorConsoleInstrumentation.h:
(WebCore::InspectorInstrumentation::addMessageToConsole):
(WebCore::InspectorInstrumentation::consoleCount):
(WebCore::InspectorInstrumentation::stopConsoleTiming):
(WebCore::InspectorInstrumentation::consoleTimeStamp):
(WebCore::InspectorInstrumentation::addProfile):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/InspectorDOMAgent.cpp:
* inspector/InspectorFrontendHost.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::frameWindowDiscardedImpl):
(WebCore::InspectorInstrumentation::didReceiveResourceResponseImpl):
(WebCore::InspectorInstrumentation::didFailLoadingImpl):
(WebCore::InspectorInstrumentation::didFinishXHRLoadingImpl):
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
(WebCore::isConsoleAssertMessage):
(WebCore::InspectorInstrumentation::addMessageToConsoleImpl):
(WebCore::InspectorInstrumentation::consoleCountImpl):
(WebCore::InspectorInstrumentation::startConsoleTimingImpl):
(WebCore::InspectorInstrumentation::stopConsoleTimingImpl):
(WebCore::InspectorInstrumentation::consoleAgentEnabled):
* inspector/InspectorInstrumentation.h:
* inspector/InspectorLayerTreeAgent.cpp:
* inspector/InspectorPageAgent.cpp:
* inspector/InspectorProfilerAgent.cpp:
(WebCore::InspectorProfilerAgent::addProfileFinishedMessageToConsole):
(WebCore::InspectorProfilerAgent::addStartProfilingMessageToConsole):
* inspector/InspectorProfilerAgent.h:
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::buildInitiatorObject):
* inspector/InspectorTimelineAgent.cpp:
* inspector/InstrumentingAgents.cpp:
(WebCore::InstrumentingAgents::InstrumentingAgents):
(WebCore::InstrumentingAgents::reset):
* inspector/PageConsoleAgent.cpp:
(WebCore::PageConsoleAgent::PageConsoleAgent):
(WebCore::PageConsoleAgent::clearMessages):
(WebCore::PageConsoleAgent::addInspectedNode):
* inspector/PageConsoleAgent.h:
* inspector/PageDebuggerAgent.cpp:
(WebCore::PageDebuggerAgent::breakpointActionLog):
* inspector/PageInjectedScriptHost.h:
* inspector/PageInjectedScriptManager.h:
* inspector/TimelineRecordFactory.cpp:
(WebCore::TimelineRecordFactory::createGenericRecord):
(WebCore::WebConsoleAgent::~WebConsoleAgent):
* inspector/WorkerConsoleAgent.cpp:
(WebCore::WorkerConsoleAgent::WorkerConsoleAgent):
(WebCore::WorkerConsoleAgent::addInspectedNode):
* inspector/WorkerConsoleAgent.h:
* inspector/WorkerDebuggerAgent.cpp:
(WebCore::WorkerDebuggerAgent::breakpointActionLog):
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::responseReceived):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::submitForm):
(WebCore::FrameLoader::reportLocalLoadFailed):
(WebCore::FrameLoader::handleBeforeUnloadEvent):
(WebCore::FrameLoader::shouldInterruptLoadForXFrameOptions):
(WebCore::createWindow):
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::notifyFinished):
* loader/MixedContentChecker.cpp:
(WebCore::MixedContentChecker::logWarning):
* loader/TextTrackLoader.cpp:
(WebCore::TextTrackLoader::corsPolicyPreventedLoad):
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::abort):
(WebCore::ApplicationCacheGroup::didReceiveResponse):
(WebCore::ApplicationCacheGroup::didFinishLoading):
(WebCore::ApplicationCacheGroup::didFail):
(WebCore::ApplicationCacheGroup::didReceiveManifestResponse):
(WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
(WebCore::ApplicationCacheGroup::checkIfLoadIsComplete):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::printAccessDeniedMessage):
* page/ChromeClient.h:
* page/Console.cpp:
(WebCore::internalAddMessage):
(WebCore::Console::debug):
(WebCore::Console::error):
(WebCore::Console::log):
(WebCore::Console::warn):
(WebCore::Console::dir):
(WebCore::Console::dirxml):
(WebCore::Console::table):
(WebCore::Console::clear):
(WebCore::Console::trace):
(WebCore::Console::assertCondition):
(WebCore::Console::group):
(WebCore::Console::groupCollapsed):
(WebCore::Console::groupEnd):
* page/Console.h:
* page/ConsoleTypes.h: Removed.
* page/ContentSecurityPolicy.cpp:
(WebCore::ContentSecurityPolicy::reportViolation):
(WebCore::ContentSecurityPolicy::logToConsole):
* page/DOMSecurityPolicy.cpp:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::postMessage):
(WebCore::DOMWindow::dispatchMessageEventWithOriginCheck):
(WebCore::DOMWindow::close):
(WebCore::DOMWindow::printErrorMessage):
* page/DOMWindow.h:
* page/EventSource.cpp:
(WebCore::EventSource::didReceiveResponse):
(WebCore::EventSource::didFailAccessControlCheck):
* page/PageConsole.cpp:
(WebCore::PageConsole::printMessageSourceAndLevelPrefix):
(WebCore::PageConsole::addMessage):
* page/PageConsole.h:
* page/PointerLockController.cpp:
(WebCore::PointerLockController::requestPointerLock):
* platform/CrossThreadCopier.h:
* rendering/shapes/ShapeInfo.cpp:
(WebCore::checkShapeImageOrigin):
* svg/SVGDocumentExtensions.cpp:
(WebCore::reportMessage):
(WebCore::SVGDocumentExtensions::reportWarning):
(WebCore::SVGDocumentExtensions::reportError):
* testing/Internals.cpp:
(WebCore::Internals::consoleMessageArgumentCounts):
* workers/DefaultSharedWorkerRepository.cpp:
* workers/SharedWorkerGlobalScope.cpp:
(WebCore::SharedWorkerGlobalScope::logExceptionToConsole):
* workers/SharedWorkerGlobalScope.h:
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::addMessageToWorkerConsole):
* workers/WorkerGlobalScope.h:
* workers/WorkerMessagingProxy.cpp:
* workers/WorkerReportingProxy.h:
* xml/XMLHttpRequest.cpp:
(WebCore::logConsoleError):
(WebCore::XMLHttpRequest::send):
* xml/XSLTProcessorLibxslt.cpp:
(WebCore::XSLTProcessor::parseErrorFunc):
Source/WebInspectorUI:
* UserInterface/InspectorJSBackendCommands.js:
* UserInterface/InspectorWebBackendCommands.js:
ConsoleAgent moved to JavaScript section.
Source/WebKit/gtk:
* WebCoreSupport/ChromeClientGtk.cpp:
(WebKit::ChromeClient::addMessageToConsole):
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(stringForMessageSource):
(stringForMessageLevel):
(WebChromeClient::addMessageToConsole):
Source/WebKit/win:
* WebCoreSupport/WebChromeClient.h:
Source/WebKit/wince:
* WebCoreSupport/ChromeClientWinCE.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebChromeClient.h:
LayoutTests:
* inspector-protocol/page/deny-X-FrameOption-expected.txt:
Update with better line/column numbers now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorinspectortestjs">trunk/LayoutTests/http/tests/inspector/inspector-test.js</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorprotocolloadingiframedocumentnodehtml">trunk/LayoutTests/http/tests/inspector-protocol/loading-iframe-document-node.html</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolpagedenyXFrameOptionexpectedtxt">trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreGNUmakefileam">trunk/Source/JavaScriptCore/GNUmakefile.am</a></li>
<li><a href="#trunkSourceJavaScriptCoreGNUmakefilelistam">trunk/Source/JavaScriptCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptsgeneratecombinedinspectorjsonpy">trunk/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefileam">trunk/Source/WebCore/GNUmakefile.am</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBCursorcpp">trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesquotaDOMWindowQuotacpp">trunk/Source/WebCore/Modules/quota/DOMWindowQuota.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioBufferSourceNodecpp">trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContextcpp">trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioPannerNodecpp">trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBasecpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketHandshakecpp">trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp</a></li>
<li><a href="#trunkSourceWebCoreUseJSCcmake">trunk/Source/WebCore/UseJSC.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSAudioContextCustomcpp">trunk/Source/WebCore/bindings/js/JSAudioContextCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp">trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomXPathNSResolvercpp">trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp">trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssMediaListcpp">trunk/Source/WebCore/css/MediaList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCoredomViewportArgumentscpp">trunk/Source/WebCore/dom/ViewportArguments.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiBlobcpp">trunk/Source/WebCore/fileapi/Blob.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiWebKitBlobBuildercpp">trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLIFrameElementcpp">trunk/Source/WebCore/html/HTMLIFrameElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserXSSAuditorcpp">trunk/Source/WebCore/html/parser/XSSAuditor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserXSSAuditorDelegatecpp">trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIHostcpp">trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIHosth">trunk/Source/WebCore/inspector/CommandLineAPIHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAllInOnecpp">trunk/Source/WebCore/inspector/InspectorAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh">trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHosth">trunk/Source/WebCore/inspector/InspectorFrontendHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorProfilerAgentcpp">trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorProfilerAgenth">trunk/Source/WebCore/inspector/InspectorProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentscpp">trunk/Source/WebCore/inspector/InstrumentingAgents.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentsh">trunk/Source/WebCore/inspector/InstrumentingAgents.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageConsoleAgentcpp">trunk/Source/WebCore/inspector/PageConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageConsoleAgenth">trunk/Source/WebCore/inspector/PageConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageDebuggerAgentcpp">trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageInjectedScriptHosth">trunk/Source/WebCore/inspector/PageInjectedScriptHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageInjectedScriptManagerh">trunk/Source/WebCore/inspector/PageInjectedScriptManager.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactorycpp">trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgentcpp">trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgenth">trunk/Source/WebCore/inspector/WorkerConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoadercpp">trunk/Source/WebCore/loader/ImageLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderMixedContentCheckercpp">trunk/Source/WebCore/loader/MixedContentChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoadercpp">trunk/Source/WebCore/loader/TextTrackLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCorepageConsolecpp">trunk/Source/WebCore/page/Console.cpp</a></li>
<li><a href="#trunkSourceWebCorepageConsoleh">trunk/Source/WebCore/page/Console.h</a></li>
<li><a href="#trunkSourceWebCorepageContentSecurityPolicycpp">trunk/Source/WebCore/page/ContentSecurityPolicy.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMSecurityPolicycpp">trunk/Source/WebCore/page/DOMSecurityPolicy.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowh">trunk/Source/WebCore/page/DOMWindow.h</a></li>
<li><a href="#trunkSourceWebCorepageEventSourcecpp">trunk/Source/WebCore/page/EventSource.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsolecpp">trunk/Source/WebCore/page/PageConsole.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsoleh">trunk/Source/WebCore/page/PageConsole.h</a></li>
<li><a href="#trunkSourceWebCorepagePointerLockControllercpp">trunk/Source/WebCore/page/PointerLockController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformCrossThreadCopierh">trunk/Source/WebCore/platform/CrossThreadCopier.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGDocumentExtensionscpp">trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp">trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersSharedWorkerGlobalScopecpp">trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersSharedWorkerGlobalScopeh">trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerReportingProxyh">trunk/Source/WebCore/workers/WorkerReportingProxy.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLTProcessorLibxsltcpp">trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceInspectorJSBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceInspectorWebBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportChromeClientGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClienth">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitwinceChangeLog">trunk/Source/WebKit/wince/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportChromeClientWinCEh">trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessagecpp">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessageh">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleTypesh">trunk/Source/JavaScriptCore/inspector/ConsoleTypes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorIdentifiersFactorycpp">trunk/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorIdentifiersFactoryh">trunk/Source/JavaScriptCore/inspector/IdentifiersFactory.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptArgumentscpp">trunk/Source/JavaScriptCore/inspector/ScriptArguments.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptArgumentsh">trunk/Source/JavaScriptCore/inspector/ScriptArguments.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallFrameh">trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackcpp">trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackh">trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackFactorycpp">trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackFactoryh">trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolConsolejson">trunk/Source/JavaScriptCore/inspector/protocol/Console.json</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorConsoleMessageh">trunk/Source/WebCore/ForwardingHeaders/inspector/ConsoleMessage.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorConsoleTypesh">trunk/Source/WebCore/ForwardingHeaders/inspector/ConsoleTypes.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorIdentifiersFactoryh">trunk/Source/WebCore/ForwardingHeaders/inspector/IdentifiersFactory.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorScriptArgumentsh">trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptArguments.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorScriptCallFrameh">trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallFrame.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorScriptCallStackh">trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallStack.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorScriptCallStackFactoryh">trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallStackFactory.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectoragentsInspectorConsoleAgenth">trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebConsoleAgentcpp">trunk/Source/WebCore/inspector/WebConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebConsoleAgenth">trunk/Source/WebCore/inspector/WebConsoleAgent.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsScriptCallStackFactorycpp">trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptCallStackFactoryh">trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorConsoleAPITypesh">trunk/Source/WebCore/inspector/ConsoleAPITypes.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorConsoleMessagecpp">trunk/Source/WebCore/inspector/ConsoleMessage.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorConsoleMessageh">trunk/Source/WebCore/inspector/ConsoleMessage.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorIdentifiersFactorycpp">trunk/Source/WebCore/inspector/IdentifiersFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorIdentifiersFactoryh">trunk/Source/WebCore/inspector/IdentifiersFactory.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleAgentcpp">trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleAgenth">trunk/Source/WebCore/inspector/InspectorConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorScriptArgumentscpp">trunk/Source/WebCore/inspector/ScriptArguments.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorScriptArgumentsh">trunk/Source/WebCore/inspector/ScriptArguments.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorScriptCallFramecpp">trunk/Source/WebCore/inspector/ScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorScriptCallFrameh">trunk/Source/WebCore/inspector/ScriptCallFrame.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorScriptCallStackcpp">trunk/Source/WebCore/inspector/ScriptCallStack.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorScriptCallStackh">trunk/Source/WebCore/inspector/ScriptCallStack.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorprotocolConsolejson">trunk/Source/WebCore/inspector/protocol/Console.json</a></li>
<li><a href="#trunkSourceWebCorepageConsoleTypesh">trunk/Source/WebCore/page/ConsoleTypes.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/LayoutTests/ChangeLog 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Console support to JSContext Inspection
+ https://bugs.webkit.org/show_bug.cgi?id=127941
+
+ Reviewed by Geoffrey Garen.
+
+ * inspector-protocol/page/deny-X-FrameOption-expected.txt:
+ Update with better line/column numbers now.
+
</ins><span class="cx"> 2014-01-30 Oliver Hunt <oliver@apple.com>
</span><span class="cx"> Push DOM attributes into the prototype chain
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127969
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorinspectortestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/inspector-test.js (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/inspector-test.js 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/LayoutTests/http/tests/inspector/inspector-test.js 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -13,17 +13,17 @@
</span><span class="cx"> console.info = consoleOutputHook.bind(InspectorTest, "info");
</span><span class="cx">
</span><span class="cx"> InspectorTest.Output = { // override in window.initialize_yourName
</span><del>- testComplete: function()
</del><ins>+ testComplete: function()
</ins><span class="cx"> {
</span><span class="cx"> RuntimeAgent.evaluate("didEvaluateForTestInFrontend(" + InspectorTest.completeTestCallId + ", \"\")", "test");
</span><span class="cx"> },
</span><span class="cx">
</span><del>- addResult: function(text)
</del><ins>+ addResult: function(text)
</ins><span class="cx"> {
</span><span class="cx"> InspectorTest.evaluateInPage("output(unescape('" + escape(text) + "'))");
</span><span class="cx"> },
</span><span class="cx">
</span><del>- clearResults: function()
</del><ins>+ clearResults: function()
</ins><span class="cx"> {
</span><span class="cx"> InspectorTest.evaluateInPage("clearOutput()");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorprotocolloadingiframedocumentnodehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector-protocol/loading-iframe-document-node.html (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector-protocol/loading-iframe-document-node.html 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/LayoutTests/http/tests/inspector-protocol/loading-iframe-document-node.html 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> "includeCommandLineAPI": false,
</span><span class="cx"> "contextId": event.params.context.id,
</span><span class="cx"> "doNotPauseOnExceptionsAndMuteConsole": false,
</span><del>- "returnByValue": false,
</del><ins>+ "returnByValue": false,
</ins><span class="cx"> "generatePreview": false
</span><span class="cx"> }, callback);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolpagedenyXFrameOptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption-expected.txt (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption-expected.txt 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption-expected.txt 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> CONSOLE MESSAGE: Refused to display 'deny-X-FrameOption.html' in a frame because it set 'X-Frame-Options' to 'deny'.
</span><span class="cx">
</span><del>-deny-X-FrameOption.html:0:0
</del><ins>+deny-X-FrameOption.html:30:17
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -227,7 +227,9 @@
</span><span class="cx"> heap/WriteBarrierBuffer.cpp
</span><span class="cx"> heap/WriteBarrierSupport.cpp
</span><span class="cx">
</span><ins>+ inspector/ConsoleMessage.cpp
</ins><span class="cx"> inspector/ContentSearchUtilities.cpp
</span><ins>+ inspector/IdentifiersFactory.cpp
</ins><span class="cx"> inspector/InjectedScript.cpp
</span><span class="cx"> inspector/InjectedScriptBase.cpp
</span><span class="cx"> inspector/InjectedScriptHost.cpp
</span><span class="lines">@@ -241,8 +243,13 @@
</span><span class="cx"> inspector/JSJavaScriptCallFrame.cpp
</span><span class="cx"> inspector/JSJavaScriptCallFramePrototype.cpp
</span><span class="cx"> inspector/JavaScriptCallFrame.cpp
</span><ins>+ inspector/ScriptArguments.cpp
+ inspector/ScriptCallFrame.cpp
+ inspector/ScriptCallStack.cpp
+ inspector/ScriptCallStackFactory.cpp
</ins><span class="cx"> inspector/ScriptDebugServer.cpp
</span><span class="cx"> inspector/agents/InspectorAgent.cpp
</span><ins>+ inspector/agents/InspectorConsoleAgent.cpp
</ins><span class="cx"> inspector/agents/InspectorDebuggerAgent.cpp
</span><span class="cx"> inspector/agents/InspectorRuntimeAgent.cpp
</span><span class="cx">
</span><span class="lines">@@ -796,6 +803,7 @@
</span><span class="cx"> set(JavaScriptCore_INSPECTOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
</span><span class="cx">
</span><span class="cx"> set(JavaScriptCore_INSPECTOR_DOMAINS
</span><ins>+ inspector/protocol/Console.json
</ins><span class="cx"> inspector/protocol/Debugger.json
</span><span class="cx"> inspector/protocol/GenericTypes.json
</span><span class="cx"> inspector/protocol/InspectorDomain.json
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Console support to JSContext Inspection
+ https://bugs.webkit.org/show_bug.cgi?id=127941
+
+ Reviewed by Geoffrey Garen.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ Add new files.
+
+ * inspector/agents/InspectorConsoleAgent.cpp: Renamed from Source/WebCore/inspector/InspectorConsoleAgent.cpp.
+ * inspector/agents/InspectorConsoleAgent.h: Added.
+ New agent moved from WebCore. Rename a method to work in JS only context.
+
+ * inspector/JSGlobalObjectInspectorController.cpp:
+ (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
+ Instantiate ConsoleAgent.
+
+ * inspector/agents/JSGlobalObjectConsoleAgent.h: Copied from Source/WebCore/inspector/PageInjectedScriptHost.h.
+ * inspector/agents/JSGlobalObjectConsoleAgent.cpp: Copied from Source/WebCore/inspector/PageInjectedScriptHost.h.
+ (Inspector::JSGlobalObjectConsoleAgent::JSGlobalObjectConsoleAgent):
+ (Inspector::JSGlobalObjectConsoleAgent::setMonitoringXHREnabled):
+ (Inspector::JSGlobalObjectConsoleAgent::addInspectedNode):
+ (Inspector::JSGlobalObjectConsoleAgent::addInspectedHeapObject):
+ JSGlobalObject implementation.
+
+ * inspector/agents/JSGlobalObjectDebuggerAgent.h:
+ * inspector/agents/JSGlobalObjectDebuggerAgent.cpp:
+ (Inspector::JSGlobalObjectDebuggerAgent::JSGlobalObjectDebuggerAgent):
+ (Inspector::JSGlobalObjectDebuggerAgent::breakpointActionLog):
+ Use ConsoleAgent to report logs.
+
+ * inspector/ConsoleMessage.cpp: Renamed from Source/WebCore/inspector/ConsoleMessage.cpp.
+ * inspector/ConsoleMessage.h: Renamed from Source/WebCore/inspector/ConsoleMessage.h.
+ * inspector/ConsoleTypes.h: Copied from Source/WebCore/inspector/ConsoleAPITypes.h.
+ * inspector/IdentifiersFactory.cpp: Renamed from Source/WebCore/inspector/IdentifiersFactory.cpp.
+ * inspector/IdentifiersFactory.h: Renamed from Source/WebCore/inspector/IdentifiersFactory.h.
+ * inspector/ScriptArguments.cpp: Renamed from Source/WebCore/inspector/ScriptArguments.cpp.
+ * inspector/ScriptArguments.h: Renamed from Source/WebCore/inspector/ScriptArguments.h.
+ * inspector/ScriptCallFrame.cpp: Renamed from Source/WebCore/inspector/ScriptCallFrame.cpp.
+ * inspector/ScriptCallFrame.h: Renamed from Source/WebCore/inspector/ScriptCallFrame.h.
+ * inspector/ScriptCallStack.cpp: Renamed from Source/WebCore/inspector/ScriptCallStack.cpp.
+ * inspector/ScriptCallStack.h: Renamed from Source/WebCore/inspector/ScriptCallStack.h.
+ * inspector/ScriptCallStackFactory.cpp: Renamed from Source/WebCore/bindings/js/ScriptCallStackFactory.cpp.
+ * inspector/ScriptCallStackFactory.h: Renamed from Source/WebCore/bindings/js/ScriptCallStackFactory.h.
+ * inspector/protocol/Console.json: Renamed from Source/WebCore/inspector/protocol/Console.json.
+ * inspector/scripts/generate-combined-inspector-json.py:
+
</ins><span class="cx"> 2014-02-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r163542.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/DerivedSources.make 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> # Inspector interfaces
</span><span class="cx">
</span><span class="cx"> INSPECTOR_DOMAINS = \
</span><ins>+ $(JavaScriptCore)/inspector/protocol/Console.json \
</ins><span class="cx"> $(JavaScriptCore)/inspector/protocol/Debugger.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/GenericTypes.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/InspectorDomain.json \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/GNUmakefile.am (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/GNUmakefile.am 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/GNUmakefile.am 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -202,6 +202,7 @@
</span><span class="cx"> Source/JavaScriptCore/icu/LICENSE \
</span><span class="cx"> Source/JavaScriptCore/icu/README \
</span><span class="cx"> Source/JavaScriptCore/inspector/InjectedScriptSource.js \
</span><ins>+ Source/JavaScriptCore/inspector/protocol/Console.json \
</ins><span class="cx"> Source/JavaScriptCore/inspector/protocol/Debugger.json \
</span><span class="cx"> Source/JavaScriptCore/inspector/protocol/GenericTypes.json \
</span><span class="cx"> Source/JavaScriptCore/inspector/protocol/InspectorDomain.json \
</span><span class="lines">@@ -243,6 +244,7 @@
</span><span class="cx"> # Inspector Interfaces
</span><span class="cx">
</span><span class="cx"> JavaScriptCore_INSPECTOR_DOMAINS := \
</span><ins>+ $(JavaScriptCore)/inspector/protocol/Console.json \
</ins><span class="cx"> $(JavaScriptCore)/inspector/protocol/Debugger.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/GenericTypes.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/InspectorDomain.json \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/GNUmakefile.list.am (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/GNUmakefile.list.am 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/GNUmakefile.list.am 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -633,8 +633,13 @@
</span><span class="cx"> Source/JavaScriptCore/icu/unicode/utf_old.h \
</span><span class="cx"> Source/JavaScriptCore/icu/unicode/utypes.h \
</span><span class="cx"> Source/JavaScriptCore/icu/unicode/uversion.h \
</span><ins>+ Source/JavaScriptCore/inspector/ConsoleMessage.cpp \
+ Source/JavaScriptCore/inspector/ConsoleMessage.h \
+ Source/JavaScriptCore/inspector/ConsoleTypes.h \
</ins><span class="cx"> Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp \
</span><span class="cx"> Source/JavaScriptCore/inspector/ContentSearchUtilities.h \
</span><ins>+ Source/JavaScriptCore/inspector/IdentifiersFactory.cpp \
+ Source/JavaScriptCore/inspector/IdentifiersFactory.h \
</ins><span class="cx"> Source/JavaScriptCore/inspector/InjectedScript.cpp \
</span><span class="cx"> Source/JavaScriptCore/inspector/InjectedScript.h \
</span><span class="cx"> Source/JavaScriptCore/inspector/InjectedScriptBase.cpp \
</span><span class="lines">@@ -665,16 +670,26 @@
</span><span class="cx"> Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.h \
</span><span class="cx"> Source/JavaScriptCore/inspector/JavaScriptCallFrame.cpp \
</span><span class="cx"> Source/JavaScriptCore/inspector/JavaScriptCallFrame.h \
</span><ins>+ Source/JavaScriptCore/inspector/ScriptArguments.cpp \
+ Source/JavaScriptCore/inspector/ScriptArguments.h \
</ins><span class="cx"> Source/JavaScriptCore/inspector/ScriptBreakpoint.h \
</span><ins>+ Source/JavaScriptCore/inspector/ScriptCallFrame.cpp \
+ Source/JavaScriptCore/inspector/ScriptCallFrame.h \
+ Source/JavaScriptCore/inspector/ScriptCallStack.cpp \
+ Source/JavaScriptCore/inspector/ScriptCallStack.h \
+ Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp \
+ Source/JavaScriptCore/inspector/ScriptCallStackFactory.h \
</ins><span class="cx"> Source/JavaScriptCore/inspector/ScriptDebugListener.h \
</span><span class="cx"> Source/JavaScriptCore/inspector/ScriptDebugServer.cpp \
</span><span class="cx"> Source/JavaScriptCore/inspector/ScriptDebugServer.h \
</span><ins>+ Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp \
</ins><span class="cx"> Source/JavaScriptCore/inspector/agents/InspectorAgent.h \
</span><del>- Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp \
</del><ins>+ Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp \
+ Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h \
+ Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp \
</ins><span class="cx"> Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h \
</span><del>- Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp \
</del><ins>+ Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp \
</ins><span class="cx"> Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h \
</span><del>- Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp \
</del><span class="cx"> Source/JavaScriptCore/interpreter/AbstractPC.cpp \
</span><span class="cx"> Source/JavaScriptCore/interpreter/AbstractPC.h \
</span><span class="cx"> Source/JavaScriptCore/interpreter/CachedCall.h \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -476,7 +476,9 @@
</span><span class="cx"> <ClCompile Include="..\heap\WeakSet.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\WriteBarrierBuffer.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\WriteBarrierSupport.cpp" />
</span><ins>+ <ClCompile Include="..\inspector\ConsoleMessage.cpp" />
</ins><span class="cx"> <ClCompile Include="..\inspector\ContentSearchUtilities.cpp" />
</span><ins>+ <ClCompile Include="..\inspector\IdentifiersFactory.cpp" />
</ins><span class="cx"> <ClCompile Include="..\inspector\InjectedScript.cpp" />
</span><span class="cx"> <ClCompile Include="..\inspector\InjectedScriptBase.cpp" />
</span><span class="cx"> <ClCompile Include="..\inspector\InjectedScriptHost.cpp" />
</span><span class="lines">@@ -490,8 +492,13 @@
</span><span class="cx"> <ClCompile Include="..\inspector\JSJavaScriptCallFrame.cpp" />
</span><span class="cx"> <ClCompile Include="..\inspector\JSJavaScriptCallFramePrototype.cpp" />
</span><span class="cx"> <ClCompile Include="..\inspector\JavaScriptCallFrame.cpp" />
</span><ins>+ <ClCompile Include="..\inspector\ScriptArguments.cpp" />
+ <ClCompile Include="..\inspector\ScriptCallFrame.cpp" />
+ <ClCompile Include="..\inspector\ScriptCallStack.cpp" />
+ <ClCompile Include="..\inspector\ScriptCallStackFactory.cpp" />
</ins><span class="cx"> <ClCompile Include="..\inspector\ScriptDebugServer.cpp" />
</span><span class="cx"> <ClCompile Include="..\inspector\agents\InspectorAgent.cpp" />
</span><ins>+ <ClCompile Include="..\inspector\agents\InspectorConsoleAgent.cpp" />
</ins><span class="cx"> <ClCompile Include="..\inspector\agents\InspectorDebuggerAgent.cpp" />
</span><span class="cx"> <ClCompile Include="..\inspector\agents\InspectorRuntimeAgent.cpp" />
</span><span class="cx"> <ClCompile Include="..\interpreter\AbstractPC.cpp" />
</span><span class="lines">@@ -1054,7 +1061,10 @@
</span><span class="cx"> <ClInclude Include="..\heap\WeakSetInlines.h" />
</span><span class="cx"> <ClInclude Include="..\heap\WriteBarrierBuffer.h" />
</span><span class="cx"> <ClInclude Include="..\heap\WriteBarrierSupport.h" />
</span><ins>+ <ClInclude Include="..\inspector\ConsoleMessage.h" />
+ <ClInclude Include="..\inspector\ConsoleTypes.h" />
</ins><span class="cx"> <ClInclude Include="..\inspector\ContentSearchUtilities.h" />
</span><ins>+ <ClInclude Include="..\inspector\IdentifiersFactory.h" />
</ins><span class="cx"> <ClInclude Include="..\inspector\InjectedScript.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InjectedScriptBase.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InjectedScriptHost.h" />
</span><span class="lines">@@ -1072,10 +1082,15 @@
</span><span class="cx"> <ClInclude Include="..\inspector\JSJavaScriptCallFrame.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\JSJavaScriptCallFramePrototype.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\JavaScriptCallFrame.h" />
</span><ins>+ <ClInclude Include="..\inspector\ScriptArguments.h" />
</ins><span class="cx"> <ClInclude Include="..\inspector\ScriptBreakpoint.h" />
</span><ins>+ <ClInclude Include="..\inspector\ScriptCallFrame.h" />
+ <ClInclude Include="..\inspector\ScriptCallStack.h" />
+ <ClInclude Include="..\inspector\ScriptCallStackFactory.h" />
</ins><span class="cx"> <ClInclude Include="..\inspector\ScriptDebugListener.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\ScriptDebugServer.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\agents\InspectorAgent.h" />
</span><ins>+ <ClInclude Include="..\inspector\agents\InspectorConsoleAgent.h" />
</ins><span class="cx"> <ClInclude Include="..\inspector\agents\InspectorDebuggerAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\agents\InspectorRuntimeAgent.h" />
</span><span class="cx"> <ClInclude Include="..\interpreter\AbstractPC.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1013,6 +1013,23 @@
</span><span class="cx"> A5CEEE14187F3BAD00E55C99 /* InspectorAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5CEEE12187F3BAD00E55C99 /* InspectorAgent.cpp */; };
</span><span class="cx"> A5CEEE15187F3BAD00E55C99 /* InspectorAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CEEE13187F3BAD00E55C99 /* InspectorAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A5D0A1BB1862301B00C7B496 /* InspectorEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = A5D0A1BA1862301B00C7B496 /* InspectorEnvironment.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ A5FD0067189AFE9C00633231 /* ScriptArguments.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5FD0065189AFE9C00633231 /* ScriptArguments.cpp */; };
+ A5FD0068189AFE9C00633231 /* ScriptArguments.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD0066189AFE9C00633231 /* ScriptArguments.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A5FD006D189B00AA00633231 /* ScriptCallFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5FD0069189B00A900633231 /* ScriptCallFrame.cpp */; };
+ A5FD006E189B00AA00633231 /* ScriptCallFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD006A189B00A900633231 /* ScriptCallFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A5FD006F189B00AA00633231 /* ScriptCallStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5FD006B189B00A900633231 /* ScriptCallStack.cpp */; };
+ A5FD0070189B00AA00633231 /* ScriptCallStack.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD006C189B00AA00633231 /* ScriptCallStack.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A5FD0074189B038C00633231 /* ConsoleTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD0071189B038C00633231 /* ConsoleTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A5FD0075189B038C00633231 /* IdentifiersFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5FD0072189B038C00633231 /* IdentifiersFactory.cpp */; };
+ A5FD0076189B038C00633231 /* IdentifiersFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD0073189B038C00633231 /* IdentifiersFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A5FD0079189B051000633231 /* ConsoleMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5FD0077189B051000633231 /* ConsoleMessage.cpp */; };
+ A5FD007A189B051000633231 /* ConsoleMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD0078189B051000633231 /* ConsoleMessage.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A5FD007D189B0B4C00633231 /* ScriptCallStackFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5FD007B189B0B4C00633231 /* ScriptCallStackFactory.cpp */; };
+ A5FD007E189B0B4C00633231 /* ScriptCallStackFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD007C189B0B4C00633231 /* ScriptCallStackFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A5FD0081189B191A00633231 /* InspectorConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5FD007F189B191A00633231 /* InspectorConsoleAgent.cpp */; };
+ A5FD0082189B191A00633231 /* InspectorConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD0080189B191A00633231 /* InspectorConsoleAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A5FD0085189B1B7E00633231 /* JSGlobalObjectConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5FD0083189B1B7E00633231 /* JSGlobalObjectConsoleAgent.cpp */; };
+ A5FD0086189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD0084189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h */; };
</ins><span class="cx"> A700873917CBE85300C3E643 /* MapConstructor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A700873717CBE85300C3E643 /* MapConstructor.cpp */; };
</span><span class="cx"> A700873A17CBE85300C3E643 /* MapConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = A700873817CBE85300C3E643 /* MapConstructor.h */; };
</span><span class="cx"> A700873D17CBE8D300C3E643 /* MapPrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A700873B17CBE8D300C3E643 /* MapPrototype.cpp */; };
</span><span class="lines">@@ -2457,6 +2474,23 @@
</span><span class="cx"> A5CEEE12187F3BAD00E55C99 /* InspectorAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A5CEEE13187F3BAD00E55C99 /* InspectorAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorAgent.h; sourceTree = "<group>"; };
</span><span class="cx"> A5D0A1BA1862301B00C7B496 /* InspectorEnvironment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorEnvironment.h; sourceTree = "<group>"; };
</span><ins>+ A5FD0065189AFE9C00633231 /* ScriptArguments.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptArguments.cpp; sourceTree = "<group>"; };
+ A5FD0066189AFE9C00633231 /* ScriptArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptArguments.h; sourceTree = "<group>"; };
+ A5FD0069189B00A900633231 /* ScriptCallFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallFrame.cpp; sourceTree = "<group>"; };
+ A5FD006A189B00A900633231 /* ScriptCallFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallFrame.h; sourceTree = "<group>"; };
+ A5FD006B189B00A900633231 /* ScriptCallStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallStack.cpp; sourceTree = "<group>"; };
+ A5FD006C189B00AA00633231 /* ScriptCallStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallStack.h; sourceTree = "<group>"; };
+ A5FD0071189B038C00633231 /* ConsoleTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleTypes.h; sourceTree = "<group>"; };
+ A5FD0072189B038C00633231 /* IdentifiersFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IdentifiersFactory.cpp; sourceTree = "<group>"; };
+ A5FD0073189B038C00633231 /* IdentifiersFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdentifiersFactory.h; sourceTree = "<group>"; };
+ A5FD0077189B051000633231 /* ConsoleMessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsoleMessage.cpp; sourceTree = "<group>"; };
+ A5FD0078189B051000633231 /* ConsoleMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleMessage.h; sourceTree = "<group>"; };
+ A5FD007B189B0B4C00633231 /* ScriptCallStackFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallStackFactory.cpp; sourceTree = "<group>"; };
+ A5FD007C189B0B4C00633231 /* ScriptCallStackFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallStackFactory.h; sourceTree = "<group>"; };
+ A5FD007F189B191A00633231 /* InspectorConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorConsoleAgent.cpp; sourceTree = "<group>"; };
+ A5FD0080189B191A00633231 /* InspectorConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorConsoleAgent.h; sourceTree = "<group>"; };
+ A5FD0083189B1B7E00633231 /* JSGlobalObjectConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObjectConsoleAgent.cpp; sourceTree = "<group>"; };
+ A5FD0084189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGlobalObjectConsoleAgent.h; sourceTree = "<group>"; };
</ins><span class="cx"> A700873717CBE85300C3E643 /* MapConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MapConstructor.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A700873817CBE85300C3E643 /* MapConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapConstructor.h; sourceTree = "<group>"; };
</span><span class="cx"> A700873B17CBE8D300C3E643 /* MapPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MapPrototype.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4483,10 +4517,14 @@
</span><span class="cx"> children = (
</span><span class="cx"> A5CEEE12187F3BAD00E55C99 /* InspectorAgent.cpp */,
</span><span class="cx"> A5CEEE13187F3BAD00E55C99 /* InspectorAgent.h */,
</span><ins>+ A5FD007F189B191A00633231 /* InspectorConsoleAgent.cpp */,
+ A5FD0080189B191A00633231 /* InspectorConsoleAgent.h */,
</ins><span class="cx"> A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */,
</span><span class="cx"> A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */,
</span><span class="cx"> A50E4B5D18809DD50068A46D /* InspectorRuntimeAgent.cpp */,
</span><span class="cx"> A50E4B5E18809DD50068A46D /* InspectorRuntimeAgent.h */,
</span><ins>+ A5FD0083189B1B7E00633231 /* JSGlobalObjectConsoleAgent.cpp */,
+ A5FD0084189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h */,
</ins><span class="cx"> A57D23E71891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp */,
</span><span class="cx"> A57D23E81891B0770031C7FA /* JSGlobalObjectDebuggerAgent.h */,
</span><span class="cx"> A50E4B5F18809DD50068A46D /* JSGlobalObjectRuntimeAgent.cpp */,
</span><span class="lines">@@ -4529,10 +4567,15 @@
</span><span class="cx"> A513E5CC185FB992007E95AD /* agents */,
</span><span class="cx"> A5BA15E01823409D00A82E69 /* remote */,
</span><span class="cx"> A532438E185696CE002ED692 /* scripts */,
</span><ins>+ A5FD0077189B051000633231 /* ConsoleMessage.cpp */,
+ A5FD0078189B051000633231 /* ConsoleMessage.h */,
+ A5FD0071189B038C00633231 /* ConsoleTypes.h */,
</ins><span class="cx"> A57D23EF1891B5B40031C7FA /* ContentSearchUtilities.cpp */,
</span><span class="cx"> A57D23F01891B5B40031C7FA /* ContentSearchUtilities.h */,
</span><span class="cx"> A54982011891D0B00081E5B8 /* EventLoop.cpp */,
</span><span class="cx"> A54982021891D0B00081E5B8 /* EventLoop.h */,
</span><ins>+ A5FD0072189B038C00633231 /* IdentifiersFactory.cpp */,
+ A5FD0073189B038C00633231 /* IdentifiersFactory.h */,
</ins><span class="cx"> A513E5B5185B8BD3007E95AD /* InjectedScript.cpp */,
</span><span class="cx"> A513E5B6185B8BD3007E95AD /* InjectedScript.h */,
</span><span class="cx"> A514B2C0185A684400F3C7CB /* InjectedScriptBase.cpp */,
</span><span class="lines">@@ -4568,7 +4611,15 @@
</span><span class="cx"> A503FA18188E0FB000110F14 /* JSJavaScriptCallFramePrototype.h */,
</span><span class="cx"> A503FA13188E0FAF00110F14 /* JavaScriptCallFrame.cpp */,
</span><span class="cx"> A503FA14188E0FAF00110F14 /* JavaScriptCallFrame.h */,
</span><ins>+ A5FD0065189AFE9C00633231 /* ScriptArguments.cpp */,
+ A5FD0066189AFE9C00633231 /* ScriptArguments.h */,
</ins><span class="cx"> A503FA1F188EFF6800110F14 /* ScriptBreakpoint.h */,
</span><ins>+ A5FD0069189B00A900633231 /* ScriptCallFrame.cpp */,
+ A5FD006A189B00A900633231 /* ScriptCallFrame.h */,
+ A5FD006B189B00A900633231 /* ScriptCallStack.cpp */,
+ A5FD006C189B00AA00633231 /* ScriptCallStack.h */,
+ A5FD007B189B0B4C00633231 /* ScriptCallStackFactory.cpp */,
+ A5FD007C189B0B4C00633231 /* ScriptCallStackFactory.h */,
</ins><span class="cx"> A503FA20188EFF6800110F14 /* ScriptDebugListener.h */,
</span><span class="cx"> A503FA23188EFFFD00110F14 /* ScriptDebugServer.cpp */,
</span><span class="cx"> A503FA24188EFFFD00110F14 /* ScriptDebugServer.h */,
</span><span class="lines">@@ -4726,6 +4777,7 @@
</span><span class="cx"> 0F6B1CC61862C47800845D97 /* FTLUnwindInfo.h in Headers */,
</span><span class="cx"> C2239D1816262BDD005AC5FD /* CopyVisitor.h in Headers */,
</span><span class="cx"> C2239D1916262BDD005AC5FD /* CopyVisitorInlines.h in Headers */,
</span><ins>+ A5FD007A189B051000633231 /* ConsoleMessage.h in Headers */,
</ins><span class="cx"> C218D1401655CFD50062BB81 /* CopyWorkList.h in Headers */,
</span><span class="cx"> 5DE6E5B30E1728EC00180407 /* create_hash_table in Headers */,
</span><span class="cx"> 0F426A4B1460CD6E00131F8F /* DataFormat.h in Headers */,
</span><span class="lines">@@ -4762,6 +4814,7 @@
</span><span class="cx"> 0FFB921A16D02EC50055A5DB /* DFGBasicBlockInlines.h in Headers */,
</span><span class="cx"> A70B083317A0B79B00DAF14B /* DFGBinarySwitch.h in Headers */,
</span><span class="cx"> A7D89CF417A0B8CC00773AD8 /* DFGBlockInsertionSet.h in Headers */,
</span><ins>+ A5FD006E189B00AA00633231 /* ScriptCallFrame.h in Headers */,
</ins><span class="cx"> 0F8364B7164B0C110053329A /* DFGBranchDirection.h in Headers */,
</span><span class="cx"> A1A009C01831A22D00CF8711 /* MacroAssemblerARM64.h in Headers */,
</span><span class="cx"> 86EC9DC51328DF82002B2AD7 /* DFGByteCodeParser.h in Headers */,
</span><span class="lines">@@ -4779,6 +4832,7 @@
</span><span class="cx"> A503FA1E188E0FB000110F14 /* JSJavaScriptCallFramePrototype.h in Headers */,
</span><span class="cx"> 0F38B01A17CFE75500B144D3 /* DFGCompilationMode.h in Headers */,
</span><span class="cx"> 0F3B3A1B153E68F4003ED0FF /* DFGConstantFoldingPhase.h in Headers */,
</span><ins>+ A5FD0082189B191A00633231 /* InspectorConsoleAgent.h in Headers */,
</ins><span class="cx"> 0FBE0F7316C1DB050082C5E8 /* DFGCPSRethreadingPhase.h in Headers */,
</span><span class="cx"> A7D89CF617A0B8CC00773AD8 /* DFGCriticalEdgeBreakingPhase.h in Headers */,
</span><span class="cx"> 0FFFC95A14EF90A900C72532 /* DFGCSEPhase.h in Headers */,
</span><span class="lines">@@ -4826,6 +4880,7 @@
</span><span class="cx"> 0F2BDC451522801B00CD8910 /* DFGMinifiedGraph.h in Headers */,
</span><span class="cx"> 0F2E892D16D02BAF009E4FD2 /* DFGMinifiedID.h in Headers */,
</span><span class="cx"> 0F2BDC461522802000CD8910 /* DFGMinifiedNode.h in Headers */,
</span><ins>+ A5FD0068189AFE9C00633231 /* ScriptArguments.h in Headers */,
</ins><span class="cx"> A737810E1799EA2E00817533 /* DFGNaturalLoops.h in Headers */,
</span><span class="cx"> 86ECA3EA132DEF1C002B2AD7 /* DFGNode.h in Headers */,
</span><span class="cx"> 0FFB921B16D02F010055A5DB /* DFGNodeAllocator.h in Headers */,
</span><span class="lines">@@ -4874,6 +4929,7 @@
</span><span class="cx"> 0F2BDC481522802900CD8910 /* DFGValueSource.h in Headers */,
</span><span class="cx"> 0F620174143FCD330068B77C /* DFGVariableAccessData.h in Headers */,
</span><span class="cx"> 0FDDBFB61666EEDA00C55FEF /* DFGVariableAccessDataDump.h in Headers */,
</span><ins>+ A5FD0074189B038C00633231 /* ConsoleTypes.h in Headers */,
</ins><span class="cx"> 0F2BDC491522809600CD8910 /* DFGVariableEvent.h in Headers */,
</span><span class="cx"> 0F2BDC4B1522809D00CD8910 /* DFGVariableEventStream.h in Headers */,
</span><span class="cx"> A514B2C3185A684400F3C7CB /* InjectedScriptBase.h in Headers */,
</span><span class="lines">@@ -4923,6 +4979,7 @@
</span><span class="cx"> 0FEA0A241709606900BB722C /* FTLIntrinsicRepository.h in Headers */,
</span><span class="cx"> 0FEA0A0E170513DB00BB722C /* FTLJITCode.h in Headers */,
</span><span class="cx"> A78A9781179738D5009DF744 /* FTLJITFinalizer.h in Headers */,
</span><ins>+ A5FD0076189B038C00633231 /* IdentifiersFactory.h in Headers */,
</ins><span class="cx"> 0F5A6284188C98D40072C9DF /* FTLValueRange.h in Headers */,
</span><span class="cx"> 0F8F2B96172E04A3007DBDA5 /* FTLLink.h in Headers */,
</span><span class="cx"> 0FCEFAE0180738C000472CE4 /* FTLLocation.h in Headers */,
</span><span class="lines">@@ -5021,6 +5078,7 @@
</span><span class="cx"> A7A4AE1017973B4D005612B1 /* JITStubsX86Common.h in Headers */,
</span><span class="cx"> 0F5EF91F16878F7D003E5C25 /* JITThunks.h in Headers */,
</span><span class="cx"> 0FC712E317CD8793008CC93C /* JITToDFGDeferredCompilationCallback.h in Headers */,
</span><ins>+ A5FD0070189B00AA00633231 /* ScriptCallStack.h in Headers */,
</ins><span class="cx"> A76F54A313B28AAB00EF2BCE /* JITWriteBarrier.h in Headers */,
</span><span class="cx"> BC18C4160E16F5CD00B34460 /* JSActivation.h in Headers */,
</span><span class="cx"> 0F6B1CB91861244C00845D97 /* ArityCheckMode.h in Headers */,
</span><span class="lines">@@ -5197,6 +5255,7 @@
</span><span class="cx"> BC02E9110E1839DB000F9297 /* NativeErrorConstructor.h in Headers */,
</span><span class="cx"> BC02E9130E1839DB000F9297 /* NativeErrorPrototype.h in Headers */,
</span><span class="cx"> 0FFB922016D033B70055A5DB /* NodeConstructors.h in Headers */,
</span><ins>+ A5FD007E189B0B4C00633231 /* ScriptCallStackFactory.h in Headers */,
</ins><span class="cx"> 7EFF00640EC05A9A00AA7C93 /* NodeInfo.h in Headers */,
</span><span class="cx"> BC18C43F0E16F5CD00B34460 /* Nodes.h in Headers */,
</span><span class="cx"> BC18C4410E16F5CD00B34460 /* NumberConstructor.h in Headers */,
</span><span class="lines">@@ -5347,6 +5406,7 @@
</span><span class="cx"> A7A8AF4117ADB5F3005AB174 /* Uint16Array.h in Headers */,
</span><span class="cx"> 866739D313BFDE710023D87C /* Uint16WithFraction.h in Headers */,
</span><span class="cx"> A7A8AF4217ADB5F3005AB174 /* Uint32Array.h in Headers */,
</span><ins>+ A5FD0086189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h in Headers */,
</ins><span class="cx"> A7A8AF3F17ADB5F3005AB174 /* Uint8Array.h in Headers */,
</span><span class="cx"> A7A8AF4017ADB5F3005AB174 /* Uint8ClampedArray.h in Headers */,
</span><span class="cx"> 0F5F08CF146C7633000472A9 /* UnconditionalFinalizer.h in Headers */,
</span><span class="lines">@@ -5820,6 +5880,7 @@
</span><span class="cx"> A790DD6F182F499700588807 /* JSSetIterator.cpp in Sources */,
</span><span class="cx"> 0F63945415D07055006A597C /* ArrayProfile.cpp in Sources */,
</span><span class="cx"> 147F39C0107EC37600427A48 /* ArrayPrototype.cpp in Sources */,
</span><ins>+ A5FD006D189B00AA00633231 /* ScriptCallFrame.cpp in Sources */,
</ins><span class="cx"> 0F24E54017EA9F5900ABB217 /* AssemblyHelpers.cpp in Sources */,
</span><span class="cx"> 14816E1B154CC56C00B8054C /* BlockAllocator.cpp in Sources */,
</span><span class="cx"> 14280863107EC11A0013E7B2 /* BooleanConstructor.cpp in Sources */,
</span><span class="lines">@@ -5973,6 +6034,7 @@
</span><span class="cx"> 147F39C8107EC37600427A48 /* ErrorConstructor.cpp in Sources */,
</span><span class="cx"> 147F39C9107EC37600427A48 /* ErrorInstance.cpp in Sources */,
</span><span class="cx"> 147F39CA107EC37600427A48 /* ErrorPrototype.cpp in Sources */,
</span><ins>+ A5FD0067189AFE9C00633231 /* ScriptArguments.cpp in Sources */,
</ins><span class="cx"> 1429D8780ED21ACD00B89619 /* ExceptionHelpers.cpp in Sources */,
</span><span class="cx"> 86CA032E1038E8440028A609 /* Executable.cpp in Sources */,
</span><span class="cx"> A7B48F490EE8936F00DCBDB6 /* ExecutableAllocator.cpp in Sources */,
</span><span class="lines">@@ -6001,6 +6063,7 @@
</span><span class="cx"> A78A9780179738D5009DF744 /* FTLJITFinalizer.cpp in Sources */,
</span><span class="cx"> 0F8F2B95172E04A0007DBDA5 /* FTLLink.cpp in Sources */,
</span><span class="cx"> A74DEF95182D991400522C22 /* JSMapIterator.cpp in Sources */,
</span><ins>+ A5FD0081189B191A00633231 /* InspectorConsoleAgent.cpp in Sources */,
</ins><span class="cx"> 0FCEFADF180738C000472CE4 /* FTLLocation.cpp in Sources */,
</span><span class="cx"> 0FEA0A0F170513DB00BB722C /* FTLLowerDFGToLLVM.cpp in Sources */,
</span><span class="cx"> 0FD8A31B17D51F2200CA2C40 /* FTLOSREntry.cpp in Sources */,
</span><span class="lines">@@ -6091,7 +6154,9 @@
</span><span class="cx"> 86E3C616167BABEE006D760A /* JSContext.mm in Sources */,
</span><span class="cx"> 14BD5A300A3E91F600BAF59C /* JSContextRef.cpp in Sources */,
</span><span class="cx"> A72028B61797601E0098028C /* JSCTestRunnerUtils.cpp in Sources */,
</span><ins>+ A5FD0075189B038C00633231 /* IdentifiersFactory.cpp in Sources */,
</ins><span class="cx"> B59F89391891F29F00D5CCDC /* UnlinkedInstructionStream.cpp in Sources */,
</span><ins>+ A5FD006F189B00AA00633231 /* ScriptCallStack.cpp in Sources */,
</ins><span class="cx"> 0F2B66EB17B6B5AB00A7AE3F /* JSDataView.cpp in Sources */,
</span><span class="cx"> 0F2B66ED17B6B5AB00A7AE3F /* JSDataViewPrototype.cpp in Sources */,
</span><span class="cx"> 978801401471AD920041B016 /* JSDateMath.cpp in Sources */,
</span><span class="lines">@@ -6200,6 +6265,7 @@
</span><span class="cx"> 148F21BC107EC54D0042EC2C /* Parser.cpp in Sources */,
</span><span class="cx"> 93052C340FB792190048FDC3 /* ParserArena.cpp in Sources */,
</span><span class="cx"> 0F9FC8C314E1B5FE00D52AE0 /* PolymorphicPutByIdList.cpp in Sources */,
</span><ins>+ A5FD0085189B1B7E00633231 /* JSGlobalObjectConsoleAgent.cpp in Sources */,
</ins><span class="cx"> 0F98206016BFE38100240D02 /* PreciseJumpTargets.cpp in Sources */,
</span><span class="cx"> 95742F650DD11F5A000917FB /* Profile.cpp in Sources */,
</span><span class="cx"> 0FC97F35182020D7002C9B26 /* ProfiledCodeBlockJettisoningWatchpoint.cpp in Sources */,
</span><span class="lines">@@ -6247,6 +6313,7 @@
</span><span class="cx"> C225494315F7DBAA0065E898 /* SlotVisitor.cpp in Sources */,
</span><span class="cx"> 9330402C0E6A764000786E6A /* SmallStrings.cpp in Sources */,
</span><span class="cx"> 0F8F2B9E17306C8D007DBDA5 /* SourceCode.cpp in Sources */,
</span><ins>+ A5FD0079189B051000633231 /* ConsoleMessage.cpp in Sources */,
</ins><span class="cx"> 0F493AFA16D0CAD30084508B /* SourceProvider.cpp in Sources */,
</span><span class="cx"> E49DC16B12EF293E00184A1F /* SourceProviderCache.cpp in Sources */,
</span><span class="cx"> 0F6B1CC918641DF800845D97 /* ArityCheckFailReturnThunks.cpp in Sources */,
</span><span class="lines">@@ -6269,6 +6336,7 @@
</span><span class="cx"> C2DF442F1707AC0100A5CA96 /* SuperRegion.cpp in Sources */,
</span><span class="cx"> 0F919D2815856773004A4E7D /* SymbolTable.cpp in Sources */,
</span><span class="cx"> 0FC314131814559100033232 /* TempRegisterSet.cpp in Sources */,
</span><ins>+ A5FD007D189B0B4C00633231 /* ScriptCallStackFactory.cpp in Sources */,
</ins><span class="cx"> 0FA2C17B17D7CF84009D015F /* TestRunnerUtils.cpp in Sources */,
</span><span class="cx"> A7386555118697B400540279 /* ThunkGenerators.cpp in Sources */,
</span><span class="cx"> 0F2B670717B6B5AB00A7AE3F /* TypedArrayController.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessagecppfromrev163567trunkSourceWebCoreinspectorConsoleMessagecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp (from rev 163567, trunk/Source/WebCore/inspector/ConsoleMessage.cpp) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,299 @@
</span><ins>+/*
+ * Copyright (C) 2007, 2008, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
+ * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ConsoleMessage.h"
+
+#if ENABLE(INSPECTOR)
+
+#include "IdentifiersFactory.h"
+#include "InjectedScript.h"
+#include "InjectedScriptManager.h"
+#include "InspectorValues.h"
+#include "ScriptArguments.h"
+#include "ScriptCallFrame.h"
+#include "ScriptCallStack.h"
+#include "ScriptCallStackFactory.h"
+#include "ScriptValue.h"
+
+namespace Inspector {
+
+ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned long requestIdentifier)
+ : m_source(source)
+ , m_type(type)
+ , m_level(level)
+ , m_message(message)
+ , m_url()
+ , m_line(0)
+ , m_column(0)
+ , m_repeatCount(1)
+ , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
+{
+ autogenerateMetadata(canGenerateCallStack);
+}
+
+ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& url, unsigned line, unsigned column, JSC::ExecState* state, unsigned long requestIdentifier)
+ : m_source(source)
+ , m_type(type)
+ , m_level(level)
+ , m_message(message)
+ , m_url(url)
+ , m_line(line)
+ , m_column(column)
+ , m_repeatCount(1)
+ , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
+{
+ autogenerateMetadata(canGenerateCallStack, state);
+}
+
+ConsoleMessage::ConsoleMessage(bool, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
+ : m_source(source)
+ , m_type(type)
+ , m_level(level)
+ , m_message(message)
+ , m_arguments(nullptr)
+ , m_line(0)
+ , m_column(0)
+ , m_repeatCount(1)
+ , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
+{
+ if (callStack && callStack->size()) {
+ const ScriptCallFrame& frame = callStack->at(0);
+ m_url = frame.sourceURL();
+ m_line = frame.lineNumber();
+ m_column = frame.columnNumber();
+ }
+ m_callStack = callStack;
+}
+
+ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptArguments> arguments, JSC::ExecState* state, unsigned long requestIdentifier)
+ : m_source(source)
+ , m_type(type)
+ , m_level(level)
+ , m_message(message)
+ , m_arguments(arguments)
+ , m_url()
+ , m_line(0)
+ , m_column(0)
+ , m_repeatCount(1)
+ , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
+{
+ autogenerateMetadata(canGenerateCallStack, state);
+}
+
+ConsoleMessage::~ConsoleMessage()
+{
+}
+
+// FIXME: Remove the generate without ExecState path. The caller should always provide an ExecState.
+void ConsoleMessage::autogenerateMetadata(bool /*canGenerateCallStack*/, JSC::ExecState* state)
+{
+ if (m_type == MessageType::EndGroup)
+ return;
+
+ if (state)
+ m_callStack = createScriptCallStackForConsole(state);
+ // else if (canGenerateCallStack)
+ // m_callStack = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture, true);
+ else
+ return;
+
+ if (m_callStack && m_callStack->size()) {
+ const ScriptCallFrame& frame = m_callStack->at(0);
+ m_url = frame.sourceURL();
+ m_line = frame.lineNumber();
+ m_column = frame.columnNumber();
+ return;
+ }
+
+ m_callStack.clear();
+}
+
+static Inspector::TypeBuilder::Console::ConsoleMessage::Source::Enum messageSourceValue(MessageSource source)
+{
+ switch (source) {
+ case MessageSource::XML: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::XML;
+ case MessageSource::JS: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Javascript;
+ case MessageSource::Network: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Network;
+ case MessageSource::ConsoleAPI: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::ConsoleAPI;
+ case MessageSource::Storage: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Storage;
+ case MessageSource::AppCache: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Appcache;
+ case MessageSource::Rendering: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Rendering;
+ case MessageSource::CSS: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::CSS;
+ case MessageSource::Security: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Security;
+ case MessageSource::Other: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Other;
+ }
+ return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Other;
+}
+
+static Inspector::TypeBuilder::Console::ConsoleMessage::Type::Enum messageTypeValue(MessageType type)
+{
+ switch (type) {
+ case MessageType::Log: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Log;
+ case MessageType::Clear: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Clear;
+ case MessageType::Dir: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Dir;
+ case MessageType::DirXML: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::DirXML;
+ case MessageType::Table: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Table;
+ case MessageType::Trace: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Trace;
+ case MessageType::StartGroup: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::StartGroup;
+ case MessageType::StartGroupCollapsed: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::StartGroupCollapsed;
+ case MessageType::EndGroup: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::EndGroup;
+ case MessageType::Assert: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Assert;
+ case MessageType::Timing: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Timing;
+ case MessageType::Profile: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Profile;
+ case MessageType::ProfileEnd: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::ProfileEnd;
+ }
+ return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Log;
+}
+
+static Inspector::TypeBuilder::Console::ConsoleMessage::Level::Enum messageLevelValue(MessageLevel level)
+{
+ switch (level) {
+ case MessageLevel::Log: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Log;
+ case MessageLevel::Warning: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Warning;
+ case MessageLevel::Error: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Error;
+ case MessageLevel::Debug: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Debug;
+ }
+ return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Log;
+}
+
+void ConsoleMessage::addToFrontend(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher, Inspector::InjectedScriptManager* injectedScriptManager, bool generatePreview)
+{
+ RefPtr<Inspector::TypeBuilder::Console::ConsoleMessage> jsonObj = Inspector::TypeBuilder::Console::ConsoleMessage::create()
+ .setSource(messageSourceValue(m_source))
+ .setLevel(messageLevelValue(m_level))
+ .setText(m_message);
+
+ // FIXME: only send out type for ConsoleAPI source messages.
+ jsonObj->setType(messageTypeValue(m_type));
+ jsonObj->setLine(static_cast<int>(m_line));
+ jsonObj->setColumn(static_cast<int>(m_column));
+ jsonObj->setUrl(m_url);
+ jsonObj->setRepeatCount(static_cast<int>(m_repeatCount));
+
+ if (m_source == MessageSource::Network && !m_requestId.isEmpty())
+ jsonObj->setNetworkRequestId(m_requestId);
+
+ if (m_arguments && m_arguments->argumentCount()) {
+ InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState());
+ if (!injectedScript.hasNoValue()) {
+ RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::RemoteObject>> jsonArgs = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::RemoteObject>::create();
+ if (m_type == MessageType::Table && generatePreview && m_arguments->argumentCount()) {
+ Deprecated::ScriptValue table = m_arguments->argumentAt(0);
+ Deprecated::ScriptValue columns = m_arguments->argumentCount() > 1 ? m_arguments->argumentAt(1) : Deprecated::ScriptValue();
+ RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapTable(table, columns);
+ if (!inspectorValue) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
+ jsonArgs->addItem(inspectorValue);
+ } else {
+ for (unsigned i = 0; i < m_arguments->argumentCount(); ++i) {
+ RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), "console", generatePreview);
+ if (!inspectorValue) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
+ jsonArgs->addItem(inspectorValue);
+ }
+ }
+ jsonObj->setParameters(jsonArgs);
+ }
+ }
+
+ if (m_callStack)
+ jsonObj->setStackTrace(m_callStack->buildInspectorArray());
+
+ consoleFrontendDispatcher->messageAdded(jsonObj);
+}
+
+void ConsoleMessage::updateRepeatCountInConsole(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher)
+{
+ consoleFrontendDispatcher->messageRepeatCountUpdated(m_repeatCount);
+}
+
+bool ConsoleMessage::isEqual(ConsoleMessage* msg) const
+{
+ if (m_arguments) {
+ if (!m_arguments->isEqual(msg->m_arguments.get()))
+ return false;
+
+ // Never treat objects as equal - their properties might change over time.
+ for (size_t i = 0; i < m_arguments->argumentCount(); ++i) {
+ if (m_arguments->argumentAt(i).isObject())
+ return false;
+ }
+ } else if (msg->m_arguments)
+ return false;
+
+ if (m_callStack) {
+ if (!m_callStack->isEqual(msg->m_callStack.get()))
+ return false;
+ } else if (msg->m_callStack)
+ return false;
+
+ return msg->m_source == m_source
+ && msg->m_type == m_type
+ && msg->m_level == m_level
+ && msg->m_message == m_message
+ && msg->m_line == m_line
+ && msg->m_column == m_column
+ && msg->m_url == m_url
+ && msg->m_requestId == m_requestId;
+}
+
+void ConsoleMessage::clear()
+{
+ if (!m_message)
+ m_message = ASCIILiteral("<message collected>");
+
+ if (m_arguments)
+ m_arguments.clear();
+}
+
+JSC::ExecState* ConsoleMessage::scriptState() const
+{
+ if (m_arguments)
+ return m_arguments->globalState();
+
+ return nullptr;
+}
+
+unsigned ConsoleMessage::argumentCount() const
+{
+ if (m_arguments)
+ return m_arguments->argumentCount();
+
+ return 0;
+}
+
+} // namespace Inspector
+
+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessagehfromrev163567trunkSourceWebCoreinspectorConsoleMessageh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h (from rev 163567, trunk/Source/WebCore/inspector/ConsoleMessage.h) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,96 @@
</span><ins>+/*
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
+ * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ConsoleMessage_h
+#define ConsoleMessage_h
+
+#if ENABLE(INSPECTOR)
+
+#include "ConsoleTypes.h"
+#include "InspectorJSFrontendDispatchers.h"
+#include <wtf/Forward.h>
+
+namespace JSC {
+class ExecState;
+}
+
+namespace Inspector {
+
+class InjectedScriptManager;
+class ScriptArguments;
+class ScriptCallStack;
+
+class JS_EXPORT_PRIVATE ConsoleMessage {
+ WTF_MAKE_NONCOPYABLE(ConsoleMessage);
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, unsigned long requestIdentifier = 0);
+ ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, const String& url, unsigned line, unsigned column, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
+ ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0);
+ ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, JSC::ExecState*, unsigned long requestIdentifier = 0);
+ ~ConsoleMessage();
+
+ void addToFrontend(InspectorConsoleFrontendDispatcher*, InjectedScriptManager*, bool generatePreview);
+ void updateRepeatCountInConsole(InspectorConsoleFrontendDispatcher*);
+
+ MessageSource source() const { return m_source; }
+ const String& message() const { return m_message; }
+ MessageType type() const { return m_type; }
+ JSC::ExecState* scriptState() const;
+
+ void incrementCount() { ++m_repeatCount; }
+
+ unsigned argumentCount() const;
+
+ bool isEqual(ConsoleMessage* msg) const;
+
+ void clear();
+
+private:
+ void autogenerateMetadata(bool canGenerateCallStack, JSC::ExecState* = nullptr);
+
+ MessageSource m_source;
+ MessageType m_type;
+ MessageLevel m_level;
+ String m_message;
+ RefPtr<ScriptArguments> m_arguments;
+ RefPtr<ScriptCallStack> m_callStack;
+ String m_url;
+ unsigned m_line;
+ unsigned m_column;
+ unsigned m_repeatCount;
+ String m_requestId;
+};
+
+} // namespace Inspector
+
+#endif // ConsoleMessage_h
+
+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleTypeshfromrev163567trunkSourceWebCoreinspectorConsoleAPITypesh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ConsoleTypes.h (from rev 163567, trunk/Source/WebCore/inspector/ConsoleAPITypes.h) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleTypes.h (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleTypes.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+/*
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ConsoleTypes_h
+#define ConsoleTypes_h
+
+namespace Inspector {
+
+enum class MessageSource {
+ XML,
+ JS,
+ Network,
+ ConsoleAPI,
+ Storage,
+ AppCache,
+ Rendering,
+ CSS,
+ Security,
+ Other,
+};
+
+enum class MessageType {
+ Log,
+ Dir,
+ DirXML,
+ Table,
+ Trace,
+ StartGroup,
+ StartGroupCollapsed,
+ EndGroup,
+ Clear,
+ Assert,
+ Timing,
+ Profile,
+ ProfileEnd,
+};
+
+enum class MessageLevel {
+ Log = 1,
+ Warning = 2,
+ Error = 3,
+ Debug = 4,
+};
+
+} // namespace Inspector
+
+// These will likely move out of the inspector namespace.
+using Inspector::MessageSource;
+using Inspector::MessageType;
+using Inspector::MessageLevel;
+
+#endif // ConsoleTypes_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorIdentifiersFactorycppfromrev163567trunkSourceWebCoreinspectorIdentifiersFactorycpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp (from rev 163567, trunk/Source/WebCore/inspector/IdentifiersFactory.cpp) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "IdentifiersFactory.h"
+
+#if ENABLE(INSPECTOR)
+
+#include <wtf/text/StringBuilder.h>
+
+namespace Inspector {
+
+namespace {
+static long s_lastUsedIdentifier = 0;
+}
+
+long IdentifiersFactory::s_processId = 0;
+
+String IdentifiersFactory::createIdentifier()
+{
+ return addProcessIdPrefixTo(String::number(++s_lastUsedIdentifier));
+}
+
+String IdentifiersFactory::requestId(unsigned long identifier)
+{
+ if (identifier)
+ return addProcessIdPrefixTo(String::number(identifier));
+ return String();
+}
+
+String IdentifiersFactory::addProcessIdPrefixTo(const String& id)
+{
+ StringBuilder builder;
+ builder.appendNumber(s_processId);
+ builder.append('.');
+ builder.append(id);
+ return builder.toString();
+}
+
+} // namespace Inspector
+
+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorIdentifiersFactoryhfromrev163567trunkSourceWebCoreinspectorIdentifiersFactoryh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/IdentifiersFactory.h (from rev 163567, trunk/Source/WebCore/inspector/IdentifiersFactory.h) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/IdentifiersFactory.h (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/IdentifiersFactory.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef IdentifiersFactory_h
+#define IdentifiersFactory_h
+
+#if ENABLE(INSPECTOR)
+
+#include <wtf/text/WTFString.h>
+
+namespace Inspector {
+
+class JS_EXPORT_PRIVATE IdentifiersFactory {
+public:
+ static void setProcessId(long processId) { s_processId = processId; }
+ static String createIdentifier();
+ static String requestId(unsigned long identifier);
+
+private:
+ static String addProcessIdPrefixTo(const String& id);
+
+ static long s_processId;
+};
+
+} // namespace Inspector
+
+#endif // !defined(IdentifiersFactory_h)
+
+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "InspectorBackendDispatcher.h"
</span><span class="cx"> #include "InspectorFrontendChannel.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><ins>+#include "JSGlobalObjectConsoleAgent.h"
</ins><span class="cx"> #include "JSGlobalObjectDebuggerAgent.h"
</span><span class="cx"> #include "JSGlobalObjectRuntimeAgent.h"
</span><span class="cx">
</span><span class="lines">@@ -53,7 +54,11 @@
</span><span class="cx"> InspectorRuntimeAgent* runtimeAgent = runtimeAgentPtr.get();
</span><span class="cx"> m_agents.append(std::move(runtimeAgentPtr));
</span><span class="cx">
</span><del>- auto debuggerAgentPtr = std::make_unique<JSGlobalObjectDebuggerAgent>(m_injectedScriptManager.get(), m_globalObject);
</del><ins>+ auto consoleAgentPtr = std::make_unique<JSGlobalObjectConsoleAgent>(m_injectedScriptManager.get());
+ InspectorConsoleAgent* consoleAgent = consoleAgentPtr.get();
+ m_agents.append(std::move(consoleAgentPtr));
+
+ auto debuggerAgentPtr = std::make_unique<JSGlobalObjectDebuggerAgent>(m_injectedScriptManager.get(), m_globalObject, consoleAgent);
</ins><span class="cx"> InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
</span><span class="cx"> m_agents.append(std::move(debuggerAgentPtr));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptArgumentscppfromrev163567trunkSourceWebCoreinspectorScriptArgumentscpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ScriptArguments.cpp (from rev 163567, trunk/Source/WebCore/inspector/ScriptArguments.cpp) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptArguments.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ScriptArguments.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ScriptArguments.h"
+
+#include "ScriptValue.h"
+
+namespace Inspector {
+
+PassRefPtr<ScriptArguments> ScriptArguments::create(JSC::ExecState* scriptState, Vector<Deprecated::ScriptValue>& arguments)
+{
+ return adoptRef(new ScriptArguments(scriptState, arguments));
+}
+
+ScriptArguments::ScriptArguments(JSC::ExecState* execState, Vector<Deprecated::ScriptValue>& arguments)
+ : m_globalObject(execState->vm(), execState->lexicalGlobalObject())
+{
+ m_arguments.swap(arguments);
+}
+
+ScriptArguments::~ScriptArguments()
+{
+}
+
+const Deprecated::ScriptValue &ScriptArguments::argumentAt(size_t index) const
+{
+ ASSERT(m_arguments.size() > index);
+ return m_arguments[index];
+}
+
+JSC::ExecState* ScriptArguments::globalState() const
+{
+ if (m_globalObject)
+ return const_cast<JSC::JSGlobalObject*>(m_globalObject.get())->globalExec();
+
+ return nullptr;
+}
+
+bool ScriptArguments::getFirstArgumentAsString(String& result, bool checkForNullOrUndefined)
+{
+ if (!argumentCount())
+ return false;
+
+ const Deprecated::ScriptValue& value = argumentAt(0);
+ if (checkForNullOrUndefined && (value.isNull() || value.isUndefined()))
+ return false;
+
+ if (!globalState()) {
+ ASSERT_NOT_REACHED();
+ return false;
+ }
+
+ result = value.toString(globalState());
+ return true;
+}
+
+bool ScriptArguments::isEqual(ScriptArguments* other) const
+{
+ if (!other)
+ return false;
+
+ if (m_arguments.size() != other->m_arguments.size())
+ return false;
+ if (!globalState() && m_arguments.size())
+ return false;
+
+ for (size_t i = 0; i < m_arguments.size(); ++i) {
+ if (!m_arguments[i].isEqual(other->globalState(), other->m_arguments[i]))
+ return false;
+ }
+
+ return true;
+}
+
+} // namespace Inspector
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptArgumentshfromrev163567trunkSourceWebCoreinspectorScriptArgumentsh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ScriptArguments.h (from rev 163567, trunk/Source/WebCore/inspector/ScriptArguments.h) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptArguments.h (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ScriptArguments.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ScriptArguments_h
+#define ScriptArguments_h
+
+#include <heap/Strong.h>
+#include <wtf/Forward.h>
+#include <wtf/RefCounted.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace Deprecated {
+class ScriptValue;
+}
+
+namespace JSC {
+class ExecState;
+class JSGlobalObject;
+}
+
+namespace Inspector {
+
+class JS_EXPORT_PRIVATE ScriptArguments : public RefCounted<ScriptArguments> {
+public:
+ static PassRefPtr<ScriptArguments> create(JSC::ExecState*, Vector<Deprecated::ScriptValue>& arguments);
+ ~ScriptArguments();
+
+ const Deprecated::ScriptValue& argumentAt(size_t) const;
+ size_t argumentCount() const { return m_arguments.size(); }
+
+ JSC::ExecState* globalState() const;
+
+ bool getFirstArgumentAsString(String& result, bool checkForNullOrUndefined = false);
+ bool isEqual(ScriptArguments*) const;
+
+private:
+ ScriptArguments(JSC::ExecState*, Vector<Deprecated::ScriptValue>& arguments);
+
+ JSC::Strong<JSC::JSGlobalObject> m_globalObject;
+ Vector<Deprecated::ScriptValue> m_arguments;
+};
+
+} // namespace Inspector
+
+#endif // ScriptArguments_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallFramecppfromrev163567trunkSourceWebCoreinspectorScriptCallFramecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp (from rev 163567, trunk/Source/WebCore/inspector/ScriptCallFrame.cpp) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ScriptCallFrame.h"
+
+#include "InspectorValues.h"
+#include <wtf/PassRefPtr.h>
+
+namespace Inspector {
+
+ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scriptName, unsigned lineNumber, unsigned column)
+ : m_functionName(functionName)
+ , m_scriptName(scriptName)
+ , m_lineNumber(lineNumber)
+ , m_column(column)
+{
+}
+
+ScriptCallFrame::~ScriptCallFrame()
+{
+}
+
+bool ScriptCallFrame::isEqual(const ScriptCallFrame& o) const
+{
+ return m_functionName == o.m_functionName
+ && m_scriptName == o.m_scriptName
+ && m_lineNumber == o.m_lineNumber
+ && m_column == o.m_column;
+}
+
+#if ENABLE(INSPECTOR)
+PassRefPtr<Inspector::TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObject() const
+{
+ return Inspector::TypeBuilder::Console::CallFrame::create()
+ .setFunctionName(m_functionName)
+ .setUrl(m_scriptName)
+ .setLineNumber(m_lineNumber)
+ .setColumnNumber(m_column)
+ .release();
+}
+#endif
+
+} // namespace Inspector
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallFramehfromrev163567trunkSourceWebCoreinspectorScriptCallFrameh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h (from rev 163567, trunk/Source/WebCore/inspector/ScriptCallFrame.h) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ScriptCallFrame_h
+#define ScriptCallFrame_h
+
+#include <wtf/Forward.h>
+#include <wtf/text/WTFString.h>
+
+#if ENABLE(INSPECTOR)
+#include "InspectorJSTypeBuilders.h"
+#endif
+
+namespace Inspector {
+
+class JS_EXPORT_PRIVATE ScriptCallFrame {
+public:
+ ScriptCallFrame(const String& functionName, const String& scriptName, unsigned lineNumber, unsigned column);
+ ~ScriptCallFrame();
+
+ const String& functionName() const { return m_functionName; }
+ const String& sourceURL() const { return m_scriptName; }
+ unsigned lineNumber() const { return m_lineNumber; }
+ unsigned columnNumber() const { return m_column; }
+
+ bool isEqual(const ScriptCallFrame&) const;
+
+#if ENABLE(INSPECTOR)
+ PassRefPtr<Inspector::TypeBuilder::Console::CallFrame> buildInspectorObject() const;
+#endif
+
+private:
+ String m_functionName;
+ String m_scriptName;
+ unsigned m_lineNumber;
+ unsigned m_column;
+};
+
+} // namespace Inspector
+
+#endif // ScriptCallFrame_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackcppfromrev163567trunkSourceWebCoreinspectorScriptCallStackcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp (from rev 163567, trunk/Source/WebCore/inspector/ScriptCallStack.cpp) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2008, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ScriptCallStack.h"
+
+#include "InspectorValues.h"
+
+namespace Inspector {
+
+PassRefPtr<ScriptCallStack> ScriptCallStack::create(Vector<ScriptCallFrame>& frames)
+{
+ return adoptRef(new ScriptCallStack(frames));
+}
+
+ScriptCallStack::ScriptCallStack(Vector<ScriptCallFrame>& frames)
+{
+ m_frames.swap(frames);
+}
+
+ScriptCallStack::~ScriptCallStack()
+{
+}
+
+const ScriptCallFrame& ScriptCallStack::at(size_t index) const
+{
+ ASSERT(m_frames.size() > index);
+ return m_frames[index];
+}
+
+size_t ScriptCallStack::size() const
+{
+ return m_frames.size();
+}
+
+bool ScriptCallStack::isEqual(ScriptCallStack* o) const
+{
+ if (!o)
+ return false;
+
+ size_t frameCount = o->m_frames.size();
+ if (frameCount != m_frames.size())
+ return false;
+
+ for (size_t i = 0; i < frameCount; ++i) {
+ if (!m_frames[i].isEqual(o->m_frames[i]))
+ return false;
+ }
+
+ return true;
+}
+
+#if ENABLE(INSPECTOR)
+PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> ScriptCallStack::buildInspectorArray() const
+{
+ RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> frames = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>::create();
+ for (size_t i = 0; i < m_frames.size(); i++)
+ frames->addItem(m_frames.at(i).buildInspectorObject());
+ return frames;
+}
+#endif
+
+} // namespace Inspector
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackhfromrev163567trunkSourceWebCoreinspectorScriptCallStackh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h (from rev 163567, trunk/Source/WebCore/inspector/ScriptCallStack.h) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2008, 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ScriptCallStack_h
+#define ScriptCallStack_h
+
+#include "ScriptCallFrame.h"
+#include <wtf/Forward.h>
+#include <wtf/RefCounted.h>
+#include <wtf/Vector.h>
+
+#if ENABLE(INSPECTOR)
+#include "InspectorJSTypeBuilders.h"
+#endif
+
+namespace Inspector {
+
+class JS_EXPORT_PRIVATE ScriptCallStack : public RefCounted<ScriptCallStack> {
+public:
+ static const size_t maxCallStackSizeToCapture = 200;
+
+ static PassRefPtr<ScriptCallStack> create(Vector<ScriptCallFrame>&);
+
+ ~ScriptCallStack();
+
+ const ScriptCallFrame& at(size_t) const;
+ size_t size() const;
+
+ bool isEqual(ScriptCallStack*) const;
+
+#if ENABLE(INSPECTOR)
+ PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> buildInspectorArray() const;
+#endif
+
+private:
+ ScriptCallStack(Vector<ScriptCallFrame>&);
+
+ Vector<ScriptCallFrame> m_frames;
+};
+
+} // namespace Inspector
+
+#endif // ScriptCallStack_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackFactorycppfromrev163567trunkSourceWebCorebindingsjsScriptCallStackFactorycpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp (from rev 163567, trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,174 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ScriptCallStackFactory.h"
+
+#include "ArgList.h"
+#include "CallFrame.h"
+#include "CallFrameInlines.h"
+#include "JSCJSValue.h"
+#include "JSFunction.h"
+#include "ScriptArguments.h"
+#include "ScriptCallFrame.h"
+#include "ScriptCallStack.h"
+#include "ScriptValue.h"
+#include "StackVisitor.h"
+#include "VM.h"
+#include <wtf/RefCountedArray.h>
+#include <wtf/text/WTFString.h>
+
+using namespace JSC;
+
+namespace Inspector {
+
+class CreateScriptCallStackFunctor {
+public:
+ CreateScriptCallStackFunctor(bool needToSkipAFrame, Vector<ScriptCallFrame>& frames, size_t remainingCapacity)
+ : m_needToSkipAFrame(needToSkipAFrame)
+ , m_frames(frames)
+ , m_remainingCapacityForFrameCapture(remainingCapacity)
+ {
+ }
+
+ StackVisitor::Status operator()(StackVisitor& visitor)
+ {
+ if (m_needToSkipAFrame) {
+ m_needToSkipAFrame = false;
+ return StackVisitor::Continue;
+ }
+
+ if (m_remainingCapacityForFrameCapture) {
+ unsigned line;
+ unsigned column;
+ visitor->computeLineAndColumn(line, column);
+ m_frames.append(ScriptCallFrame(visitor->functionName(), visitor->sourceURL(), line, column));
+
+ m_remainingCapacityForFrameCapture--;
+ return StackVisitor::Continue;
+ }
+
+ return StackVisitor::Done;
+ }
+
+private:
+ bool m_needToSkipAFrame;
+ Vector<ScriptCallFrame>& m_frames;
+ size_t m_remainingCapacityForFrameCapture;
+};
+
+PassRefPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState* exec, size_t maxStackSize, bool emptyIsAllowed)
+{
+ Vector<ScriptCallFrame> frames;
+
+ if (exec) {
+ CallFrame* frame = exec->vm().topCallFrame;
+ CreateScriptCallStackFunctor functor(false, frames, maxStackSize);
+ frame->iterate(functor);
+ }
+
+ if (frames.isEmpty() && !emptyIsAllowed) {
+ // No frames found. It may happen in the case where
+ // a bound function is called from native code for example.
+ // Fallback to setting lineNumber to 0, and source and function name to "undefined".
+ frames.append(ScriptCallFrame(ASCIILiteral("undefined"), ASCIILiteral("undefined"), 0, 0));
+ }
+
+ return ScriptCallStack::create(frames);
+}
+
+PassRefPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState* exec, size_t maxStackSize)
+{
+ Vector<ScriptCallFrame> frames;
+
+ CallFrame* frame = exec->vm().topCallFrame;
+ CreateScriptCallStackFunctor functor(true, frames, maxStackSize);
+ frame->iterate(functor);
+
+ if (frames.isEmpty()) {
+ CreateScriptCallStackFunctor functor(false, frames, maxStackSize);
+ frame->iterate(functor);
+ }
+
+ return ScriptCallStack::create(frames);
+}
+
+PassRefPtr<ScriptCallStack> createScriptCallStackForConsole(JSC::ExecState* exec)
+{
+ // FIXME: Caller should use createScriptCallStack alternative with the exec and appropriate max.
+ return createScriptCallStack(exec, ScriptCallStack::maxCallStackSizeToCapture);
+}
+
+PassRefPtr<ScriptCallStack> createScriptCallStackFromException(JSC::ExecState* exec, JSC::JSValue& exception, size_t maxStackSize)
+{
+ Vector<ScriptCallFrame> frames;
+ RefCountedArray<StackFrame> stackTrace = exec->vm().exceptionStack();
+ for (size_t i = 0; i < stackTrace.size() && i < maxStackSize; i++) {
+ if (!stackTrace[i].callee && frames.size())
+ break;
+
+ unsigned line;
+ unsigned column;
+ stackTrace[i].computeLineAndColumn(line, column);
+ String functionName = stackTrace[i].friendlyFunctionName(exec);
+ frames.append(ScriptCallFrame(functionName, stackTrace[i].sourceURL, line, column));
+ }
+
+ // FIXME: <http://webkit.org/b/115087> Web Inspector: WebCore::reportException should not evaluate JavaScript handling exceptions
+ // Fallback to getting at least the line and sourceURL from the exception if it has values and the exceptionStack doesn't.
+ if (frames.size() > 0) {
+ const ScriptCallFrame& firstCallFrame = frames.first();
+ JSObject* exceptionObject = exception.toObject(exec);
+ if (exception.isObject() && firstCallFrame.sourceURL().isEmpty()) {
+ JSValue lineValue = exceptionObject->getDirect(exec->vm(), Identifier(exec, "line"));
+ int lineNumber = lineValue && lineValue.isNumber() ? int(lineValue.toNumber(exec)) : 0;
+ JSValue columnValue = exceptionObject->getDirect(exec->vm(), Identifier(exec, "column"));
+ int columnNumber = columnValue && columnValue.isNumber() ? int(columnValue.toNumber(exec)) : 0;
+ JSValue sourceURLValue = exceptionObject->getDirect(exec->vm(), Identifier(exec, "sourceURL"));
+ String exceptionSourceURL = sourceURLValue && sourceURLValue.isString() ? sourceURLValue.toString(exec)->value(exec) : ASCIILiteral("undefined");
+ frames[0] = ScriptCallFrame(firstCallFrame.functionName(), exceptionSourceURL, lineNumber, columnNumber);
+ }
+ }
+
+ return ScriptCallStack::create(frames);
+}
+
+PassRefPtr<ScriptArguments> createScriptArguments(JSC::ExecState* exec, unsigned skipArgumentCount)
+{
+ Vector<Deprecated::ScriptValue> arguments;
+ size_t argumentCount = exec->argumentCount();
+ for (size_t i = skipArgumentCount; i < argumentCount; ++i)
+ arguments.append(Deprecated::ScriptValue(exec->vm(), exec->uncheckedArgument(i)));
+ return ScriptArguments::create(exec, arguments);
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackFactoryhfromrev163567trunkSourceWebCorebindingsjsScriptCallStackFactoryh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.h (from rev 163567, trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.h) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.h (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ScriptCallStackFactory_h
+#define ScriptCallStackFactory_h
+
+#include <wtf/Forward.h>
+
+namespace JSC {
+class ExecState;
+class JSValue;
+}
+
+namespace Inspector {
+
+class ScriptArguments;
+class ScriptCallStack;
+
+// FIXME: The subtle differences between these should be eliminated.
+JS_EXPORT_PRIVATE PassRefPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState*, size_t maxStackSize, bool emptyIsAllowed);
+JS_EXPORT_PRIVATE PassRefPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState*, size_t maxStackSize);
+JS_EXPORT_PRIVATE PassRefPtr<ScriptCallStack> createScriptCallStackForConsole(JSC::ExecState*);
+JS_EXPORT_PRIVATE PassRefPtr<ScriptCallStack> createScriptCallStackFromException(JSC::ExecState*, JSC::JSValue& exception, size_t maxStackSize);
+JS_EXPORT_PRIVATE PassRefPtr<ScriptArguments> createScriptArguments(JSC::ExecState*, unsigned skipArgumentCount);
+
+} // namespace Inspector
+
+#endif // ScriptCallStackFactory_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcppfromrev163567trunkSourceWebCoreinspectorInspectorConsoleAgentcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp (from rev 163567, trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,256 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "InspectorConsoleAgent.h"
+
+#if ENABLE(INSPECTOR)
+
+#include "ConsoleMessage.h"
+#include "InjectedScriptManager.h"
+#include "ScriptArguments.h"
+#include "ScriptCallFrame.h"
+#include "ScriptCallStack.h"
+#include "ScriptCallStackFactory.h"
+#include "ScriptObject.h"
+#include <wtf/CurrentTime.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+#include <wtf/text/StringBuilder.h>
+#include <wtf/text/WTFString.h>
+
+namespace Inspector {
+
+static const unsigned maximumConsoleMessages = 1000;
+static const int expireConsoleMessagesStep = 100;
+
+InspectorConsoleAgent::InspectorConsoleAgent(InjectedScriptManager* injectedScriptManager)
+ : InspectorAgentBase(ASCIILiteral("Console"))
+ , m_injectedScriptManager(injectedScriptManager)
+ , m_previousMessage(nullptr)
+ , m_expiredConsoleMessageCount(0)
+ , m_enabled(false)
+{
+}
+
+InspectorConsoleAgent::~InspectorConsoleAgent()
+{
+}
+
+void InspectorConsoleAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
+{
+ m_frontendDispatcher = std::make_unique<InspectorConsoleFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = InspectorConsoleBackendDispatcher::create(backendDispatcher, this);
+}
+
+void InspectorConsoleAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
+{
+ m_frontendDispatcher = nullptr;
+ m_backendDispatcher.clear();
+
+ String errorString;
+ disable(&errorString);
+}
+
+void InspectorConsoleAgent::enable(ErrorString*)
+{
+ if (m_enabled)
+ return;
+
+ m_enabled = true;
+
+ if (m_expiredConsoleMessageCount) {
+ ConsoleMessage expiredMessage(!isWorkerAgent(), MessageSource::Other, MessageType::Log, MessageLevel::Warning, String::format("%d console messages are not shown.", m_expiredConsoleMessageCount));
+ expiredMessage.addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, false);
+ }
+
+ size_t messageCount = m_consoleMessages.size();
+ for (size_t i = 0; i < messageCount; ++i)
+ m_consoleMessages[i]->addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, false);
+}
+
+void InspectorConsoleAgent::disable(ErrorString*)
+{
+ if (!m_enabled)
+ return;
+
+ m_enabled = false;
+}
+
+void InspectorConsoleAgent::clearMessages(ErrorString*)
+{
+ m_consoleMessages.clear();
+ m_expiredConsoleMessageCount = 0;
+ m_previousMessage = nullptr;
+
+ m_injectedScriptManager->releaseObjectGroup(ASCIILiteral("console"));
+
+ if (m_frontendDispatcher && m_enabled)
+ m_frontendDispatcher->messagesCleared();
+}
+
+void InspectorConsoleAgent::reset()
+{
+ ErrorString error;
+ clearMessages(&error);
+
+ m_times.clear();
+ m_counts.clear();
+}
+
+void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
+{
+ if (!m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled())
+ return;
+
+ if (type == MessageType::Clear) {
+ ErrorString error;
+ clearMessages(&error);
+ }
+
+ addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type, level, message, callStack, requestIdentifier)));
+}
+
+void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier)
+{
+ if (!m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled())
+ return;
+
+ if (type == MessageType::Clear) {
+ ErrorString error;
+ clearMessages(&error);
+ }
+
+ addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type, level, message, arguments, state, requestIdentifier)));
+}
+
+void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* state, unsigned long requestIdentifier)
+{
+ if (!m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled())
+ return;
+
+ if (type == MessageType::Clear) {
+ ErrorString error;
+ clearMessages(&error);
+ }
+
+ bool canGenerateCallStack = !isWorkerAgent() && m_frontendDispatcher;
+ addConsoleMessage(adoptPtr(new ConsoleMessage(canGenerateCallStack, source, type, level, message, scriptID, lineNumber, columnNumber, state, requestIdentifier)));
+}
+
+Vector<unsigned> InspectorConsoleAgent::consoleMessageArgumentCounts() const
+{
+ Vector<unsigned> result(m_consoleMessages.size());
+ for (size_t i = 0; i < m_consoleMessages.size(); i++)
+ result[i] = m_consoleMessages[i]->argumentCount();
+ return result;
+}
+
+void InspectorConsoleAgent::startTiming(const String& title)
+{
+ // Follow Firebug's behavior of requiring a title that is not null or
+ // undefined for timing functions
+ if (title.isNull())
+ return;
+
+ m_times.add(title, monotonicallyIncreasingTime());
+}
+
+void InspectorConsoleAgent::stopTiming(const String& title, PassRefPtr<ScriptCallStack> callStack)
+{
+ // Follow Firebug's behavior of requiring a title that is not null or
+ // undefined for timing functions
+ if (title.isNull())
+ return;
+
+ HashMap<String, double>::iterator it = m_times.find(title);
+ if (it == m_times.end())
+ return;
+
+ double startTime = it->value;
+ m_times.remove(it);
+
+ double elapsed = monotonicallyIncreasingTime() - startTime;
+ String message = title + String::format(": %.3fms", elapsed * 1000);
+ addMessageToConsole(MessageSource::ConsoleAPI, MessageType::Timing, MessageLevel::Debug, message, callStack);
+}
+
+void InspectorConsoleAgent::count(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
+{
+ RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(state));
+ const ScriptCallFrame& lastCaller = callStack->at(0);
+ // Follow Firebug's behavior of counting with null and undefined title in
+ // the same bucket as no argument
+ String title;
+ arguments->getFirstArgumentAsString(title);
+ String identifier = title + '@' + lastCaller.sourceURL() + ':' + String::number(lastCaller.lineNumber());
+
+ HashMap<String, unsigned>::iterator it = m_counts.find(identifier);
+ int count;
+ if (it == m_counts.end())
+ count = 1;
+ else {
+ count = it->value + 1;
+ m_counts.remove(it);
+ }
+
+ m_counts.add(identifier, count);
+
+ String message = title + ": " + String::number(count);
+ addMessageToConsole(MessageSource::ConsoleAPI, MessageType::Log, MessageLevel::Debug, message, callStack);
+}
+
+static bool isGroupMessage(MessageType type)
+{
+ return type == MessageType::StartGroup
+ || type == MessageType::StartGroupCollapsed
+ || type == MessageType::EndGroup;
+}
+
+void InspectorConsoleAgent::addConsoleMessage(PassOwnPtr<ConsoleMessage> consoleMessage)
+{
+ ASSERT(m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled());
+ ASSERT_ARG(consoleMessage, consoleMessage);
+
+ if (m_previousMessage && !isGroupMessage(m_previousMessage->type()) && m_previousMessage->isEqual(consoleMessage.get())) {
+ m_previousMessage->incrementCount();
+ if (m_frontendDispatcher && m_enabled)
+ m_previousMessage->updateRepeatCountInConsole(m_frontendDispatcher.get());
+ } else {
+ m_previousMessage = consoleMessage.get();
+ m_consoleMessages.append(consoleMessage);
+ if (m_frontendDispatcher && m_enabled)
+ m_previousMessage->addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, true);
+ }
+
+ if (!m_frontendDispatcher && m_consoleMessages.size() >= maximumConsoleMessages) {
+ m_expiredConsoleMessageCount += expireConsoleMessagesStep;
+ m_consoleMessages.remove(0, expireConsoleMessagesStep);
+ }
+}
+
+} // namespace Inspector
+
+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,103 @@
</span><ins>+/*
+* Copyright (C) 2014 Apple Inc. All rights reserved.
+* Copyright (C) 2011 Google Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef InspectorConsoleAgent_h
+#define InspectorConsoleAgent_h
+
+#if ENABLE(INSPECTOR)
+
+#include "InspectorJSBackendDispatchers.h"
+#include "InspectorJSFrontendDispatchers.h"
+#include "inspector/ConsoleTypes.h"
+#include "inspector/InspectorAgentBase.h"
+#include <wtf/Forward.h>
+#include <wtf/HashMap.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
+
+namespace JSC {
+class ExecState;
+}
+
+namespace Inspector {
+
+class ConsoleMessage;
+class InjectedScriptManager;
+class ScriptArguments;
+class ScriptCallStack;
+typedef String ErrorString;
+
+class JS_EXPORT_PRIVATE InspectorConsoleAgent : public InspectorAgentBase, public InspectorConsoleBackendDispatcherHandler {
+ WTF_MAKE_NONCOPYABLE(InspectorConsoleAgent);
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ InspectorConsoleAgent(InjectedScriptManager*);
+ virtual ~InspectorConsoleAgent();
+
+ virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
+
+ virtual void enable(ErrorString*) override;
+ virtual void disable(ErrorString*) override;
+ virtual void clearMessages(ErrorString*) override;
+ virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) = 0;
+ virtual void addInspectedNode(ErrorString*, int nodeId) = 0;
+ virtual void addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId) = 0;
+
+ virtual bool isWorkerAgent() const = 0;
+
+ bool enabled() const { return m_enabled; }
+ void reset();
+
+ void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr<ScriptArguments>, unsigned long requestIdentifier = 0);
+ void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
+ void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0);
+
+ Vector<unsigned> consoleMessageArgumentCounts() const;
+
+ void startTiming(const String& title);
+ void stopTiming(const String& title, PassRefPtr<ScriptCallStack>);
+ void count(JSC::ExecState*, PassRefPtr<ScriptArguments>);
+
+protected:
+ void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
+
+ InjectedScriptManager* m_injectedScriptManager;
+ std::unique_ptr<InspectorConsoleFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<InspectorConsoleBackendDispatcher> m_backendDispatcher;
+ ConsoleMessage* m_previousMessage;
+ Vector<OwnPtr<ConsoleMessage>> m_consoleMessages;
+ int m_expiredConsoleMessageCount;
+ HashMap<String, unsigned> m_counts;
+ HashMap<String, double> m_times;
+ bool m_enabled;
+};
+
+} // namespace Inspector
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(InspectorConsoleAgent_h)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgentcppfromrev163567trunkSourceWebCoreinspectorPageInjectedScriptHosth"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp (from rev 163567, trunk/Source/WebCore/inspector/PageInjectedScriptHost.h) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "JSGlobalObjectConsoleAgent.h"
+
+#if ENABLE(INSPECTOR)
+
+namespace Inspector {
+
+JSGlobalObjectConsoleAgent::JSGlobalObjectConsoleAgent(InjectedScriptManager* injectedScriptManager)
+ : InspectorConsoleAgent(injectedScriptManager)
+{
+}
+
+void JSGlobalObjectConsoleAgent::setMonitoringXHREnabled(ErrorString* errorString, bool)
+{
+ *errorString = ASCIILiteral("Not supported for JavaScript context");
+}
+
+void JSGlobalObjectConsoleAgent::addInspectedNode(ErrorString* errorString, int)
+{
+ *errorString = ASCIILiteral("Not supported for JavaScript context");
+}
+
+void JSGlobalObjectConsoleAgent::addInspectedHeapObject(ErrorString* errorString, int)
+{
+ *errorString = ASCIILiteral("Not supported for JavaScript context");
+}
+
+} // namespace Inspector
+
+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgenthfromrev163567trunkSourceWebCoreinspectorPageInjectedScriptHosth"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h (from rev 163567, trunk/Source/WebCore/inspector/PageInjectedScriptHost.h) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef JSGlobalObjectConsoleAgent_h
+#define JSGlobalObjectConsoleAgent_h
+
+#if ENABLE(INSPECTOR)
+
+#include "InspectorConsoleAgent.h"
+#include "JSGlobalObjectScriptDebugServer.h"
+
+namespace Inspector {
+
+class JSGlobalObjectConsoleAgent final : public InspectorConsoleAgent {
+ WTF_MAKE_NONCOPYABLE(JSGlobalObjectConsoleAgent);
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ JSGlobalObjectConsoleAgent(InjectedScriptManager*);
+ virtual ~JSGlobalObjectConsoleAgent() { }
+
+ // FIXME: XHRs and Nodes only makes sense debugging a Web context. Can this be moved to a different agent?
+ virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) override;
+ virtual void addInspectedNode(ErrorString*, int nodeId) override;
+ virtual void addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId) override;
+
+ virtual bool isWorkerAgent() const { return false; }
+};
+
+} // namespace Inspector
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(JSGlobalObjectConsoleAgent_h)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -29,15 +29,20 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #include "InjectedScriptManager.h"
</span><ins>+#include "InspectorConsoleAgent.h"
</ins><span class="cx"> #include "JSGlobalObject.h"
</span><ins>+#include "ScriptArguments.h"
+#include "ScriptCallStack.h"
+#include "ScriptCallStackFactory.h"
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-JSGlobalObjectDebuggerAgent::JSGlobalObjectDebuggerAgent(InjectedScriptManager* injectedScriptManager, JSC::JSGlobalObject& globalObject)
</del><ins>+JSGlobalObjectDebuggerAgent::JSGlobalObjectDebuggerAgent(InjectedScriptManager* injectedScriptManager, JSC::JSGlobalObject& globalObject, InspectorConsoleAgent* consoleAgent)
</ins><span class="cx"> : InspectorDebuggerAgent(injectedScriptManager)
</span><span class="cx"> , m_scriptDebugServer(globalObject)
</span><ins>+ , m_consoleAgent(consoleAgent)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -62,6 +67,11 @@
</span><span class="cx"> return injectedScriptManager()->injectedScriptFor(exec);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void JSGlobalObjectDebuggerAgent::breakpointActionLog(JSC::ExecState* exec, const String& message)
+{
+ m_consoleAgent->addMessageToConsole(MessageSource::JS, MessageType::Log, MessageLevel::Log, message, createScriptCallStack(exec, ScriptCallStack::maxCallStackSizeToCapture, true), 0);
+}
+
</ins><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -33,11 +33,13 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class InspectorConsoleAgent;
+
</ins><span class="cx"> class JSGlobalObjectDebuggerAgent final : public InspectorDebuggerAgent {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(JSGlobalObjectDebuggerAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- JSGlobalObjectDebuggerAgent(InjectedScriptManager*, JSC::JSGlobalObject&);
</del><ins>+ JSGlobalObjectDebuggerAgent(InjectedScriptManager*, JSC::JSGlobalObject&, InspectorConsoleAgent*);
</ins><span class="cx"> virtual ~JSGlobalObjectDebuggerAgent() { }
</span><span class="cx">
</span><span class="cx"> virtual JSGlobalObjectScriptDebugServer& scriptDebugServer() override { return m_scriptDebugServer; }
</span><span class="lines">@@ -46,8 +48,7 @@
</span><span class="cx"> virtual void stopListeningScriptDebugServer(bool isBeingDestroyed) override;
</span><span class="cx"> virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
</span><span class="cx">
</span><del>- // FIXME: This needs a ConsoleAgent to send a log to.
- virtual void breakpointActionLog(JSC::ExecState*, const String&) override final { }
</del><ins>+ virtual void breakpointActionLog(JSC::ExecState*, const String&) override;
</ins><span class="cx">
</span><span class="cx"> // FIXME: JavaScript inspector does not yet have a console object to mute.
</span><span class="cx"> virtual void muteConsole() override { }
</span><span class="lines">@@ -55,6 +56,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> JSGlobalObjectScriptDebugServer m_scriptDebugServer;
</span><ins>+ InspectorConsoleAgent* m_consoleAgent;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolConsolejsonfromrev163567trunkSourceWebCoreinspectorprotocolConsolejson"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/protocol/Console.json (from rev 163567, trunk/Source/WebCore/inspector/protocol/Console.json) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Console.json (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Console.json 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,105 @@
</span><ins>+{
+ "domain": "Console",
+ "description": "Console domain defines methods and events for interaction with the JavaScript console. Console collects messages created by means of the <a href='http://getfirebug.com/wiki/index.php/Console_API'>JavaScript Console API</a>. One needs to enable this domain using <code>enable</code> command in order to start receiving the console messages. Browser collects messages issued while console domain is not enabled as well and reports them using <code>messageAdded</code> notification upon enabling.",
+ "types": [
+ {
+ "id": "ConsoleNetworkRequestId",
+ "type": "string",
+ "description": "Unique request identifier. FIXME: Duplicate of Network.RequestId <https://webkit.org/b/125664> Web Inspector: FIX Type Dependency Issues"
+ },
+ {
+ "id": "ConsoleDOMNodeId",
+ "type": "integer",
+ "description": "Unique DOM node identifier. FIXME: Duplicate of DOM.NodeId <https://webkit.org/b/125664> Web Inspector: FIX Type Dependency Issues"
+ },
+ {
+ "id": "ConsoleMessage",
+ "type": "object",
+ "description": "Console message.",
+ "properties": [
+ { "name": "source", "type": "string", "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "other"], "description": "Message source." },
+ { "name": "level", "type": "string", "enum": ["log", "warning", "error", "debug"], "description": "Message severity." },
+ { "name": "text", "type": "string", "description": "Message text." },
+ { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "table", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert", "timing", "profile", "profileEnd"], "description": "Console message type." },
+ { "name": "url", "type": "string", "optional": true, "description": "URL of the message origin." },
+ { "name": "line", "type": "integer", "optional": true, "description": "Line number in the resource that generated this message." },
+ { "name": "column", "type": "integer", "optional": true, "description": "Column number on the line in the resource that generated this message." },
+ { "name": "repeatCount", "type": "integer", "optional": true, "description": "Repeat count for repeated messages." },
+ { "name": "parameters", "type": "array", "items": { "$ref": "Runtime.RemoteObject" }, "optional": true, "description": "Message parameters in case of the formatted message." },
+ { "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "JavaScript stack trace for assertions and error messages." },
+ { "name": "networkRequestId", "$ref": "ConsoleNetworkRequestId", "optional": true, "description": "Identifier of the network request associated with this message." }
+ ]
+ },
+ {
+ "id": "CallFrame",
+ "type": "object",
+ "description": "Stack entry for console errors and assertions.",
+ "properties": [
+ { "name": "functionName", "type": "string", "description": "JavaScript function name." },
+ { "name": "url", "type": "string", "description": "JavaScript script name or url." },
+ { "name": "lineNumber", "type": "integer", "description": "JavaScript script line number." },
+ { "name": "columnNumber", "type": "integer", "description": "JavaScript script column number." }
+ ]
+ },
+ {
+ "id": "StackTrace",
+ "type": "array",
+ "items": { "$ref": "CallFrame" },
+ "description": "Call frames for assertions or error messages."
+ }
+ ],
+ "commands": [
+ {
+ "name": "enable",
+ "description": "Enables console domain, sends the messages collected so far to the client by means of the <code>messageAdded</code> notification."
+ },
+ {
+ "name": "disable",
+ "description": "Disables console domain, prevents further console messages from being reported to the client."
+ },
+ {
+ "name": "clearMessages",
+ "description": "Clears console messages collected in the browser."
+ },
+ {
+ "name": "setMonitoringXHREnabled",
+ "parameters": [
+ { "name": "enabled", "type": "boolean", "description": "Monitoring enabled state." }
+ ],
+ "description": "Toggles monitoring of XMLHttpRequest. If <code>true</code>, console will receive messages upon each XHR issued."
+ },
+ {
+ "name": "addInspectedNode",
+ "parameters": [
+ { "name": "nodeId", "$ref": "ConsoleDOMNodeId", "description": "DOM node id to be accessible by means of $x command line API." }
+ ],
+ "description": "Enables console to refer to the node with given id via $x (see Command Line API for more details $x functions)."
+ },
+ {
+ "name": "addInspectedHeapObject",
+ "parameters": [
+ { "name": "heapObjectId", "type": "integer" }
+ ]
+ }
+ ],
+ "events": [
+ {
+ "name": "messageAdded",
+ "parameters": [
+ { "name": "message", "$ref": "ConsoleMessage", "description": "Console message that has been added." }
+ ],
+ "description": "Issued when new console message is added."
+ },
+ {
+ "name": "messageRepeatCountUpdated",
+ "parameters": [
+ { "name": "count", "type": "integer", "description": "New repeat count value." }
+ ],
+ "description": "Issued when subsequent message(s) are equal to the previous one(s)."
+ },
+ {
+ "name": "messagesCleared",
+ "description": "Issued when console is cleared. This happens either upon <code>clearMessages</code> command or after page navigation."
+ }
+ ]
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptsgeneratecombinedinspectorjsonpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -66,3 +66,4 @@
</span><span class="cx">
</span><span class="cx"> print(string.rstrip())
</span><span class="cx"> print("]}")
</span><ins>+
</ins></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -760,7 +760,6 @@
</span><span class="cx"> inspector/protocol/ApplicationCache.json
</span><span class="cx"> inspector/protocol/CSS.json
</span><span class="cx"> inspector/protocol/Canvas.json
</span><del>- inspector/protocol/Console.json
</del><span class="cx"> inspector/protocol/DOM.json
</span><span class="cx"> inspector/protocol/DOMDebugger.json
</span><span class="cx"> inspector/protocol/DOMStorage.json
</span><span class="lines">@@ -1566,16 +1565,13 @@
</span><span class="cx">
</span><span class="cx"> inspector/CommandLineAPIHost.cpp
</span><span class="cx"> inspector/CommandLineAPIModule.cpp
</span><del>- inspector/ConsoleMessage.cpp
</del><span class="cx"> inspector/DOMEditor.cpp
</span><span class="cx"> inspector/DOMPatchSupport.cpp
</span><del>- inspector/IdentifiersFactory.cpp
</del><span class="cx"> inspector/InjectedScriptCanvasModule.cpp
</span><span class="cx"> inspector/InspectorApplicationCacheAgent.cpp
</span><span class="cx"> inspector/InspectorCSSAgent.cpp
</span><span class="cx"> inspector/InspectorCanvasAgent.cpp
</span><span class="cx"> inspector/InspectorClient.cpp
</span><del>- inspector/InspectorConsoleAgent.cpp
</del><span class="cx"> inspector/InspectorController.cpp
</span><span class="cx"> inspector/InspectorCounters.cpp
</span><span class="cx"> inspector/InspectorDOMAgent.cpp
</span><span class="lines">@@ -1609,10 +1605,8 @@
</span><span class="cx"> inspector/PageInjectedScriptHost.cpp
</span><span class="cx"> inspector/PageInjectedScriptManager.cpp
</span><span class="cx"> inspector/PageRuntimeAgent.cpp
</span><del>- inspector/ScriptArguments.cpp
- inspector/ScriptCallFrame.cpp
- inspector/ScriptCallStack.cpp
</del><span class="cx"> inspector/TimelineRecordFactory.cpp
</span><ins>+ inspector/WebConsoleAgent.cpp
</ins><span class="cx"> inspector/WebDebuggerAgent.cpp
</span><span class="cx"> inspector/WorkerConsoleAgent.cpp
</span><span class="cx"> inspector/WorkerDebuggerAgent.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/ChangeLog 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,5 +1,276 @@
</span><span class="cx"> 2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Add Console support to JSContext Inspection
+ https://bugs.webkit.org/show_bug.cgi?id=127941
+
+ Reviewed by Geoffrey Garen.
+
+ - Move InspectorConsoleAgent and dependencies to JavaScriptCore
+ and into the Inspector namespace.
+ - Update Console Message enum types to enum classes and update
+ all users to the new, simpler names.
+ - Since we are updating addConsoleMessage callsites anyways, add
+ ASCIILiteral where appropriate.
+ - Add WebConsoleAgent base of Page/Worker ConsoleAgent to implement
+ what could not be pushed into JavaScriptCore.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * ForwardingHeaders/inspector/ConsoleMessage.h: Added.
+ * ForwardingHeaders/inspector/ConsoleTypes.h: Added.
+ * ForwardingHeaders/inspector/IdentifiersFactory.h: Added.
+ * ForwardingHeaders/inspector/ScriptArguments.h: Added.
+ * ForwardingHeaders/inspector/ScriptCallFrame.h: Added.
+ * ForwardingHeaders/inspector/ScriptCallStack.h: Added.
+ * ForwardingHeaders/inspector/ScriptCallStackFactory.h: Added.
+ * ForwardingHeaders/inspector/agents/InspectorConsoleAgent.h: Added.
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ Add / remove files from builds.
+
+ * inspector/WebConsoleAgent.h:
+ * inspector/WebConsoleAgent.cpp: Added.
+ (WebCore::WebConsoleAgent::WebConsoleAgent):
+ (WebCore::WebConsoleAgent::setMonitoringXHREnabled):
+ (WebCore::WebConsoleAgent::frameWindowDiscarded):
+ (WebCore::WebConsoleAgent::didFinishXHRLoading):
+ (WebCore::WebConsoleAgent::didReceiveResponse):
+ (WebCore::WebConsoleAgent::didFailLoading):
+ (WebCore::WebConsoleAgent::addInspectedHeapObject):
+ Implement what could not be pushed down into JavaScriptCore.
+
+ * inspector/InstrumentingAgents.h:
+ (WebCore::InstrumentingAgents::webConsoleAgent):
+ (WebCore::InstrumentingAgents::setWebConsoleAgent):
+ Hold a WebConsoleAgent instead of InspectorConsoleAgent.
+
+ * Modules/indexeddb/IDBCursor.cpp:
+ * Modules/indexeddb/IDBDatabase.cpp:
+ * Modules/indexeddb/IDBTransaction.cpp:
+ * Modules/quota/DOMWindowQuota.cpp:
+ (WebCore::DOMWindowQuota::webkitStorageInfo):
+ * Modules/webaudio/AudioBufferSourceNode.cpp:
+ (WebCore::AudioBufferSourceNode::looping):
+ (WebCore::AudioBufferSourceNode::setLooping):
+ * Modules/webaudio/AudioContext.cpp:
+ * Modules/webaudio/PannerNode.cpp:
+ (WebCore::PannerNode::setPanningModel):
+ * Modules/webdatabase/DatabaseBase.cpp:
+ (WebCore::DatabaseBase::logErrorMessage):
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::logErrorMessage):
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::connect):
+ (WebCore::WebSocket::send):
+ (WebCore::WebSocket::close):
+ (WebCore::WebSocket::setBinaryType):
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::fail):
+ (WebCore::WebSocketChannel::didFailSocketStream):
+ * Modules/websockets/WebSocketHandshake.cpp:
+ * WebCore.exp.in:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSAudioContextCustom.cpp:
+ (WebCore::JSAudioContextConstructor::constructJSAudioContext):
+ * bindings/js/JSCustomXPathNSResolver.cpp:
+ (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
+ * bindings/js/JSDOMBinding.cpp:
+ * bindings/js/JSSubtleCryptoCustom.cpp:
+ (WebCore::JSSubtleCrypto::encrypt):
+ (WebCore::JSSubtleCrypto::decrypt):
+ (WebCore::JSSubtleCrypto::sign):
+ (WebCore::JSSubtleCrypto::verify):
+ (WebCore::JSSubtleCrypto::wrapKey):
+ (WebCore::JSSubtleCrypto::unwrapKey):
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::canExecuteScripts):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateCallWith):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::logError):
+ * css/MediaList.cpp:
+ (WebCore::addResolutionWarningMessageToConsole):
+ * dom/Document.cpp:
+ (WebCore::Document::logExceptionToConsole):
+ (WebCore::Document::processHttpEquiv):
+ (WebCore::Document::addMessage):
+ * dom/Document.h:
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::executeScript):
+ (WebCore::ScriptElement::notifyFinished):
+ * dom/ScriptExecutionContext.cpp:
+ * dom/ScriptExecutionContext.h:
+ * dom/ViewportArguments.cpp:
+ (WebCore::viewportErrorMessageLevel):
+ (WebCore::reportViewportWarning):
+ * fileapi/Blob.cpp:
+ * fileapi/WebKitBlobBuilder.cpp:
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::shouldAutofocus):
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::validateInteractively):
+ * html/HTMLIFrameElement.cpp:
+ (WebCore::HTMLIFrameElement::parseAttribute):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::getImageData):
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::printWarningToConsole):
+ * html/parser/XSSAuditor.cpp:
+ (WebCore::XSSAuditor::init):
+ * html/parser/XSSAuditorDelegate.cpp:
+ (WebCore::XSSAuditorDelegate::didBlockScript):
+ * inspector/CommandLineAPIHost.cpp:
+ * inspector/CommandLineAPIHost.h:
+ (WebCore::CommandLineAPIHost::init):
+ * inspector/InspectorAllInOne.cpp:
+ * inspector/InspectorConsoleAgent.h: Removed.
+ * inspector/InspectorConsoleInstrumentation.h:
+ (WebCore::InspectorInstrumentation::addMessageToConsole):
+ (WebCore::InspectorInstrumentation::consoleCount):
+ (WebCore::InspectorInstrumentation::stopConsoleTiming):
+ (WebCore::InspectorInstrumentation::consoleTimeStamp):
+ (WebCore::InspectorInstrumentation::addProfile):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ * inspector/InspectorDOMAgent.cpp:
+ * inspector/InspectorFrontendHost.h:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::frameWindowDiscardedImpl):
+ (WebCore::InspectorInstrumentation::didReceiveResourceResponseImpl):
+ (WebCore::InspectorInstrumentation::didFailLoadingImpl):
+ (WebCore::InspectorInstrumentation::didFinishXHRLoadingImpl):
+ (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+ (WebCore::isConsoleAssertMessage):
+ (WebCore::InspectorInstrumentation::addMessageToConsoleImpl):
+ (WebCore::InspectorInstrumentation::consoleCountImpl):
+ (WebCore::InspectorInstrumentation::startConsoleTimingImpl):
+ (WebCore::InspectorInstrumentation::stopConsoleTimingImpl):
+ (WebCore::InspectorInstrumentation::consoleAgentEnabled):
+ * inspector/InspectorInstrumentation.h:
+ * inspector/InspectorLayerTreeAgent.cpp:
+ * inspector/InspectorPageAgent.cpp:
+ * inspector/InspectorProfilerAgent.cpp:
+ (WebCore::InspectorProfilerAgent::addProfileFinishedMessageToConsole):
+ (WebCore::InspectorProfilerAgent::addStartProfilingMessageToConsole):
+ * inspector/InspectorProfilerAgent.h:
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::buildInitiatorObject):
+ * inspector/InspectorTimelineAgent.cpp:
+ * inspector/InstrumentingAgents.cpp:
+ (WebCore::InstrumentingAgents::InstrumentingAgents):
+ (WebCore::InstrumentingAgents::reset):
+ * inspector/PageConsoleAgent.cpp:
+ (WebCore::PageConsoleAgent::PageConsoleAgent):
+ (WebCore::PageConsoleAgent::clearMessages):
+ (WebCore::PageConsoleAgent::addInspectedNode):
+ * inspector/PageConsoleAgent.h:
+ * inspector/PageDebuggerAgent.cpp:
+ (WebCore::PageDebuggerAgent::breakpointActionLog):
+ * inspector/PageInjectedScriptHost.h:
+ * inspector/PageInjectedScriptManager.h:
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createGenericRecord):
+ (WebCore::WebConsoleAgent::~WebConsoleAgent):
+ * inspector/WorkerConsoleAgent.cpp:
+ (WebCore::WorkerConsoleAgent::WorkerConsoleAgent):
+ (WebCore::WorkerConsoleAgent::addInspectedNode):
+ * inspector/WorkerConsoleAgent.h:
+ * inspector/WorkerDebuggerAgent.cpp:
+ (WebCore::WorkerDebuggerAgent::breakpointActionLog):
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::WorkerInspectorController):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::responseReceived):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::submitForm):
+ (WebCore::FrameLoader::reportLocalLoadFailed):
+ (WebCore::FrameLoader::handleBeforeUnloadEvent):
+ (WebCore::FrameLoader::shouldInterruptLoadForXFrameOptions):
+ (WebCore::createWindow):
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::notifyFinished):
+ * loader/MixedContentChecker.cpp:
+ (WebCore::MixedContentChecker::logWarning):
+ * loader/TextTrackLoader.cpp:
+ (WebCore::TextTrackLoader::corsPolicyPreventedLoad):
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::abort):
+ (WebCore::ApplicationCacheGroup::didReceiveResponse):
+ (WebCore::ApplicationCacheGroup::didFinishLoading):
+ (WebCore::ApplicationCacheGroup::didFail):
+ (WebCore::ApplicationCacheGroup::didReceiveManifestResponse):
+ (WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
+ (WebCore::ApplicationCacheGroup::checkIfLoadIsComplete):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::printAccessDeniedMessage):
+ * page/ChromeClient.h:
+ * page/Console.cpp:
+ (WebCore::internalAddMessage):
+ (WebCore::Console::debug):
+ (WebCore::Console::error):
+ (WebCore::Console::log):
+ (WebCore::Console::warn):
+ (WebCore::Console::dir):
+ (WebCore::Console::dirxml):
+ (WebCore::Console::table):
+ (WebCore::Console::clear):
+ (WebCore::Console::trace):
+ (WebCore::Console::assertCondition):
+ (WebCore::Console::group):
+ (WebCore::Console::groupCollapsed):
+ (WebCore::Console::groupEnd):
+ * page/Console.h:
+ * page/ConsoleTypes.h: Removed.
+ * page/ContentSecurityPolicy.cpp:
+ (WebCore::ContentSecurityPolicy::reportViolation):
+ (WebCore::ContentSecurityPolicy::logToConsole):
+ * page/DOMSecurityPolicy.cpp:
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::postMessage):
+ (WebCore::DOMWindow::dispatchMessageEventWithOriginCheck):
+ (WebCore::DOMWindow::close):
+ (WebCore::DOMWindow::printErrorMessage):
+ * page/DOMWindow.h:
+ * page/EventSource.cpp:
+ (WebCore::EventSource::didReceiveResponse):
+ (WebCore::EventSource::didFailAccessControlCheck):
+ * page/PageConsole.cpp:
+ (WebCore::PageConsole::printMessageSourceAndLevelPrefix):
+ (WebCore::PageConsole::addMessage):
+ * page/PageConsole.h:
+ * page/PointerLockController.cpp:
+ (WebCore::PointerLockController::requestPointerLock):
+ * platform/CrossThreadCopier.h:
+ * rendering/shapes/ShapeInfo.cpp:
+ (WebCore::checkShapeImageOrigin):
+ * svg/SVGDocumentExtensions.cpp:
+ (WebCore::reportMessage):
+ (WebCore::SVGDocumentExtensions::reportWarning):
+ (WebCore::SVGDocumentExtensions::reportError):
+ * testing/Internals.cpp:
+ (WebCore::Internals::consoleMessageArgumentCounts):
+ * workers/DefaultSharedWorkerRepository.cpp:
+ * workers/SharedWorkerGlobalScope.cpp:
+ (WebCore::SharedWorkerGlobalScope::logExceptionToConsole):
+ * workers/SharedWorkerGlobalScope.h:
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::addMessageToWorkerConsole):
+ * workers/WorkerGlobalScope.h:
+ * workers/WorkerMessagingProxy.cpp:
+ * workers/WorkerReportingProxy.h:
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::logConsoleError):
+ (WebCore::XMLHttpRequest::send):
+ * xml/XSLTProcessorLibxslt.cpp:
+ (WebCore::XSLTProcessor::parseErrorFunc):
+
+2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Convert a parameter to PassRefPtr
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128327
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/DerivedSources.make 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1092,7 +1092,6 @@
</span><span class="cx"> $(WebCore)/inspector/protocol/ApplicationCache.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/CSS.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/Canvas.json \
</span><del>- $(WebCore)/inspector/protocol/Console.json \
</del><span class="cx"> $(WebCore)/inspector/protocol/DOM.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/DOMDebugger.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/DOMStorage.json \
</span></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorConsoleMessageh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/inspector/ConsoleMessage.h (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/ConsoleMessage.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/ConsoleMessage.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_ConsoleMessage_h
+#define WebCore_FWD_ConsoleMessage_h
+#include <JavaScriptCore/ConsoleMessage.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorConsoleTypesh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/inspector/ConsoleTypes.h (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/ConsoleTypes.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/ConsoleTypes.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_ConsoleTypes_h
+#define WebCore_FWD_ConsoleTypes_h
+#include <JavaScriptCore/ConsoleTypes.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorIdentifiersFactoryh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/inspector/IdentifiersFactory.h (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/IdentifiersFactory.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/IdentifiersFactory.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_IdentifiersFactory_h
+#define WebCore_FWD_IdentifiersFactory_h
+#include <JavaScriptCore/IdentifiersFactory.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorScriptArgumentsh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptArguments.h (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptArguments.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptArguments.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_ScriptArguments_h
+#define WebCore_FWD_ScriptArguments_h
+#include <JavaScriptCore/ScriptArguments.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorScriptCallFrameh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallFrame.h (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallFrame.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallFrame.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_ScriptCallFrame_h
+#define WebCore_FWD_ScriptCallFrame_h
+#include <JavaScriptCore/ScriptCallFrame.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorScriptCallStackh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallStack.h (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallStack.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallStack.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_ScriptCallStack_h
+#define WebCore_FWD_ScriptCallStack_h
+#include <JavaScriptCore/ScriptCallStack.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorScriptCallStackFactoryh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallStackFactory.h (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallStackFactory.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/ScriptCallStackFactory.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_ScriptCallStackFactory_h
+#define WebCore_FWD_ScriptCallStackFactory_h
+#include <JavaScriptCore/ScriptCallStackFactory.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectoragentsInspectorConsoleAgenth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorConsoleAgent.h (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorConsoleAgent.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorConsoleAgent.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_InspectorConsoleAgent_h
+#define WebCore_FWD_InspectorConsoleAgent_h
+#include <JavaScriptCore/InspectorConsoleAgent.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.am (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.am 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/GNUmakefile.am 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -337,7 +337,6 @@
</span><span class="cx"> $(WebCore)/inspector/protocol/ApplicationCache.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/CSS.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/Canvas.json \
</span><del>- $(WebCore)/inspector/protocol/Console.json \
</del><span class="cx"> $(WebCore)/inspector/protocol/DOM.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/DOMDebugger.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/DOMStorage.json \
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -2436,8 +2436,6 @@
</span><span class="cx"> Source/WebCore/bindings/js/ScheduledAction.h \
</span><span class="cx"> Source/WebCore/bindings/js/ScriptCachedFrameData.cpp \
</span><span class="cx"> Source/WebCore/bindings/js/ScriptCachedFrameData.h \
</span><del>- Source/WebCore/bindings/js/ScriptCallStackFactory.cpp \
- Source/WebCore/bindings/js/ScriptCallStackFactory.h \
</del><span class="cx"> Source/WebCore/bindings/js/ScriptController.cpp \
</span><span class="cx"> Source/WebCore/bindings/js/ScriptController.h \
</span><span class="cx"> Source/WebCore/bindings/js/ScriptHeapSnapshot.h \
</span><span class="lines">@@ -3744,15 +3742,10 @@
</span><span class="cx"> Source/WebCore/inspector/CommandLineAPIHost.h \
</span><span class="cx"> Source/WebCore/inspector/CommandLineAPIModule.cpp \
</span><span class="cx"> Source/WebCore/inspector/CommandLineAPIModule.h \
</span><del>- Source/WebCore/inspector/ConsoleAPITypes.h \
- Source/WebCore/inspector/ConsoleMessage.cpp \
- Source/WebCore/inspector/ConsoleMessage.h \
</del><span class="cx"> Source/WebCore/inspector/DOMEditor.cpp \
</span><span class="cx"> Source/WebCore/inspector/DOMEditor.h \
</span><span class="cx"> Source/WebCore/inspector/DOMPatchSupport.cpp \
</span><span class="cx"> Source/WebCore/inspector/DOMPatchSupport.h \
</span><del>- Source/WebCore/inspector/IdentifiersFactory.cpp \
- Source/WebCore/inspector/IdentifiersFactory.h \
</del><span class="cx"> Source/WebCore/inspector/InjectedScriptCanvasModule.cpp \
</span><span class="cx"> Source/WebCore/inspector/InjectedScriptCanvasModule.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp \
</span><span class="lines">@@ -3764,8 +3757,6 @@
</span><span class="cx"> Source/WebCore/inspector/InspectorClient.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorController.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorController.h \
</span><del>- Source/WebCore/inspector/InspectorConsoleAgent.cpp \
- Source/WebCore/inspector/InspectorConsoleAgent.h \
</del><span class="cx"> Source/WebCore/inspector/InspectorConsoleInstrumentation.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorCounters.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorCounters.h \
</span><span class="lines">@@ -3838,14 +3829,10 @@
</span><span class="cx"> Source/WebCore/inspector/PageInjectedScriptManager.h \
</span><span class="cx"> Source/WebCore/inspector/PageRuntimeAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/PageRuntimeAgent.h \
</span><del>- Source/WebCore/inspector/ScriptArguments.cpp \
- Source/WebCore/inspector/ScriptArguments.h \
- Source/WebCore/inspector/ScriptCallFrame.cpp \
- Source/WebCore/inspector/ScriptCallFrame.h \
- Source/WebCore/inspector/ScriptCallStack.cpp \
- Source/WebCore/inspector/ScriptCallStack.h \
</del><span class="cx"> Source/WebCore/inspector/TimelineRecordFactory.cpp \
</span><span class="cx"> Source/WebCore/inspector/TimelineRecordFactory.h \
</span><ins>+ Source/WebCore/inspector/WebConsoleAgent.cpp \
+ Source/WebCore/inspector/WebConsoleAgent.h \
</ins><span class="cx"> Source/WebCore/inspector/WebDebuggerAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/WebDebuggerAgent.h \
</span><span class="cx"> Source/WebCore/inspector/WorkerConsoleAgent.cpp \
</span><span class="lines">@@ -4054,7 +4041,6 @@
</span><span class="cx"> Source/WebCore/page/ChromeClient.h \
</span><span class="cx"> Source/WebCore/page/Console.cpp \
</span><span class="cx"> Source/WebCore/page/Console.h \
</span><del>- Source/WebCore/page/ConsoleTypes.h \
</del><span class="cx"> Source/WebCore/page/ContentSecurityPolicy.cpp \
</span><span class="cx"> Source/WebCore/page/ContentSecurityPolicy.h \
</span><span class="cx"> Source/WebCore/page/ContextMenuClient.h \
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> #include "IDBRequest.h"
</span><span class="cx"> #include "IDBTransaction.h"
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <limits>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -44,9 +44,9 @@
</span><span class="cx"> #include "IDBTransaction.h"
</span><span class="cx"> #include "IDBVersionChangeEvent.h"
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include <atomic>
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <limits>
</span><span class="cx"> #include <wtf/Atomics.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include "IDBOpenDBRequest.h"
</span><span class="cx"> #include "IDBPendingTransactionMonitor.h"
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesquotaDOMWindowQuotacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/quota/DOMWindowQuota.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/quota/DOMWindowQuota.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/quota/DOMWindowQuota.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> StorageInfo* DOMWindowQuota::webkitStorageInfo() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_storageInfo && frame()) {
</span><del>- frame()->document()->addConsoleMessage(JSMessageSource, WarningMessageLevel, "window.webkitStorageInfo is deprecated. Use navigator.webkitTemporaryStorage or navigator.webkitPersistentStorage instead.");
</del><ins>+ frame()->document()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("window.webkitStorageInfo is deprecated. Use navigator.webkitTemporaryStorage or navigator.webkitPersistentStorage instead."));
</ins><span class="cx"> m_storageInfo = StorageInfo::create();
</span><span class="cx"> }
</span><span class="cx"> return m_storageInfo.get();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioBufferSourceNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -32,10 +32,10 @@
</span><span class="cx"> #include "AudioNodeOutput.h"
</span><span class="cx"> #include "AudioUtilities.h"
</span><span class="cx"> #include "FloatConversion.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include <algorithm>
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx"> {
</span><span class="cx"> static bool firstTime = true;
</span><span class="cx"> if (firstTime && context() && context()->scriptExecutionContext()) {
</span><del>- context()->scriptExecutionContext()->addConsoleMessage(JSMessageSource, WarningMessageLevel, "AudioBufferSourceNode 'looping' attribute is deprecated. Use 'loop' instead.");
</del><ins>+ context()->scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("AudioBufferSourceNode 'looping' attribute is deprecated. Use 'loop' instead."));
</ins><span class="cx"> firstTime = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> {
</span><span class="cx"> static bool firstTime = true;
</span><span class="cx"> if (firstTime && context() && context()->scriptExecutionContext()) {
</span><del>- context()->scriptExecutionContext()->addConsoleMessage(JSMessageSource, WarningMessageLevel, "AudioBufferSourceNode 'looping' attribute is deprecated. Use 'loop' instead.");
</del><ins>+ context()->scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("AudioBufferSourceNode 'looping' attribute is deprecated. Use 'loop' instead."));
</ins><span class="cx"> firstTime = false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PannerNode.h"
</span><span class="cx"> #include "PeriodicWave.h"
</span><del>-#include "ScriptCallStack.h"
</del><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ScriptProcessorNode.h"
</span><span class="cx"> #include "WaveShaperNode.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioPannerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case SOUNDFIELD:
</span><span class="cx"> // FIXME: Implement sound field model. See // https://bugs.webkit.org/show_bug.cgi?id=77367.
</span><del>- context()->scriptExecutionContext()->addConsoleMessage(JSMessageSource, WarningMessageLevel, "'soundfield' panning model not implemented.");
</del><ins>+ context()->scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("'soundfield' panning model not implemented."));
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseBase::logErrorMessage(const String& message)
</span><span class="cx"> {
</span><del>- m_scriptExecutionContext->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message);
</del><ins>+ m_scriptExecutionContext->addConsoleMessage(MessageSource::Storage, MessageLevel::Error, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseManager::logErrorMessage(ScriptExecutionContext* context, const String& message)
</span><span class="cx"> {
</span><del>- context->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message);
</del><ins>+ context->addConsoleMessage(MessageSource::Storage, MessageLevel::Error, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -48,12 +48,12 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "MessageEvent.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "ThreadableWebSocketChannel.h"
</span><span class="cx"> #include "WebSocketChannel.h"
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -214,26 +214,26 @@
</span><span class="cx"> m_url = URL(URL(), url);
</span><span class="cx">
</span><span class="cx"> if (!m_url.isValid()) {
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Invalid url for WebSocket " + m_url.stringCenterEllipsizedToLength());
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "Invalid url for WebSocket " + m_url.stringCenterEllipsizedToLength());
</ins><span class="cx"> m_state = CLOSED;
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_url.protocolIs("ws") && !m_url.protocolIs("wss")) {
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Wrong url scheme for WebSocket " + m_url.stringCenterEllipsizedToLength());
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "Wrong url scheme for WebSocket " + m_url.stringCenterEllipsizedToLength());
</ins><span class="cx"> m_state = CLOSED;
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (m_url.hasFragmentIdentifier()) {
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "URL has fragment component " + m_url.stringCenterEllipsizedToLength());
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "URL has fragment component " + m_url.stringCenterEllipsizedToLength());
</ins><span class="cx"> m_state = CLOSED;
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!portAllowed(m_url)) {
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "WebSocket port " + String::number(m_url.port()) + " blocked");
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "WebSocket port " + String::number(m_url.port()) + " blocked");
</ins><span class="cx"> m_state = CLOSED;
</span><span class="cx"> ec = SECURITY_ERR;
</span><span class="cx"> return;
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> // comply with WebSocket API specification, but it seems to be the only reasonable way to handle this conflict.
</span><span class="cx"> for (size_t i = 0; i < protocols.size(); ++i) {
</span><span class="cx"> if (!isValidProtocolString(protocols[i])) {
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Wrong protocol for WebSocket '" + encodeProtocolString(protocols[i]) + "'");
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "Wrong protocol for WebSocket '" + encodeProtocolString(protocols[i]) + "'");
</ins><span class="cx"> m_state = CLOSED;
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return;
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> HashSet<String> visited;
</span><span class="cx"> for (size_t i = 0; i < protocols.size(); ++i) {
</span><span class="cx"> if (!visited.add(protocols[i]).isNewEntry) {
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "WebSocket protocols contain duplicates: '" + encodeProtocolString(protocols[i]) + "'");
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "WebSocket protocols contain duplicates: '" + encodeProtocolString(protocols[i]) + "'");
</ins><span class="cx"> m_state = CLOSED;
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return;
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> ASSERT(m_channel);
</span><span class="cx"> ThreadableWebSocketChannel::SendResult result = m_channel->send(message);
</span><span class="cx"> if (result == ThreadableWebSocketChannel::InvalidMessage) {
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Websocket message contains invalid character(s).");
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Websocket message contains invalid character(s)."));
</ins><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> }
</span><span class="cx"> CString utf8 = reason.utf8(StrictConversionReplacingUnpairedSurrogatesWithFFFD);
</span><span class="cx"> if (utf8.length() > maxReasonSizeInBytes) {
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "WebSocket close message is too long.");
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("WebSocket close message is too long."));
</ins><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> m_binaryType = BinaryTypeArrayBuffer;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "'" + binaryType + "' is not a valid value for binaryType; binaryType remains unchanged.");
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "'" + binaryType + "' is not a valid value for binaryType; binaryType remains unchanged.");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EventTargetInterface WebSocket::eventTargetInterface() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -48,14 +48,12 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "ProgressTracker.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SocketStreamError.h"
</span><span class="cx"> #include "SocketStreamHandle.h"
</span><span class="cx"> #include "WebSocketChannelClient.h"
</span><span class="cx"> #include "WebSocketHandshake.h"
</span><del>-
</del><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="lines">@@ -198,7 +196,7 @@
</span><span class="cx"> ASSERT(!m_suspended);
</span><span class="cx"> if (m_document) {
</span><span class="cx"> InspectorInstrumentation::didReceiveWebSocketFrameError(m_document, m_identifier, reason);
</span><del>- m_document->addConsoleMessage(NetworkMessageSource, ErrorMessageLevel, "WebSocket connection to '" + m_handshake->url().stringCenterEllipsizedToLength() + "' failed: " + reason);
</del><ins>+ m_document->addConsoleMessage(MessageSource::Network, MessageLevel::Error, "WebSocket connection to '" + m_handshake->url().stringCenterEllipsizedToLength() + "' failed: " + reason);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Hybi-10 specification explicitly states we must not continue to handle incoming data
</span><span class="lines">@@ -335,7 +333,7 @@
</span><span class="cx"> else
</span><span class="cx"> message = "WebSocket network error: " + error.localizedDescription();
</span><span class="cx"> InspectorInstrumentation::didReceiveWebSocketFrameError(m_document, m_identifier, message);
</span><del>- m_document->addConsoleMessage(NetworkMessageSource, ErrorMessageLevel, message);
</del><ins>+ m_document->addConsoleMessage(MessageSource::Network, MessageLevel::Error, message);
</ins><span class="cx"> }
</span><span class="cx"> m_shouldDiscardReceivedData = true;
</span><span class="cx"> handle->disconnect();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketHandshakecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include <wtf/CryptographicallyRandomNumber.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreUseJSCcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/UseJSC.cmake (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/UseJSC.cmake 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/UseJSC.cmake 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -159,7 +159,6 @@
</span><span class="cx"> bindings/js/PageScriptDebugServer.cpp
</span><span class="cx"> bindings/js/ScheduledAction.cpp
</span><span class="cx"> bindings/js/ScriptCachedFrameData.cpp
</span><del>- bindings/js/ScriptCallStackFactory.cpp
</del><span class="cx"> bindings/js/ScriptController.cpp
</span><span class="cx"> bindings/js/ScriptGlobalObject.cpp
</span><span class="cx"> bindings/js/ScriptProfile.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -2791,7 +2791,6 @@
</span><span class="cx"> __ZN7WebCore19InspectorController39setResourcesDataSizeLimitsFromInternalsEii
</span><span class="cx"> __ZN7WebCore19InspectorController4showEv
</span><span class="cx"> __ZN7WebCore19InspectorController5closeEv
</span><del>-__ZN7WebCore21InspectorConsoleAgent28consoleMessageArgumentCountsEv
</del><span class="cx"> __ZN7WebCore22instrumentationForPageEPNS_4PageE
</span><span class="cx"> __ZN7WebCore24InspectorInstrumentation17s_frontendCounterE
</span><span class="cx"> __ZN7WebCore24InspectorInstrumentation26instrumentingAgentsForPageEPNS_4PageE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -17189,20 +17189,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\ScriptCallStackFactory.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\bindings\js\ScriptController.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17479,14 +17465,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\ConsoleMessage.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\DOMEditor.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17503,14 +17481,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\IdentifiersFactory.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InjectedScriptCanvasModule.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17551,14 +17521,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\InspectorConsoleAgent.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InspectorController.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17831,7 +17793,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\ScriptArguments.cpp">
</del><ins>+ <ClCompile Include="..\inspector\TimelineRecordFactory.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17839,7 +17801,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\ScriptCallFrame.cpp">
</del><ins>+ <ClCompile Include="..\inspector\WebConsoleAgent.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17847,22 +17809,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\ScriptCallStack.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\inspector\TimelineRecordFactory.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\WebDebuggerAgent.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -18468,6 +18414,9 @@
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\heap\SlotVisitor.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\heap\StrongInlines.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\heap\Weak.h" />
</span><ins>+ <ClInclude Include="..\ForwardingHeaders\inspector\ConsoleMessage.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\ConsoleTypes.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\IdentifiersFactory.h" />
</ins><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InjectedScript.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InjectedScriptBase.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InjectedScriptHost.h" />
</span><span class="lines">@@ -18483,7 +18432,14 @@
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSTypeBuilders.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InspectorTypeBuilder.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InspectorValues.h" />
</span><ins>+ <ClInclude Include="..\ForwardingHeaders\inspector\ScriptArguments.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\ScriptBreakpoint.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\ScriptCallFrame.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\ScriptCallStack.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\ScriptCallStackFactory.h" />
</ins><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorAgent.h" />
</span><ins>+ <ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorConsoleAgent.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorDebuggerAgent.h" />
</ins><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorRuntimeAgent.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\masm\X86Assembler.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\parser\SourceCode.h" />
</span><span class="lines">@@ -18737,7 +18693,6 @@
</span><span class="cx"> <ClInclude Include="..\page\ChromeClient.h" />
</span><span class="cx"> <ClInclude Include="..\page\animation\CompositeAnimation.h" />
</span><span class="cx"> <ClInclude Include="..\page\Console.h" />
</span><del>- <ClInclude Include="..\page\ConsoleTypes.h" />
</del><span class="cx"> <ClInclude Include="..\page\ContentSecurityPolicy.h" />
</span><span class="cx"> <ClInclude Include="..\page\ContextMenuClient.h" />
</span><span class="cx"> <ClInclude Include="..\page\ContextMenuController.h" />
</span><span class="lines">@@ -20513,7 +20468,6 @@
</span><span class="cx"> <ClInclude Include="..\bindings\js\PageScriptDebugServer.h" />
</span><span class="cx"> <ClInclude Include="..\bindings\js\ScheduledAction.h" />
</span><span class="cx"> <ClInclude Include="..\bindings\js\ScriptCachedFrameData.h" />
</span><del>- <ClInclude Include="..\bindings\js\ScriptCallStackFactory.h" />
</del><span class="cx"> <ClInclude Include="..\bindings\js\ScriptController.h" />
</span><span class="cx"> <ClInclude Include="..\bindings\js\ScriptHeapSnapshot.h" />
</span><span class="cx"> <ClInclude Include="..\bindings\js\ScriptGlobalObject.h" />
</span><span class="lines">@@ -20817,19 +20771,15 @@
</span><span class="cx"> <ClInclude Include="..\bridge\runtime_method.h" />
</span><span class="cx"> <ClInclude Include="..\bridge\runtime_object.h" />
</span><span class="cx"> <ClInclude Include="..\bridge\runtime_root.h" />
</span><del>- <ClInclude Include="..\inspector\ConsoleAPITypes.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\CommandLineAPIHost.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\CommandLineAPIModule.h" />
</span><del>- <ClInclude Include="..\inspector\ConsoleMessage.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\DOMEditor.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\DOMPatchSupport.h" />
</span><del>- <ClInclude Include="..\inspector\IdentifiersFactory.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\InjectedScriptCanvasModule.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorApplicationCacheAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorCanvasAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorCanvasInstrumentation.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorClient.h" />
</span><del>- <ClInclude Include="..\inspector\InspectorConsoleAgent.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorConsoleInstrumentation.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorController.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorCounters.h" />
</span><span class="lines">@@ -20870,10 +20820,8 @@
</span><span class="cx"> <ClInclude Include="..\inspector\PageInjectedScriptHost.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\PageInjectedScriptManager.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\PageRuntimeAgent.h" />
</span><del>- <ClInclude Include="..\inspector\ScriptArguments.h" />
- <ClInclude Include="..\inspector\ScriptCallFrame.h" />
- <ClInclude Include="..\inspector\ScriptCallStack.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\TimelineRecordFactory.h" />
</span><ins>+ <ClInclude Include="..\inspector\WebConsoleAgent.h" />
</ins><span class="cx"> <ClInclude Include="..\inspector\WebDebuggerAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WorkerConsoleAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WorkerDebuggerAgent.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -4494,9 +4494,6 @@
</span><span class="cx"> <ClCompile Include="..\bindings\js\ScriptCachedFrameData.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\ScriptCallStackFactory.cpp">
- <Filter>bindings\js</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\bindings\js\ScriptController.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4725,18 +4722,12 @@
</span><span class="cx"> <ClCompile Include="..\inspector\CommandLineAPIModule.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\ConsoleMessage.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\DOMEditor.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\inspector\DOMPatchSupport.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\IdentifiersFactory.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InjectedScriptCanvasModule.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4752,9 +4743,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\InspectorClient.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\InspectorConsoleAgent.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InspectorController.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4854,18 +4842,12 @@
</span><span class="cx"> <ClCompile Include="..\inspector\PageRuntimeAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\ScriptArguments.cpp">
</del><ins>+ <ClCompile Include="..\inspector\TimelineRecordFactory.cpp">
</ins><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\ScriptCallFrame.cpp">
</del><ins>+ <ClCompile Include="..\inspector\WebConsoleAgent.cpp">
</ins><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\ScriptCallStack.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
- <ClCompile Include="..\inspector\TimelineRecordFactory.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\WebDebuggerAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -7490,9 +7472,6 @@
</span><span class="cx"> <ClInclude Include="..\page\Console.h">
</span><span class="cx"> <Filter>page</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\page\ConsoleTypes.h">
- <Filter>page</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\page\ContentSecurityPolicy.h">
</span><span class="cx"> <Filter>page</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -11351,9 +11330,6 @@
</span><span class="cx"> <ClInclude Include="..\bindings\js\ScriptCachedFrameData.h">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\bindings\js\ScriptCallStackFactory.h">
- <Filter>bindings\js</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\bindings\js\ScriptController.h">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12089,6 +12065,15 @@
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\heap\Strong.h">
</span><span class="cx"> <Filter>ForwardingHeaders\heap</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\ForwardingHeaders\inspector\ConsoleMessage.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ForwardingHeaders\inspector\ConsoleTypes.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ForwardingHeaders\inspector\IdentifiersFactory.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InjectedScript.h">
</span><span class="cx"> <Filter>ForwardingHeaders\inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12134,9 +12119,30 @@
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InspectorValues.h">
</span><span class="cx"> <Filter>ForwardingHeaders\inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\ForwardingHeaders\inspector\ScriptArguments.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ForwardingHeaders\inspector\ScriptBreakpoint.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ForwardingHeaders\inspector\ScriptCallFrame.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ForwardingHeaders\inspector\ScriptCallStack.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ForwardingHeaders\inspector\ScriptCallStackFactory.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorAgent.h">
</span><span class="cx"> <Filter>ForwardingHeaders\inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorConsoleAgent.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorDebuggerAgent.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorRuntimeAgent.h">
</span><span class="cx"> <Filter>ForwardingHeaders\inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12254,21 +12260,12 @@
</span><span class="cx"> <ClInclude Include="..\inspector\CommandLineAPIModule.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\ConsoleAPITypes.h">
- <Filter>inspector</Filter>
- </ClInclude>
- <ClInclude Include="..\inspector\ConsoleMessage.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\DOMEditor.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\inspector\DOMPatchSupport.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\IdentifiersFactory.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\InjectedScriptCanvasModule.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12284,9 +12281,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorClient.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\InspectorConsoleAgent.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorConsoleInstrumentation.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12407,18 +12401,12 @@
</span><span class="cx"> <ClInclude Include="..\inspector\PageRuntimeAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\ScriptArguments.h">
</del><ins>+ <ClInclude Include="..\inspector\TimelineRecordFactory.h">
</ins><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\ScriptCallFrame.h">
</del><ins>+ <ClInclude Include="..\inspector\WebConsoleAgent.h">
</ins><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\ScriptCallStack.h">
- <Filter>inspector</Filter>
- </ClInclude>
- <ClInclude Include="..\inspector\TimelineRecordFactory.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\WebDebuggerAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1059,7 +1059,6 @@
</span><span class="cx"> 2D9F0E1314FF1CBF00BA0FF7 /* linearSRGB.icc in Resources */ = {isa = PBXBuildFile; fileRef = 2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */; };
</span><span class="cx"> 2DBADE0B188E5915004D7981 /* WebCoreCALayerExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DBADE09188E5915004D7981 /* WebCoreCALayerExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2DBADE0C188E5915004D7981 /* WebCoreCALayerExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DBADE0A188E5915004D7981 /* WebCoreCALayerExtras.mm */; };
</span><del>- 2DF2E9D5166E39750035BEF2 /* ConsoleAPITypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF2E9D4166E39740035BEF2 /* ConsoleAPITypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 2E0888D41148848A00AF4265 /* JSDOMFormData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E0888D21148848A00AF4265 /* JSDOMFormData.cpp */; };
</span><span class="cx"> 2E0888D51148848A00AF4265 /* JSDOMFormData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E0888D31148848A00AF4265 /* JSDOMFormData.h */; };
</span><span class="cx"> 2E0888E6114884E200AF4265 /* JSDOMFormDataCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E0888E5114884E200AF4265 /* JSDOMFormDataCustom.cpp */; };
</span><span class="lines">@@ -1341,10 +1340,6 @@
</span><span class="cx"> 4167EBF5102962BA003D252A /* DefaultSharedWorkerRepository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4167EBF3102962BA003D252A /* DefaultSharedWorkerRepository.cpp */; };
</span><span class="cx"> 4167EBF6102962BA003D252A /* DefaultSharedWorkerRepository.h in Headers */ = {isa = PBXBuildFile; fileRef = 4167EBF4102962BA003D252A /* DefaultSharedWorkerRepository.h */; };
</span><span class="cx"> 416E29A6102FA962007FC14E /* WorkerReportingProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 416E29A5102FA962007FC14E /* WorkerReportingProxy.h */; };
</span><del>- 416E75BE0EDF8FD700360E1D /* ScriptCallStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 416E75BC0EDF8FD700360E1D /* ScriptCallStack.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 416E75BF0EDF8FD700360E1D /* ScriptCallStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416E75BD0EDF8FD700360E1D /* ScriptCallStack.cpp */; };
- 416E75CB0EDF90C700360E1D /* ScriptCallFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 416E75C90EDF90C700360E1D /* ScriptCallFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 416E75CC0EDF90C700360E1D /* ScriptCallFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416E75CA0EDF90C700360E1D /* ScriptCallFrame.cpp */; };
</del><span class="cx"> 417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417253A81354BBBC00360F2A /* MediaControlElements.cpp */; };
</span><span class="cx"> 417253AB1354BBBC00360F2A /* MediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = 417253A91354BBBC00360F2A /* MediaControlElements.h */; };
</span><span class="cx"> 417DA6D913734E6E007C57FB /* Internals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417DA4CF13734326007C57FB /* Internals.cpp */; };
</span><span class="lines">@@ -1384,8 +1379,6 @@
</span><span class="cx"> 41E1B1D10FF5986900576B3B /* AbstractWorker.h in Headers */ = {isa = PBXBuildFile; fileRef = 41E1B1CB0FF5986900576B3B /* AbstractWorker.h */; };
</span><span class="cx"> 41E1B1D30FF5986900576B3B /* SharedWorker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41E1B1CD0FF5986900576B3B /* SharedWorker.cpp */; };
</span><span class="cx"> 41E1B1D40FF5986900576B3B /* SharedWorker.h in Headers */ = {isa = PBXBuildFile; fileRef = 41E1B1CE0FF5986900576B3B /* SharedWorker.h */; };
</span><del>- 41F0618E0F5F069800A07EAC /* ConsoleMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F0618C0F5F069800A07EAC /* ConsoleMessage.h */; };
- 41F0618F0F5F069800A07EAC /* ConsoleMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F0618D0F5F069800A07EAC /* ConsoleMessage.cpp */; };
</del><span class="cx"> 41F062140F5F192600A07EAC /* InspectorDatabaseResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F062120F5F192600A07EAC /* InspectorDatabaseResource.h */; };
</span><span class="cx"> 41F062150F5F192600A07EAC /* InspectorDatabaseResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F062130F5F192600A07EAC /* InspectorDatabaseResource.cpp */; };
</span><span class="cx"> 41F066E40F64BCF600A07EAC /* ScriptGlobalObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F066E20F64BCF600A07EAC /* ScriptGlobalObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1988,8 +1981,6 @@
</span><span class="cx"> 5905ADC01302F3CE00F116DF /* XMLTreeViewer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */; };
</span><span class="cx"> 590E1B4911E4EF4B0069F784 /* DeviceOrientationData.h in Headers */ = {isa = PBXBuildFile; fileRef = 590E1B4811E4EF4B0069F784 /* DeviceOrientationData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 590E1B4B11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */; };
</span><del>- 5913A24113D49EBA00F5B05C /* IdentifiersFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5913A23F13D49EBA00F5B05C /* IdentifiersFactory.cpp */; };
- 5913A24213D49EBA00F5B05C /* IdentifiersFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 5913A24013D49EBA00F5B05C /* IdentifiersFactory.h */; };
</del><span class="cx"> 59309A1111F4AE5800250603 /* DeviceOrientationClientMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59309A1011F4AE5800250603 /* DeviceOrientationClientMock.cpp */; };
</span><span class="cx"> 59309A1311F4AE6A00250603 /* DeviceOrientationClientMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 59309A1211F4AE6A00250603 /* DeviceOrientationClientMock.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 598365DD1355F557001B185D /* JSPositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 598365DC1355F53C001B185D /* JSPositionCallback.h */; };
</span><span class="lines">@@ -3634,6 +3625,8 @@
</span><span class="cx"> A5416FE618810EF80009FC5F /* YouTubeEmbedShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A5416FE418810EF80009FC5F /* YouTubeEmbedShadowElement.h */; };
</span><span class="cx"> A54A82EC15228D2F00C72BA6 /* DOMNodePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = A54A82EA15228CA300C72BA6 /* DOMNodePrivate.h */; };
</span><span class="cx"> A54A82F115228DF600C72BA6 /* DOMNodePrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = A54A82EA15228CA300C72BA6 /* DOMNodePrivate.h */; };
</span><ins>+ A56C5B9A189F34570082D13C /* WebConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A56C5B98189F34570082D13C /* WebConsoleAgent.cpp */; };
+ A56C5B9B189F34570082D13C /* WebConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A56C5B99189F34570082D13C /* WebConsoleAgent.h */; };
</ins><span class="cx"> A5732B0A136A161D005C8D7C /* DateComponents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5732B08136A161D005C8D7C /* DateComponents.cpp */; };
</span><span class="cx"> A5732B0B136A161D005C8D7C /* DateComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = A5732B09136A161D005C8D7C /* DateComponents.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A5840E1C187B74D500843B10 /* InspectorInstrumentationCookie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5840E1A187B74D500843B10 /* InspectorInstrumentationCookie.cpp */; };
</span><span class="lines">@@ -5241,7 +5234,6 @@
</span><span class="cx"> BCE4413312F748E2009B84B8 /* RenderCombineText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE4413112F748E2009B84B8 /* RenderCombineText.cpp */; };
</span><span class="cx"> BCE4413412F748E2009B84B8 /* RenderCombineText.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE4413212F748E2009B84B8 /* RenderCombineText.h */; };
</span><span class="cx"> BCE4413612F7490B009B84B8 /* FontWidthVariant.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE4413512F7490B009B84B8 /* FontWidthVariant.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BCE5644E137A34D6007D2934 /* ConsoleTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE5644D137A34D6007D2934 /* ConsoleTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> BCE658FF0EA9248A007E4533 /* Theme.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE658FE0EA9248A007E4533 /* Theme.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCE659A90EA927B9007E4533 /* ThemeTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE659A80EA927B9007E4533 /* ThemeTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCE659E60EA92FB2007E4533 /* ThemeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE659E50EA92FB2007E4533 /* ThemeMac.h */; };
</span><span class="lines">@@ -6029,8 +6021,6 @@
</span><span class="cx"> F293B27E56C112F373FFF27E /* DNSResolveQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C60128060078BB70E367A95 /* DNSResolveQueue.cpp */; };
</span><span class="cx"> F325A40A14EE36FA007324E2 /* InspectorCounters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F325A40814EE36FA007324E2 /* InspectorCounters.cpp */; };
</span><span class="cx"> F325A40B14EE36FA007324E2 /* InspectorCounters.h in Headers */ = {isa = PBXBuildFile; fileRef = F325A40914EE36FA007324E2 /* InspectorCounters.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- F3335BF812E07DC300D33011 /* InspectorConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3335BF612E07DC300D33011 /* InspectorConsoleAgent.cpp */; };
- F3335BF912E07DC300D33011 /* InspectorConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3335BF712E07DC300D33011 /* InspectorConsoleAgent.h */; };
</del><span class="cx"> F33F0282120947F200E5743A /* ScriptProfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F33F0281120947F200E5743A /* ScriptProfile.cpp */; };
</span><span class="cx"> F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C75211294D9D00F26EEE /* InspectorFrontendClientLocal.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -6057,10 +6047,6 @@
</span><span class="cx"> F3820897147D35F90010BC06 /* WorkerConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */; };
</span><span class="cx"> F3820898147D35F90010BC06 /* WorkerRuntimeAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */; };
</span><span class="cx"> F3820899147D35F90010BC06 /* WorkerRuntimeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */; };
</span><del>- F392249C126F11AE00A926D9 /* ScriptCallStackFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F392249A126F11AE00A926D9 /* ScriptCallStackFactory.cpp */; };
- F392249D126F11AE00A926D9 /* ScriptCallStackFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F392249B126F11AE00A926D9 /* ScriptCallStackFactory.h */; };
- F39BE95B12673BF400E0A674 /* ScriptArguments.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F39BE95912673BF400E0A674 /* ScriptArguments.cpp */; };
- F39BE95C12673BF400E0A674 /* ScriptArguments.h in Headers */ = {isa = PBXBuildFile; fileRef = F39BE95A12673BF400E0A674 /* ScriptArguments.h */; };
</del><span class="cx"> F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */ = {isa = PBXBuildFile; fileRef = F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */; };
</span><span class="cx"> F3D461481161D53200CA0D09 /* JSErrorHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */; };
</span><span class="cx"> F3D461491161D53200CA0D09 /* JSErrorHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = F3D461471161D53200CA0D09 /* JSErrorHandler.h */; };
</span><span class="lines">@@ -7868,7 +7854,6 @@
</span><span class="cx"> 2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */ = {isa = PBXFileReference; lastKnownFileType = file; path = linearSRGB.icc; sourceTree = "<group>"; };
</span><span class="cx"> 2DBADE09188E5915004D7981 /* WebCoreCALayerExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreCALayerExtras.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DBADE0A188E5915004D7981 /* WebCoreCALayerExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreCALayerExtras.mm; sourceTree = "<group>"; };
</span><del>- 2DF2E9D4166E39740035BEF2 /* ConsoleAPITypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleAPITypes.h; sourceTree = "<group>"; };
</del><span class="cx"> 2E0888C3114883A900AF4265 /* DOMFormData.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMFormData.idl; sourceTree = "<group>"; };
</span><span class="cx"> 2E0888D21148848A00AF4265 /* JSDOMFormData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMFormData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2E0888D31148848A00AF4265 /* JSDOMFormData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMFormData.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -8175,10 +8160,6 @@
</span><span class="cx"> 4167EBF3102962BA003D252A /* DefaultSharedWorkerRepository.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DefaultSharedWorkerRepository.cpp; path = workers/DefaultSharedWorkerRepository.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4167EBF4102962BA003D252A /* DefaultSharedWorkerRepository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultSharedWorkerRepository.h; path = workers/DefaultSharedWorkerRepository.h; sourceTree = "<group>"; };
</span><span class="cx"> 416E29A5102FA962007FC14E /* WorkerReportingProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerReportingProxy.h; path = workers/WorkerReportingProxy.h; sourceTree = "<group>"; };
</span><del>- 416E75BC0EDF8FD700360E1D /* ScriptCallStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallStack.h; sourceTree = "<group>"; };
- 416E75BD0EDF8FD700360E1D /* ScriptCallStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallStack.cpp; sourceTree = "<group>"; };
- 416E75C90EDF90C700360E1D /* ScriptCallFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallFrame.h; sourceTree = "<group>"; };
- 416E75CA0EDF90C700360E1D /* ScriptCallFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallFrame.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 417253A81354BBBC00360F2A /* MediaControlElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlElements.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 417253A91354BBBC00360F2A /* MediaControlElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlElements.h; sourceTree = "<group>"; };
</span><span class="cx"> 417DA4CE13734326007C57FB /* Internals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Internals.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -8224,8 +8205,6 @@
</span><span class="cx"> 41E1B1CD0FF5986900576B3B /* SharedWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharedWorker.cpp; path = workers/SharedWorker.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 41E1B1CE0FF5986900576B3B /* SharedWorker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedWorker.h; path = workers/SharedWorker.h; sourceTree = "<group>"; };
</span><span class="cx"> 41E1B1CF0FF5986900576B3B /* SharedWorker.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = SharedWorker.idl; path = workers/SharedWorker.idl; sourceTree = "<group>"; };
</span><del>- 41F0618C0F5F069800A07EAC /* ConsoleMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleMessage.h; sourceTree = "<group>"; };
- 41F0618D0F5F069800A07EAC /* ConsoleMessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsoleMessage.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 41F062120F5F192600A07EAC /* InspectorDatabaseResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDatabaseResource.h; sourceTree = "<group>"; };
</span><span class="cx"> 41F062130F5F192600A07EAC /* InspectorDatabaseResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDatabaseResource.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 41F066E20F64BCF600A07EAC /* ScriptGlobalObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptGlobalObject.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -8900,8 +8879,6 @@
</span><span class="cx"> 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTreeViewer.h; sourceTree = "<group>"; };
</span><span class="cx"> 590E1B4811E4EF4B0069F784 /* DeviceOrientationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceOrientationData.h; sourceTree = "<group>"; };
</span><span class="cx"> 590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeviceOrientationEventCustom.cpp; sourceTree = "<group>"; };
</span><del>- 5913A23F13D49EBA00F5B05C /* IdentifiersFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IdentifiersFactory.cpp; sourceTree = "<group>"; };
- 5913A24013D49EBA00F5B05C /* IdentifiersFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdentifiersFactory.h; sourceTree = "<group>"; };
</del><span class="cx"> 59309A1011F4AE5800250603 /* DeviceOrientationClientMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeviceOrientationClientMock.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 59309A1211F4AE6A00250603 /* DeviceOrientationClientMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceOrientationClientMock.h; sourceTree = "<group>"; };
</span><span class="cx"> 5958F1CB1343917C0080B31F /* XMLViewer.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = XMLViewer.css; sourceTree = "<group>"; };
</span><span class="lines">@@ -10602,6 +10579,8 @@
</span><span class="cx"> A5416FE318810EF80009FC5F /* YouTubeEmbedShadowElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YouTubeEmbedShadowElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A5416FE418810EF80009FC5F /* YouTubeEmbedShadowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YouTubeEmbedShadowElement.h; sourceTree = "<group>"; };
</span><span class="cx"> A54A82EA15228CA300C72BA6 /* DOMNodePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMNodePrivate.h; sourceTree = "<group>"; };
</span><ins>+ A56C5B98189F34570082D13C /* WebConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebConsoleAgent.cpp; sourceTree = "<group>"; };
+ A56C5B99189F34570082D13C /* WebConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebConsoleAgent.h; sourceTree = "<group>"; };
</ins><span class="cx"> A5732B08136A161D005C8D7C /* DateComponents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateComponents.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A5732B09136A161D005C8D7C /* DateComponents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateComponents.h; sourceTree = "<group>"; };
</span><span class="cx"> A5840E1A187B74D500843B10 /* InspectorInstrumentationCookie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorInstrumentationCookie.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -12447,7 +12426,6 @@
</span><span class="cx"> BCE4413112F748E2009B84B8 /* RenderCombineText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderCombineText.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BCE4413212F748E2009B84B8 /* RenderCombineText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderCombineText.h; sourceTree = "<group>"; };
</span><span class="cx"> BCE4413512F7490B009B84B8 /* FontWidthVariant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontWidthVariant.h; sourceTree = "<group>"; };
</span><del>- BCE5644D137A34D6007D2934 /* ConsoleTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleTypes.h; sourceTree = "<group>"; };
</del><span class="cx"> BCE658FE0EA9248A007E4533 /* Theme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Theme.h; sourceTree = "<group>"; };
</span><span class="cx"> BCE659A80EA927B9007E4533 /* ThemeTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> BCE659E50EA92FB2007E4533 /* ThemeMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeMac.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -13349,8 +13327,6 @@
</span><span class="cx"> F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = "<group>"; };
</span><span class="cx"> F325A40814EE36FA007324E2 /* InspectorCounters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCounters.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F325A40914EE36FA007324E2 /* InspectorCounters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCounters.h; sourceTree = "<group>"; };
</span><del>- F3335BF612E07DC300D33011 /* InspectorConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorConsoleAgent.cpp; sourceTree = "<group>"; };
- F3335BF712E07DC300D33011 /* InspectorConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorConsoleAgent.h; sourceTree = "<group>"; };
</del><span class="cx"> F33F0281120947F200E5743A /* ScriptProfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptProfile.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontendClient.h; sourceTree = "<group>"; };
</span><span class="cx"> F344C75211294D9D00F26EEE /* InspectorFrontendClientLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontendClientLocal.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -13377,10 +13353,6 @@
</span><span class="cx"> F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerConsoleAgent.h; sourceTree = "<group>"; };
</span><span class="cx"> F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerRuntimeAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerRuntimeAgent.h; sourceTree = "<group>"; };
</span><del>- F392249A126F11AE00A926D9 /* ScriptCallStackFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallStackFactory.cpp; sourceTree = "<group>"; };
- F392249B126F11AE00A926D9 /* ScriptCallStackFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallStackFactory.h; sourceTree = "<group>"; };
- F39BE95912673BF400E0A674 /* ScriptArguments.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptArguments.cpp; sourceTree = "<group>"; };
- F39BE95A12673BF400E0A674 /* ScriptArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptArguments.h; sourceTree = "<group>"; };
</del><span class="cx"> F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstrumentingAgents.h; sourceTree = "<group>"; };
</span><span class="cx"> F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSErrorHandler.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F3D461471161D53200CA0D09 /* JSErrorHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSErrorHandler.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14795,15 +14767,10 @@
</span><span class="cx"> A584FE291863870F00843B10 /* CommandLineAPIModule.cpp */,
</span><span class="cx"> A584FE2A1863870F00843B10 /* CommandLineAPIModule.h */,
</span><span class="cx"> A584FE2718637DCA00843B10 /* CommandLineAPIModuleSource.js */,
</span><del>- 2DF2E9D4166E39740035BEF2 /* ConsoleAPITypes.h */,
- 41F0618D0F5F069800A07EAC /* ConsoleMessage.cpp */,
- 41F0618C0F5F069800A07EAC /* ConsoleMessage.h */,
</del><span class="cx"> 7AABA25714BC613300AA9A11 /* DOMEditor.cpp */,
</span><span class="cx"> 7AABA25814BC613300AA9A11 /* DOMEditor.h */,
</span><span class="cx"> 7A54881614E432A1006AE05A /* DOMPatchSupport.cpp */,
</span><span class="cx"> 7A54881514E432A1006AE05A /* DOMPatchSupport.h */,
</span><del>- 5913A23F13D49EBA00F5B05C /* IdentifiersFactory.cpp */,
- 5913A24013D49EBA00F5B05C /* IdentifiersFactory.h */,
</del><span class="cx"> AA73183C159255B900A93E6E /* InjectedScriptCanvasModule.cpp */,
</span><span class="cx"> AA73183D159255B900A93E6E /* InjectedScriptCanvasModule.h */,
</span><span class="cx"> AA9030FE157E16A000276247 /* InjectedScriptCanvasModuleSource.js */,
</span><span class="lines">@@ -14814,8 +14781,6 @@
</span><span class="cx"> AAD766EA157E502F00E85423 /* InspectorCanvasInstrumentation.h */,
</span><span class="cx"> 7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */,
</span><span class="cx"> 1C81B9580E97330800266E07 /* InspectorClient.h */,
</span><del>- F3335BF612E07DC300D33011 /* InspectorConsoleAgent.cpp */,
- F3335BF712E07DC300D33011 /* InspectorConsoleAgent.h */,
</del><span class="cx"> F3F5CF1012ED81A80084C569 /* InspectorConsoleInstrumentation.h */,
</span><span class="cx"> 1C81B9570E97330800266E07 /* InspectorController.cpp */,
</span><span class="cx"> 1C81B9560E97330800266E07 /* InspectorController.h */,
</span><span class="lines">@@ -14894,16 +14859,12 @@
</span><span class="cx"> A584FE2E1864CB8400843B10 /* PageInjectedScriptManager.h */,
</span><span class="cx"> F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */,
</span><span class="cx"> F382088D147D35F90010BC06 /* PageRuntimeAgent.h */,
</span><del>- F39BE95912673BF400E0A674 /* ScriptArguments.cpp */,
- F39BE95A12673BF400E0A674 /* ScriptArguments.h */,
- 416E75CA0EDF90C700360E1D /* ScriptCallFrame.cpp */,
- 416E75C90EDF90C700360E1D /* ScriptCallFrame.h */,
- 416E75BD0EDF8FD700360E1D /* ScriptCallStack.cpp */,
- 416E75BC0EDF8FD700360E1D /* ScriptCallStack.h */,
</del><span class="cx"> 9FA37EEF1172FD4100C4CD55 /* ScriptProfile.idl */,
</span><span class="cx"> 9FA37EF01172FD4100C4CD55 /* ScriptProfileNode.idl */,
</span><span class="cx"> 7553CFE7108F473F00EA281E /* TimelineRecordFactory.cpp */,
</span><span class="cx"> 7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */,
</span><ins>+ A56C5B98189F34570082D13C /* WebConsoleAgent.cpp */,
+ A56C5B99189F34570082D13C /* WebConsoleAgent.h */,
</ins><span class="cx"> A5E616711894581F009ADF50 /* WebDebuggerAgent.cpp */,
</span><span class="cx"> A5E616721894581F009ADF50 /* WebDebuggerAgent.h */,
</span><span class="cx"> F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */,
</span><span class="lines">@@ -16057,7 +16018,6 @@
</span><span class="cx"> BC0B36A10CD3C67C00AC7EB5 /* Console.cpp */,
</span><span class="cx"> BC0B36A20CD3C67C00AC7EB5 /* Console.h */,
</span><span class="cx"> BC0B36A30CD3C67C00AC7EB5 /* Console.idl */,
</span><del>- BCE5644D137A34D6007D2934 /* ConsoleTypes.h */,
</del><span class="cx"> 97C471D912F925BC0086354B /* ContentSecurityPolicy.cpp */,
</span><span class="cx"> 97C471DA12F925BD0086354B /* ContentSecurityPolicy.h */,
</span><span class="cx"> 065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */,
</span><span class="lines">@@ -20189,8 +20149,6 @@
</span><span class="cx"> BCA378BB0D15F64200B793D6 /* ScheduledAction.h */,
</span><span class="cx"> 41F1D21E0EF35C2A00DA8753 /* ScriptCachedFrameData.cpp */,
</span><span class="cx"> 41F1D21D0EF35C2A00DA8753 /* ScriptCachedFrameData.h */,
</span><del>- F392249A126F11AE00A926D9 /* ScriptCallStackFactory.cpp */,
- F392249B126F11AE00A926D9 /* ScriptCallStackFactory.h */,
</del><span class="cx"> 93B70D5309EB0C7C009D8468 /* ScriptController.cpp */,
</span><span class="cx"> 93B70D5409EB0C7C009D8468 /* ScriptController.h */,
</span><span class="cx"> A83E1C720E49042B00140B9C /* ScriptControllerMac.mm */,
</span><span class="lines">@@ -22889,10 +22847,7 @@
</span><span class="cx"> FD31608F12B026F700C1A359 /* Cone.h in Headers */,
</span><span class="cx"> 65C97AF308EA908800ACD273 /* config.h in Headers */,
</span><span class="cx"> BC0B36A50CD3C67C00AC7EB5 /* Console.h in Headers */,
</span><del>- 2DF2E9D5166E39750035BEF2 /* ConsoleAPITypes.h in Headers */,
- 41F0618E0F5F069800A07EAC /* ConsoleMessage.h in Headers */,
</del><span class="cx"> 073AB4B317F8BACA006E0D6F /* AllVideoCapabilities.h in Headers */,
</span><del>- BCE5644E137A34D6007D2934 /* ConsoleTypes.h in Headers */,
</del><span class="cx"> A818721C0977D3C0005826D9 /* ContainerNode.h in Headers */,
</span><span class="cx"> E1A1470811102B1500EEC0F3 /* ContainerNodeAlgorithms.h in Headers */,
</span><span class="cx"> 078E091D17D14D1C00420AA1 /* NavigatorUserMediaSuccessCallback.h in Headers */,
</span><span class="lines">@@ -23805,6 +23760,7 @@
</span><span class="cx"> 93309DE6099E64920056E581 /* HTMLInterchange.h in Headers */,
</span><span class="cx"> A81369E4097374F600D74463 /* HTMLKeygenElement.h in Headers */,
</span><span class="cx"> A81369E2097374F600D74463 /* HTMLLabelElement.h in Headers */,
</span><ins>+ A56C5B9B189F34570082D13C /* WebConsoleAgent.h in Headers */,
</ins><span class="cx"> A81369E0097374F600D74463 /* HTMLLegendElement.h in Headers */,
</span><span class="cx"> A8EA79F60A1916DF00A8EF5F /* HTMLLIElement.h in Headers */,
</span><span class="cx"> A871DC200A15205700B12A68 /* HTMLLinkElement.h in Headers */,
</span><span class="lines">@@ -23889,7 +23845,6 @@
</span><span class="cx"> 078E092117D14D1C00420AA1 /* RTCDTMFToneChangeEvent.h in Headers */,
</span><span class="cx"> 07277E5117D018CC0015534D /* JSMediaStreamEvent.h in Headers */,
</span><span class="cx"> 1A71D57C0F33819000F9CE4E /* IdentifierRep.h in Headers */,
</span><del>- 5913A24213D49EBA00F5B05C /* IdentifiersFactory.h in Headers */,
</del><span class="cx"> 49E911C50EF86D47009D0CAF /* IdentityTransformOperation.h in Headers */,
</span><span class="cx"> E125F856182C0F8300D84CD9 /* CryptoKeySerialization.h in Headers */,
</span><span class="cx"> A584FE2618637DAB00843B10 /* CommandLineAPIModuleSource.h in Headers */,
</span><span class="lines">@@ -23942,7 +23897,6 @@
</span><span class="cx"> AAD766EC157E502F00E85423 /* InspectorCanvasAgent.h in Headers */,
</span><span class="cx"> AAD766ED157E502F00E85423 /* InspectorCanvasInstrumentation.h in Headers */,
</span><span class="cx"> 1C81B95C0E97330800266E07 /* InspectorClient.h in Headers */,
</span><del>- F3335BF912E07DC300D33011 /* InspectorConsoleAgent.h in Headers */,
</del><span class="cx"> F3F5CF1112ED81A80084C569 /* InspectorConsoleInstrumentation.h in Headers */,
</span><span class="cx"> 1C81B95A0E97330800266E07 /* InspectorController.h in Headers */,
</span><span class="cx"> F325A40B14EE36FA007324E2 /* InspectorCounters.h in Headers */,
</span><span class="lines">@@ -25130,11 +25084,7 @@
</span><span class="cx"> 9BD0BF9312A42BF50072FD43 /* ScopedEventQueue.h in Headers */,
</span><span class="cx"> BCEC01BE0C274DAC009F4EC9 /* Screen.h in Headers */,
</span><span class="cx"> A84D82C111D3474800972990 /* ScriptableDocumentParser.h in Headers */,
</span><del>- F39BE95C12673BF400E0A674 /* ScriptArguments.h in Headers */,
</del><span class="cx"> 41F1D21F0EF35C2A00DA8753 /* ScriptCachedFrameData.h in Headers */,
</span><del>- 416E75CB0EDF90C700360E1D /* ScriptCallFrame.h in Headers */,
- 416E75BE0EDF8FD700360E1D /* ScriptCallStack.h in Headers */,
- F392249D126F11AE00A926D9 /* ScriptCallStackFactory.h in Headers */,
</del><span class="cx"> 93B70D7009EB0C7C009D8468 /* ScriptController.h in Headers */,
</span><span class="cx"> 4998AED213FB224D0090B1AA /* ScriptedAnimationController.h in Headers */,
</span><span class="cx"> 08A484780E5272C500C3FE76 /* ScriptElement.h in Headers */,
</span><span class="lines">@@ -26498,7 +26448,6 @@
</span><span class="cx"> FD31608E12B026F700C1A359 /* Cone.cpp in Sources */,
</span><span class="cx"> 3146FE6F184420AA001A937C /* OESTextureFloatLinear.cpp in Sources */,
</span><span class="cx"> BC0B36A40CD3C67C00AC7EB5 /* Console.cpp in Sources */,
</span><del>- 41F0618F0F5F069800A07EAC /* ConsoleMessage.cpp in Sources */,
</del><span class="cx"> A818721F0977D3C0005826D9 /* ContainerNode.cpp in Sources */,
</span><span class="cx"> A7A78CD51532BA62006C21E4 /* ContainerNodeAlgorithms.cpp in Sources */,
</span><span class="cx"> BC5EB9800E82072500B25965 /* ContentData.cpp in Sources */,
</span><span class="lines">@@ -27235,7 +27184,6 @@
</span><span class="cx"> C585A66211D4FAC5004C3E4B /* IDBBindingUtilities.cpp in Sources */,
</span><span class="cx"> 1A71D57B0F33819000F9CE4E /* IdentifierRep.cpp in Sources */,
</span><span class="cx"> 0705853117FDE6D9005F2BCB /* JSMediaTrackConstraint.cpp in Sources */,
</span><del>- 5913A24113D49EBA00F5B05C /* IdentifiersFactory.cpp in Sources */,
</del><span class="cx"> C3CF17A415B0063F00276D39 /* IdTargetObserver.cpp in Sources */,
</span><span class="cx"> C3CF17A615B0063F00276D39 /* IdTargetObserverRegistry.cpp in Sources */,
</span><span class="cx"> B275356F0B053814002CE64F /* Image.cpp in Sources */,
</span><span class="lines">@@ -27279,7 +27227,6 @@
</span><span class="cx"> E1F80B8A183172A2007885C3 /* JSCryptoKeyPairCustom.cpp in Sources */,
</span><span class="cx"> AAD766EB157E502F00E85423 /* InspectorCanvasAgent.cpp in Sources */,
</span><span class="cx"> 7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */,
</span><del>- F3335BF812E07DC300D33011 /* InspectorConsoleAgent.cpp in Sources */,
</del><span class="cx"> 1C81B95B0E97330800266E07 /* InspectorController.cpp in Sources */,
</span><span class="cx"> F325A40A14EE36FA007324E2 /* InspectorCounters.cpp in Sources */,
</span><span class="cx"> 82AB1743124B99EC00C5069D /* InspectorCSSAgent.cpp in Sources */,
</span><span class="lines">@@ -28444,11 +28391,7 @@
</span><span class="cx"> 9BD0BF9412A42BF50072FD43 /* ScopedEventQueue.cpp in Sources */,
</span><span class="cx"> BCEC01BD0C274DAC009F4EC9 /* Screen.cpp in Sources */,
</span><span class="cx"> A84D82C211D3474800972990 /* ScriptableDocumentParser.cpp in Sources */,
</span><del>- F39BE95B12673BF400E0A674 /* ScriptArguments.cpp in Sources */,
</del><span class="cx"> 41F1D2200EF35C2A00DA8753 /* ScriptCachedFrameData.cpp in Sources */,
</span><del>- 416E75CC0EDF90C700360E1D /* ScriptCallFrame.cpp in Sources */,
- 416E75BF0EDF8FD700360E1D /* ScriptCallStack.cpp in Sources */,
- F392249C126F11AE00A926D9 /* ScriptCallStackFactory.cpp in Sources */,
</del><span class="cx"> 93B70D6F09EB0C7C009D8468 /* ScriptController.cpp in Sources */,
</span><span class="cx"> A83E1C740E49042C00140B9C /* ScriptControllerMac.mm in Sources */,
</span><span class="cx"> 4998AED113FB224D0090B1AA /* ScriptedAnimationController.cpp in Sources */,
</span><span class="lines">@@ -28621,6 +28564,7 @@
</span><span class="cx"> 31A795C81888BCB500382F90 /* ANGLEInstancedArrays.cpp in Sources */,
</span><span class="cx"> A5840E24187B8AC200843B10 /* PageInjectedScriptHost.cpp in Sources */,
</span><span class="cx"> A8C4A7FE09D563270003AC8D /* StyledElement.cpp in Sources */,
</span><ins>+ A56C5B9A189F34570082D13C /* WebConsoleAgent.cpp in Sources */,
</ins><span class="cx"> BC5EB8B80E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp in Sources */,
</span><span class="cx"> AA4C3A760B2B1679002334A2 /* InlineStyleSheetOwner.cpp in Sources */,
</span><span class="cx"> 319AE063142D6B24006563A1 /* StyleFilterData.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSAudioContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSAudioContextCustom.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSAudioContextCustom.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/bindings/js/JSAudioContextCustom.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -73,8 +73,7 @@
</span><span class="cx"> #if ENABLE(LEGACY_WEB_AUDIO)
</span><span class="cx"> // Constructor for offline (render-target) AudioContext which renders into an AudioBuffer.
</span><span class="cx"> // new AudioContext(in unsigned long numberOfChannels, in unsigned long numberOfFrames, in float sampleRate);
</span><del>- document.addConsoleMessage(JSMessageSource, WarningMessageLevel,
- "Deprecated AudioContext constructor: use OfflineAudioContext instead");
</del><ins>+ document.addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("Deprecated AudioContext constructor: use OfflineAudioContext instead"));
</ins><span class="cx">
</span><span class="cx"> if (exec->argumentCount() < 3)
</span><span class="cx"> return throwVMError(exec, createNotEnoughArgumentsError(exec));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -143,7 +143,6 @@
</span><span class="cx"> #include "PageScriptDebugServer.cpp"
</span><span class="cx"> #include "ScheduledAction.cpp"
</span><span class="cx"> #include "ScriptCachedFrameData.cpp"
</span><del>-#include "ScriptCallStackFactory.cpp"
</del><span class="cx"> #include "ScriptController.cpp"
</span><span class="cx"> #include "ScriptProfiler.cpp"
</span><span class="cx"> #include "ScriptState.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomXPathNSResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> if (callType == CallTypeNone) {
</span><span class="cx"> // FIXME: <http://webkit.org/b/114312> JSCustomXPathNSResolver::lookupNamespaceURI Console Message should include Line, Column, and SourceURL
</span><span class="cx"> if (PageConsole* console = m_globalObject->impl().pageConsole())
</span><del>- console->addMessage(JSMessageSource, ErrorMessageLevel, "XPathNSResolver does not have a lookupNamespaceURI method.");
</del><ins>+ console->addMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("XPathNSResolver does not have a lookupNamespaceURI method."));
</ins><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx"> function = m_customResolver.get();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> #include "JSDOMWindowCustom.h"
</span><span class="cx"> #include "JSExceptionBase.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><del>-#include "ScriptCallStack.h"
-#include "ScriptCallStackFactory.h"
</del><ins>+#include <inspector/ScriptCallStack.h>
+#include <inspector/ScriptCallStackFactory.h>
</ins><span class="cx"> #include <interpreter/Interpreter.h>
</span><span class="cx"> #include <runtime/DateInstance.h>
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><ins>+using namespace Inspector;
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> return throwTypeError(exec);
</span><span class="cx">
</span><span class="cx"> if (!key->allows(CryptoKeyUsageEncrypt)) {
</span><del>- m_impl->document()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Key usages do not include 'encrypt'");
</del><ins>+ m_impl->document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'encrypt'"));
</ins><span class="cx"> setDOMException(exec, NOT_SUPPORTED_ERR);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> return throwTypeError(exec);
</span><span class="cx">
</span><span class="cx"> if (!key->allows(CryptoKeyUsageDecrypt)) {
</span><del>- m_impl->document()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Key usages do not include 'decrypt'");
</del><ins>+ m_impl->document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'decrypt'"));
</ins><span class="cx"> setDOMException(exec, NOT_SUPPORTED_ERR);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> return throwTypeError(exec);
</span><span class="cx">
</span><span class="cx"> if (!key->allows(CryptoKeyUsageSign)) {
</span><del>- m_impl->document()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Key usages do not include 'sign'");
</del><ins>+ m_impl->document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'sign'"));
</ins><span class="cx"> setDOMException(exec, NOT_SUPPORTED_ERR);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> return throwTypeError(exec);
</span><span class="cx">
</span><span class="cx"> if (!key->allows(CryptoKeyUsageVerify)) {
</span><del>- m_impl->document()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Key usages do not include 'verify'");
</del><ins>+ m_impl->document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'verify'"));
</ins><span class="cx"> setDOMException(exec, NOT_SUPPORTED_ERR);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx"> return throwTypeError(exec);
</span><span class="cx">
</span><span class="cx"> if (!wrappingKey->allows(CryptoKeyUsageWrapKey)) {
</span><del>- m_impl->document()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Key usages do not include 'wrapKey'");
</del><ins>+ m_impl->document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'wrapKey'"));
</ins><span class="cx"> setDOMException(exec, NOT_SUPPORTED_ERR);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="lines">@@ -718,7 +718,7 @@
</span><span class="cx"> return throwTypeError(exec);
</span><span class="cx">
</span><span class="cx"> if (!unwrappingKey->allows(CryptoKeyUsageUnwrapKey)) {
</span><del>- m_impl->document()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Key usages do not include 'unwrapKey'");
</del><ins>+ m_impl->document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'unwrapKey'"));
</ins><span class="cx"> setDOMException(exec, NOT_SUPPORTED_ERR);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptCallStackFactorycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,209 +0,0 @@
</span><del>-/*
- * Copyright (c) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ScriptCallStackFactory.h"
-
-#include "InspectorInstrumentation.h"
-#include "JSDOMBinding.h"
-#include "JSMainThreadExecState.h"
-#include "ScriptArguments.h"
-#include "ScriptCallFrame.h"
-#include "ScriptCallStack.h"
-#include <bindings/ScriptValue.h>
-#include <interpreter/CallFrame.h>
-#include <interpreter/CallFrameInlines.h>
-#include <interpreter/StackVisitor.h>
-#include <runtime/ArgList.h>
-#include <runtime/JSCJSValue.h>
-#include <runtime/JSFunction.h>
-#include <runtime/VM.h>
-#include <wtf/text/WTFString.h>
-
-using namespace JSC;
-
-namespace WebCore {
-
-class ScriptExecutionContext;
-
-class CreateScriptCallStackFunctor {
-public:
- CreateScriptCallStackFunctor(Vector<ScriptCallFrame>& frames, size_t remainingCapacity)
- : m_frames(frames)
- , m_remainingCapacityForFrameCapture(remainingCapacity)
- {
- }
-
- StackVisitor::Status operator()(StackVisitor& visitor)
- {
- if (m_remainingCapacityForFrameCapture) {
- unsigned line;
- unsigned column;
- visitor->computeLineAndColumn(line, column);
- m_frames.append(ScriptCallFrame(visitor->functionName(), visitor->sourceURL(), line, column));
-
- m_remainingCapacityForFrameCapture--;
- return StackVisitor::Continue;
- }
- return StackVisitor::Done;
- }
-
-private:
- Vector<ScriptCallFrame>& m_frames;
- size_t m_remainingCapacityForFrameCapture;
-};
-
-PassRefPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize, bool emptyIsAllowed)
-{
- Vector<ScriptCallFrame> frames;
- if (JSC::ExecState* exec = JSMainThreadExecState::currentState()) {
- CallFrame* frame = exec->vm().topCallFrame;
- CreateScriptCallStackFunctor functor(frames, maxStackSize);
- frame->iterate(functor);
- }
- if (frames.isEmpty() && !emptyIsAllowed) {
- // No frames found. It may happen in the case where
- // a bound function is called from native code for example.
- // Fallback to setting lineNumber to 0, and source and function name to "undefined".
- frames.append(ScriptCallFrame("undefined", "undefined", 0, 0));
- }
- return ScriptCallStack::create(frames);
-}
-
-class CreateScriptCallStackForConsoleFunctor {
-public:
- CreateScriptCallStackForConsoleFunctor(bool needToSkipAFrame, size_t remainingCapacity, Vector<ScriptCallFrame>& frames)
- : m_needToSkipAFrame(needToSkipAFrame)
- , m_remainingCapacityForFrameCapture(remainingCapacity)
- , m_frames(frames)
- {
- }
-
- StackVisitor::Status operator()(StackVisitor& visitor)
- {
- if (m_needToSkipAFrame) {
- m_needToSkipAFrame = false;
- return StackVisitor::Continue;
- }
-
- if (m_remainingCapacityForFrameCapture) {
- // This early exit is necessary to maintain our old behaviour
- // but the stack trace we produce now is complete and handles all
- // ways in which code may be running
- if (!visitor->callee() && m_frames.size())
- return StackVisitor::Done;
-
- unsigned line;
- unsigned column;
- visitor->computeLineAndColumn(line, column);
- m_frames.append(ScriptCallFrame(visitor->functionName(), visitor->sourceURL(), line, column));
-
- m_remainingCapacityForFrameCapture--;
- return StackVisitor::Continue;
- }
- return StackVisitor::Done;
- }
-
-private:
- bool m_needToSkipAFrame;
- size_t m_remainingCapacityForFrameCapture;
- Vector<ScriptCallFrame>& m_frames;
-};
-
-PassRefPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState* exec, size_t maxStackSize)
-{
- Vector<ScriptCallFrame> frames;
- ASSERT(exec);
- CallFrame* frame = exec->vm().topCallFrame;
- CreateScriptCallStackForConsoleFunctor functor(true, maxStackSize, frames);
- frame->iterate(functor);
- if (frames.isEmpty()) {
- CreateScriptCallStackForConsoleFunctor functor(false, maxStackSize, frames);
- frame->iterate(functor);
- }
- return ScriptCallStack::create(frames);
-}
-
-PassRefPtr<ScriptCallStack> createScriptCallStackFromException(JSC::ExecState* exec, JSC::JSValue& exception, size_t maxStackSize)
-{
- Vector<ScriptCallFrame> frames;
- RefCountedArray<StackFrame> stackTrace = exec->vm().exceptionStack();
- for (size_t i = 0; i < stackTrace.size() && i < maxStackSize; i++) {
- if (!stackTrace[i].callee && frames.size())
- break;
-
- String functionName = stackTrace[i].friendlyFunctionName(exec);
- unsigned line;
- unsigned column;
- stackTrace[i].computeLineAndColumn(line, column);
- frames.append(ScriptCallFrame(functionName, stackTrace[i].sourceURL, line, column));
- }
-
- // FIXME: <http://webkit.org/b/115087> Web Inspector: WebCore::reportException should not evaluate JavaScript handling exceptions
- // Fallback to getting at least the line and sourceURL from the exception if it has values and the exceptionStack doesn't.
- if (frames.size() > 0) {
- const ScriptCallFrame& firstCallFrame = frames.first();
- JSObject* exceptionObject = exception.toObject(exec);
- if (exception.isObject() && firstCallFrame.sourceURL().isEmpty()) {
- JSValue lineValue = exceptionObject->getDirect(exec->vm(), Identifier(exec, "line"));
- int lineNumber = lineValue && lineValue.isNumber() ? int(lineValue.toNumber(exec)) : 0;
- JSValue columnValue = exceptionObject->getDirect(exec->vm(), Identifier(exec, "column"));
- int columnNumber = columnValue && columnValue.isNumber() ? int(columnValue.toNumber(exec)) : 0;
- JSValue sourceURLValue = exceptionObject->getDirect(exec->vm(), Identifier(exec, "sourceURL"));
- String exceptionSourceURL = sourceURLValue && sourceURLValue.isString() ? sourceURLValue.toString(exec)->value(exec) : ASCIILiteral("undefined");
- frames[0] = ScriptCallFrame(firstCallFrame.functionName(), exceptionSourceURL, lineNumber, columnNumber);
- }
- }
-
- return ScriptCallStack::create(frames);
-}
-
-PassRefPtr<ScriptCallStack> createScriptCallStackForConsole(JSC::ExecState* exec)
-{
- size_t maxStackSize = 1;
- if (InspectorInstrumentation::hasFrontends()) {
- ScriptExecutionContext* scriptExecutionContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
- if (InspectorInstrumentation::consoleAgentEnabled(scriptExecutionContext))
- maxStackSize = ScriptCallStack::maxCallStackSizeToCapture;
- }
- return createScriptCallStack(exec, maxStackSize);
-}
-
-PassRefPtr<ScriptArguments> createScriptArguments(JSC::ExecState* exec, unsigned skipArgumentCount)
-{
- Vector<Deprecated::ScriptValue> arguments;
- size_t argumentCount = exec->argumentCount();
- for (size_t i = skipArgumentCount; i < argumentCount; ++i)
- arguments.append(Deprecated::ScriptValue(exec->vm(), exec->uncheckedArgument(i)));
- return ScriptArguments::create(exec, arguments);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptCallStackFactoryh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-/*
- * Copyright (c) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ScriptCallStackFactory_h
-#define ScriptCallStackFactory_h
-
-#include <wtf/Forward.h>
-#include <wtf/RefCountedArray.h>
-
-namespace JSC {
-class ExecState;
-class JSValue;
-struct StackFrame;
-}
-
-namespace WebCore {
-
-class ScriptArguments;
-class ScriptCallStack;
-
-PassRefPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize, bool emptyStackIsAllowed);
-PassRefPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState*, size_t maxStackSize);
-PassRefPtr<ScriptCallStack> createScriptCallStackFromException(JSC::ExecState*, JSC::JSValue& exception, size_t maxStackSize);
-PassRefPtr<ScriptCallStack> createScriptCallStackForConsole(JSC::ExecState*);
-PassRefPtr<ScriptArguments> createScriptArguments(JSC::ExecState*, unsigned skipArgumentCount);
-
-} // namespace WebCore
-
-#endif // ScriptCallStackFactory_h
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "PluginView.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="cx"> #include "ScriptableDocumentParser.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="lines">@@ -50,6 +49,7 @@
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <debugger/Debugger.h>
</span><span class="cx"> #include <heap/StrongInlines.h>
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <runtime/InitializeThreading.h>
</span><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> if (m_frame.document() && m_frame.document()->isSandboxed(SandboxScripts)) {
</span><span class="cx"> // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
</span><span class="cx"> if (reason == AboutToExecuteScript)
</span><del>- m_frame.document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Blocked script execution in '" + m_frame.document()->url().stringCenterEllipsizedToLength() + "' because the document's frame is sandboxed and the 'allow-scripts' permission is not set.");
</del><ins>+ m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Blocked script execution in '" + m_frame.document()->url().stringCenterEllipsizedToLength() + "' because the document's frame is sandboxed and the 'allow-scripts' permission is not set.");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -3059,9 +3059,9 @@
</span><span class="cx"> push(@callWithArgs, "scriptContext");
</span><span class="cx"> }
</span><span class="cx"> if ($function and $codeGenerator->ExtendedAttributeContains($callWith, "ScriptArguments")) {
</span><del>- push(@$outputArray, " RefPtr<ScriptArguments> scriptArguments(createScriptArguments(exec, " . @{$function->parameters} . "));\n");
- $implIncludes{"ScriptArguments.h"} = 1;
- $implIncludes{"ScriptCallStackFactory.h"} = 1;
</del><ins>+ push(@$outputArray, " RefPtr<Inspector::ScriptArguments> scriptArguments(Inspector::createScriptArguments(exec, " . @{$function->parameters} . "));\n");
+ $implIncludes{"<inspector/ScriptArguments.h>"} = 1;
+ $implIncludes{"<inspector/ScriptCallStackFactory.h>"} = 1;
</ins><span class="cx"> push(@callWithArgs, "scriptArguments.release()");
</span><span class="cx"> }
</span><span class="cx"> return @callWithArgs;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -44,14 +44,14 @@
</span><span class="cx"> #include "SVGDocument.h"
</span><span class="cx"> #include "SVGPoint.h"
</span><span class="cx"> #include "SVGStaticPropertyTearOff.h"
</span><del>-#include "ScriptArguments.h"
-#include "ScriptCallStackFactory.h"
</del><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "TestObj.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "bool.h"
</span><ins>+#include <inspector/ScriptArguments.h>
+#include <inspector/ScriptCallStackFactory.h>
</ins><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <runtime/JSArray.h>
</span><span class="cx"> #include <runtime/JSString.h>
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -11476,7 +11476,7 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: <http://webkit.org/b/114313> CSS parser console message errors should include column numbers.
</span><span class="cx"> PageConsole& console = m_styleSheet->singleOwnerDocument()->page()->console();
</span><del>- console.addMessage(CSSMessageSource, WarningMessageLevel, message, m_styleSheet->baseURL().string(), lineNumber + 1, 0);
</del><ins>+ console.addMessage(MessageSource::CSS, MessageLevel::Warning, message, m_styleSheet->baseURL().string(), lineNumber + 1, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StyleRuleKeyframes> CSSParser::createKeyframesRule(const String& name, PassOwnPtr<Vector<RefPtr<StyleKeyframe>>> popKeyframes)
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaList.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaList.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/css/MediaList.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx">
</span><span class="cx"> message.append(serializedExpression);
</span><span class="cx">
</span><del>- document->addConsoleMessage(CSSMessageSource, DebugMessageLevel, message);
</del><ins>+ document->addConsoleMessage(MessageSource::CSS, MessageLevel::Debug, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void reportMediaQueryWarningIfNeeded(Document* document, const MediaQuerySet* mediaQuerySet)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -60,9 +60,6 @@
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameView.h"
</span><del>-#include "HashChangeEvent.h"
-#include "HistogramSupport.h"
-#include "History.h"
</del><span class="cx"> #include "HTMLAllCollection.h"
</span><span class="cx"> #include "HTMLAnchorElement.h"
</span><span class="cx"> #include "HTMLBaseElement.h"
</span><span class="lines">@@ -86,6 +83,9 @@
</span><span class="cx"> #include "HTMLStyleElement.h"
</span><span class="cx"> #include "HTMLTitleElement.h"
</span><span class="cx"> #include "HTTPParsers.h"
</span><ins>+#include "HashChangeEvent.h"
+#include "HistogramSupport.h"
+#include "History.h"
</ins><span class="cx"> #include "HitTestResult.h"
</span><span class="cx"> #include "IconController.h"
</span><span class="cx"> #include "ImageLoader.h"
</span><span class="lines">@@ -126,7 +126,6 @@
</span><span class="cx"> #include "SVGSVGElement.h"
</span><span class="cx"> #include "SchemeRegistry.h"
</span><span class="cx"> #include "ScopedEventQueue.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ScriptRunner.h"
</span><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="lines">@@ -153,6 +152,7 @@
</span><span class="cx"> #include "XPathNSResolver.h"
</span><span class="cx"> #include "XPathResult.h"
</span><span class="cx"> #include "htmlediting.h"
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx"> #include <wtf/text/StringBuffer.h>
</span><span class="lines">@@ -2560,9 +2560,9 @@
</span><span class="cx"> return m_domWindow.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack> callStack)
</del><ins>+void Document::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack> callStack)
</ins><span class="cx"> {
</span><del>- addMessage(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, columnNumber, callStack);
</del><ins>+ addMessage(MessageSource::JS, MessageLevel::Error, errorMessage, sourceURL, lineNumber, columnNumber, callStack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::setURL(const URL& url)
</span><span class="lines">@@ -2821,7 +2821,7 @@
</span><span class="cx"> // intent, we must navigate away from the possibly partially-rendered document to a location that
</span><span class="cx"> // doesn't inherit the parent's SecurityOrigin.
</span><span class="cx"> frame->navigationScheduler().scheduleLocationChange(securityOrigin(), SecurityOrigin::urlWithUniqueSecurityOrigin(), String());
</span><del>- addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message, requestIdentifier);
</del><ins>+ addConsoleMessage(MessageSource::Security, MessageLevel::Error, message, requestIdentifier);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else if (equalIgnoringCase(equiv, "content-security-policy"))
</span><span class="lines">@@ -4781,7 +4781,7 @@
</span><span class="cx"> page->console().addMessage(source, level, message, requestIdentifier, this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</del><ins>+void Document::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><span class="cx"> postTask(AddConsoleMessageTask::create(source, level, message));
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/dom/Document.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1140,7 +1140,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual EventTarget* errorEventTarget() override;
</span><del>- virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) override;
</del><ins>+ virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack>) override;
</ins><span class="cx">
</span><span class="cx"> void initDNSPrefetch();
</span><span class="cx">
</span><span class="lines">@@ -1262,7 +1262,7 @@
</span><span class="cx"> virtual void refScriptExecutionContext() override { ref(); }
</span><span class="cx"> virtual void derefScriptExecutionContext() override { deref(); }
</span><span class="cx">
</span><del>- virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override;
</del><ins>+ virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override;
</ins><span class="cx">
</span><span class="cx"> virtual double minimumTimerInterval() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScriptElement.h"
</span><span class="cx">
</span><del>-#include "CachedScript.h"
</del><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "CachedResourceRequest.h"
</span><ins>+#include "CachedScript.h"
</ins><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "CrossOriginAccessControl.h"
</span><span class="cx"> #include "CurrentScriptIncrementer.h"
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "SVGNames.h"
</span><span class="cx"> #include "SVGScriptElement.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ScriptRunner.h"
</span><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="lines">@@ -49,6 +48,7 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "TextNodeTraversal.h"
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOSNIFF)
</span><span class="cx"> if (m_isExternalScript && m_cachedScript && !m_cachedScript->mimeTypeAllowedByNosniff()) {
</span><del>- m_element->document().addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Refused to execute script from '" + m_cachedScript->url().stringCenterEllipsizedToLength() + "' because its MIME type ('" + m_cachedScript->mimeType() + "') is not executable, and strict MIME type checking is enabled.");
</del><ins>+ m_element->document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Refused to execute script from '" + m_cachedScript->url().stringCenterEllipsizedToLength() + "' because its MIME type ('" + m_cachedScript->mimeType() + "') is not executable, and strict MIME type checking is enabled.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx">
</span><span class="cx"> dispatchErrorEvent();
</span><span class="cx"> DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Cross-origin script load denied by Cross-Origin Resource Sharing policy.")));
</span><del>- m_element->document().addConsoleMessage(JSMessageSource, ErrorMessageLevel, consoleMessage);
</del><ins>+ m_element->document().addConsoleMessage(MessageSource::JS, MessageLevel::Error, consoleMessage);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> #include "ErrorEvent.h"
</span><span class="cx"> #include "MessagePort.h"
</span><span class="cx"> #include "PublicURLManager.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="cx"> #include "WorkerThread.h"
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx"> #include "DatabaseContext.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+using namespace Inspector;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class ProcessMessagesSoonTask : public ScriptExecutionContext::Task {
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -29,10 +29,10 @@
</span><span class="cx"> #define ScriptExecutionContext_h
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><del>-#include "ConsoleTypes.h"
-#include "URL.h"
</del><span class="cx"> #include "SecurityContext.h"
</span><span class="cx"> #include "Supplementable.h"
</span><ins>+#include "URL.h"
+#include <inspector/ConsoleTypes.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -40,6 +40,10 @@
</span><span class="cx"> class VM;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace Inspector {
+class ScriptCallStack;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CachedScript;
</span><span class="lines">@@ -49,7 +53,6 @@
</span><span class="cx"> class EventQueue;
</span><span class="cx"> class EventTarget;
</span><span class="cx"> class MessagePort;
</span><del>-class ScriptCallStack;
</del><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span><span class="cx"> class PublicURLManager;
</span><span class="lines">@@ -75,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> bool sanitizeScriptError(String& errorMessage, int& lineNumber, int& columnNumber, String& sourceURL, CachedScript* = 0);
</span><span class="cx"> // FIXME: <http://webkit.org/b/114315> ScriptExecutionContext log exception should include a column number
</span><del>- void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>, CachedScript* = 0);
</del><ins>+ void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtr<Inspector::ScriptCallStack>, CachedScript* = 0);
</ins><span class="cx">
</span><span class="cx"> void addConsoleMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
</span><span class="cx"> virtual void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) = 0;
</span><span class="lines">@@ -177,9 +180,9 @@
</span><span class="cx"> ActiveDOMObject::ReasonForSuspension reasonForSuspendingActiveDOMObjects() const { return m_reasonForSuspendingActiveDOMObjects; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) = 0;
</del><ins>+ virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) = 0;
</ins><span class="cx"> virtual EventTarget* errorEventTarget() = 0;
</span><del>- virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) = 0;
</del><ins>+ virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack>) = 0;
</ins><span class="cx"> bool dispatchErrorEvent(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, CachedScript*);
</span><span class="cx">
</span><span class="cx"> void closeMessagePorts();
</span></span></pre></div>
<a id="trunkSourceWebCoredomViewportArgumentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -448,15 +448,15 @@
</span><span class="cx"> {
</span><span class="cx"> switch (errorCode) {
</span><span class="cx"> case TruncatedViewportArgumentValueError:
</span><del>- return WarningMessageLevel;
</del><ins>+ return MessageLevel::Warning;
</ins><span class="cx"> case UnrecognizedViewportArgumentKeyError:
</span><span class="cx"> case UnrecognizedViewportArgumentValueError:
</span><span class="cx"> case MaximumScaleTooLargeError:
</span><del>- return ErrorMessageLevel;
</del><ins>+ return MessageLevel::Error;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return ErrorMessageLevel;
</del><ins>+ return MessageLevel::Error;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void reportViewportWarning(Document* document, ViewportErrorCode errorCode, const String& replacement1, const String& replacement2)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> message.append(" Note that ';' is not a separator in viewport values. The list should be comma-separated.");
</span><span class="cx">
</span><span class="cx"> // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
</span><del>- document->addConsoleMessage(RenderingMessageSource, viewportErrorMessageLevel(errorCode), message);
</del><ins>+ document->addConsoleMessage(MessageSource::Rendering, viewportErrorMessageLevel(errorCode), message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/Blob.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/Blob.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/fileapi/Blob.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "BlobURL.h"
</span><span class="cx"> #include "File.h"
</span><span class="cx"> #include "HistogramSupport.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "ThreadableBlobRegistry.h"
</span><span class="cx"> #include <wtf/text/CString.h>
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiWebKitBlobBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "WebKitBlobBuilder.h"
</span><span class="cx">
</span><span class="cx"> #include "Blob.h"
</span><span class="lines">@@ -38,7 +37,6 @@
</span><span class="cx"> #include "File.h"
</span><span class="cx"> #include "HistogramSupport.h"
</span><span class="cx"> #include "LineEnding.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "TextEncoding.h"
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (element->document().isSandboxed(SandboxAutomaticFeatures)) {
</span><span class="cx"> // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
</span><del>- element->document().addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Blocked autofocusing on a form control because the form's frame is sandboxed and the 'allow-scripts' permission is not set.");
</del><ins>+ element->document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, ASCIILiteral("Blocked autofocusing on a form control because the form's frame is sandboxed and the 'allow-scripts' permission is not set."));
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> if (element->hasAutofocused())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> String message("An invalid form control with name='%name' is not focusable.");
</span><span class="cx"> message.replace("%name", control.name());
</span><del>- document().addConsoleMessage(RenderingMessageSource, ErrorMessageLevel, message);
</del><ins>+ document().addConsoleMessage(MessageSource::Rendering, MessageLevel::Error, message);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLIFrameElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLIFrameElement.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> String invalidTokens;
</span><span class="cx"> setSandboxFlags(value.isNull() ? SandboxNone : SecurityContext::parseSandboxPolicy(value, invalidTokens));
</span><span class="cx"> if (!invalidTokens.isNull())
</span><del>- document().addConsoleMessage(OtherMessageSource, ErrorMessageLevel, "Error while parsing the 'sandbox' attribute: " + invalidTokens);
</del><ins>+ document().addConsoleMessage(MessageSource::Other, MessageLevel::Error, "Error while parsing the 'sandbox' attribute: " + invalidTokens);
</ins><span class="cx"> } else
</span><span class="cx"> HTMLFrameElementBase::parseAttribute(name, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -2747,7 +2747,7 @@
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> static bool firstTime = true;
</span><span class="cx"> if (firstTime && scriptExecutionContext()) {
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, WarningMessageLevel, "'HTMLMediaElement.webkitGenerateKeyRequest()' is deprecated. Use 'MediaKeys.createSession()' instead.");
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("'HTMLMediaElement.webkitGenerateKeyRequest()' is deprecated. Use 'MediaKeys.createSession()' instead."));
</ins><span class="cx"> firstTime = false;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -2783,7 +2783,7 @@
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> static bool firstTime = true;
</span><span class="cx"> if (firstTime && scriptExecutionContext()) {
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, WarningMessageLevel, "'HTMLMediaElement.webkitAddKey()' is deprecated. Use 'MediaKeySession.update()' instead.");
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("'HTMLMediaElement.webkitAddKey()' is deprecated. Use 'MediaKeySession.update()' instead."));
</ins><span class="cx"> firstTime = false;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1859,7 +1859,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!canvas()->originClean()) {
</span><span class="cx"> DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Unable to get image data from canvas because the canvas has been tainted by cross-origin data.")));
</span><del>- canvas()->document().addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, consoleMessage);
</del><ins>+ canvas()->document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage);
</ins><span class="cx"> ec = SECURITY_ERR;
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -5528,7 +5528,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!canvas())
</span><span class="cx"> return;
</span><del>- canvas()->document().addConsoleMessage(RenderingMessageSource, WarningMessageLevel, message);
</del><ins>+ canvas()->document().addConsoleMessage(MessageSource::Rendering, MessageLevel::Warning, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebGLRenderingContext::validateFramebufferFuncParameters(const char* functionName, GC3Denum target, GC3Denum attachment)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditor.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (xssProtectionHeader == ContentSecurityPolicy::ReflectedXSSInvalid)
</span><del>- document->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Error parsing header X-XSS-Protection: " + headerValue + ": " + errorDetails + " at character position " + String::format("%u", errorPosition) + ". The default protections will be applied.");
</del><ins>+ document->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Error parsing header X-XSS-Protection: " + headerValue + ": " + errorDetails + " at character position " + String::format("%u", errorPosition) + ". The default protections will be applied.");
</ins><span class="cx">
</span><span class="cx"> ContentSecurityPolicy::ReflectedXSSDisposition cspHeader = document->contentSecurityPolicy()->reflectedXSSDisposition();
</span><span class="cx"> m_didSendValidCSPHeader = cspHeader != ContentSecurityPolicy::ReflectedXSSUnset && cspHeader != ContentSecurityPolicy::ReflectedXSSInvalid;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- m_document.addConsoleMessage(JSMessageSource, ErrorMessageLevel, buildConsoleError(xssInfo, m_document.url().string()));
</del><ins>+ m_document.addConsoleMessage(MessageSource::JS, MessageLevel::Error, buildConsoleError(xssInfo, m_document.url().string()));
</ins><span class="cx">
</span><span class="cx"> FrameLoader& frameLoader = m_document.frame()->loader();
</span><span class="cx"> if (xssInfo.m_didBlockEntirePage)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><del>-#include "InspectorConsoleAgent.h"
</del><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="cx"> #include "InspectorDOMStorageAgent.h"
</span><span class="cx"> #include "InspectorDatabaseAgent.h"
</span><span class="lines">@@ -49,6 +48,7 @@
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <inspector/agents/InspectorAgent.h>
</span><ins>+#include <inspector/agents/InspectorConsoleAgent.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIHost.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> #ifndef CommandLineAPIHost_h
</span><span class="cx"> #define CommandLineAPIHost_h
</span><span class="cx">
</span><del>-#include "ConsoleTypes.h"
</del><span class="cx"> #include "ScriptState.h"
</span><ins>+#include <inspector/ConsoleTypes.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx"> class InspectorAgent;
</span><ins>+class InspectorConsoleAgent;
</ins><span class="cx"> class InspectorObject;
</span><span class="cx"> class InspectorValue;
</span><span class="cx"> }
</span><span class="lines">@@ -49,7 +50,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Database;
</span><del>-class InspectorConsoleAgent;
</del><span class="cx"> class InspectorDOMAgent;
</span><span class="cx"> class InspectorDOMStorageAgent;
</span><span class="cx"> class InspectorDatabaseAgent;
</span><span class="lines">@@ -64,11 +64,11 @@
</span><span class="cx"> ~CommandLineAPIHost();
</span><span class="cx">
</span><span class="cx"> void init(Inspector::InspectorAgent* inspectorAgent
</span><del>- , InspectorConsoleAgent* consoleAgent
- , InspectorDOMAgent* domAgent
- , InspectorDOMStorageAgent* domStorageAgent
</del><ins>+ , Inspector::InspectorConsoleAgent* consoleAgent
+ , InspectorDOMAgent* domAgent
+ , InspectorDOMStorageAgent* domStorageAgent
</ins><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- , InspectorDatabaseAgent* databaseAgent
</del><ins>+ , InspectorDatabaseAgent* databaseAgent
</ins><span class="cx"> #endif
</span><span class="cx"> )
</span><span class="cx"> {
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> CommandLineAPIHost();
</span><span class="cx">
</span><span class="cx"> Inspector::InspectorAgent* m_inspectorAgent;
</span><del>- InspectorConsoleAgent* m_consoleAgent;
</del><ins>+ Inspector::InspectorConsoleAgent* m_consoleAgent;
</ins><span class="cx"> InspectorDOMAgent* m_domAgent;
</span><span class="cx"> InspectorDOMStorageAgent* m_domStorageAgent;
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorConsoleAPITypesh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ConsoleAPITypes.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ConsoleAPITypes.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/ConsoleAPITypes.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ConsoleAPITypes_h
-#define ConsoleAPITypes_h
-
-namespace WebCore {
-
-enum MessageType {
- LogMessageType,
- DirMessageType,
- DirXMLMessageType,
- TableMessageType,
- TraceMessageType,
- StartGroupMessageType,
- StartGroupCollapsedMessageType,
- EndGroupMessageType,
- ClearMessageType,
- AssertMessageType,
- TimingMessageType,
- ProfileMessageType,
- ProfileEndMessageType
-};
-
-} // namespace WebCore
-
-#endif // ConsoleAPITypes_h
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorConsoleMessagecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ConsoleMessage.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ConsoleMessage.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/ConsoleMessage.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,290 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
- * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ConsoleMessage.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "Console.h"
-#include "IdentifiersFactory.h"
-#include "ScriptArguments.h"
-#include "ScriptCallFrame.h"
-#include "ScriptCallStack.h"
-#include "ScriptCallStackFactory.h"
-#include <bindings/ScriptValue.h>
-#include <inspector/InjectedScript.h>
-#include <inspector/InjectedScriptManager.h>
-#include <inspector/InspectorValues.h>
-#include <wtf/MainThread.h>
-
-using namespace Inspector;
-
-namespace WebCore {
-
-ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned long requestIdentifier)
- : m_source(source)
- , m_type(type)
- , m_level(level)
- , m_message(message)
- , m_url()
- , m_line(0)
- , m_column(0)
- , m_repeatCount(1)
- , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
-{
- autogenerateMetadata(canGenerateCallStack);
-}
-
-ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& url, unsigned line, unsigned column, JSC::ExecState* state, unsigned long requestIdentifier)
- : m_source(source)
- , m_type(type)
- , m_level(level)
- , m_message(message)
- , m_url(url)
- , m_line(line)
- , m_column(column)
- , m_repeatCount(1)
- , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
-{
- autogenerateMetadata(canGenerateCallStack, state);
-}
-
-ConsoleMessage::ConsoleMessage(bool, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
- : m_source(source)
- , m_type(type)
- , m_level(level)
- , m_message(message)
- , m_arguments(nullptr)
- , m_line(0)
- , m_column(0)
- , m_repeatCount(1)
- , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
-{
- if (callStack && callStack->size()) {
- const ScriptCallFrame& frame = callStack->at(0);
- m_url = frame.sourceURL();
- m_line = frame.lineNumber();
- m_column = frame.columnNumber();
- }
- m_callStack = callStack;
-}
-
-ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptArguments> arguments, JSC::ExecState* state, unsigned long requestIdentifier)
- : m_source(source)
- , m_type(type)
- , m_level(level)
- , m_message(message)
- , m_arguments(arguments)
- , m_url()
- , m_line(0)
- , m_column(0)
- , m_repeatCount(1)
- , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
-{
- autogenerateMetadata(canGenerateCallStack, state);
-}
-
-ConsoleMessage::~ConsoleMessage()
-{
-}
-
-void ConsoleMessage::autogenerateMetadata(bool canGenerateCallStack, JSC::ExecState* state)
-{
- if (m_type == EndGroupMessageType)
- return;
-
- if (state)
- m_callStack = createScriptCallStackForConsole(state);
- else if (canGenerateCallStack)
- m_callStack = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture, true);
- else
- return;
-
- if (m_callStack && m_callStack->size()) {
- const ScriptCallFrame& frame = m_callStack->at(0);
- m_url = frame.sourceURL();
- m_line = frame.lineNumber();
- m_column = frame.columnNumber();
- return;
- }
-
- m_callStack.clear();
-}
-
-// Keep in sync with inspector/front-end/ConsoleView.js
-static Inspector::TypeBuilder::Console::ConsoleMessage::Source::Enum messageSourceValue(MessageSource source)
-{
- switch (source) {
- case XMLMessageSource: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::XML;
- case JSMessageSource: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Javascript;
- case NetworkMessageSource: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Network;
- case ConsoleAPIMessageSource: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::ConsoleAPI;
- case StorageMessageSource: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Storage;
- case AppCacheMessageSource: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Appcache;
- case RenderingMessageSource: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Rendering;
- case CSSMessageSource: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::CSS;
- case SecurityMessageSource: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Security;
- case OtherMessageSource: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Other;
- }
- return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Other;
-}
-
-static Inspector::TypeBuilder::Console::ConsoleMessage::Type::Enum messageTypeValue(MessageType type)
-{
- switch (type) {
- case LogMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Log;
- case ClearMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Clear;
- case DirMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Dir;
- case DirXMLMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::DirXML;
- case TableMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Table;
- case TraceMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Trace;
- case StartGroupMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::StartGroup;
- case StartGroupCollapsedMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::StartGroupCollapsed;
- case EndGroupMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::EndGroup;
- case AssertMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Assert;
- case TimingMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Timing;
- case ProfileMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Profile;
- case ProfileEndMessageType: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::ProfileEnd;
- }
- return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Log;
-}
-
-static Inspector::TypeBuilder::Console::ConsoleMessage::Level::Enum messageLevelValue(MessageLevel level)
-{
- switch (level) {
- case DebugMessageLevel: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Debug;
- case LogMessageLevel: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Log;
- case WarningMessageLevel: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Warning;
- case ErrorMessageLevel: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Error;
- }
- return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Log;
-}
-
-void ConsoleMessage::addToFrontend(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher, Inspector::InjectedScriptManager* injectedScriptManager, bool generatePreview)
-{
- RefPtr<Inspector::TypeBuilder::Console::ConsoleMessage> jsonObj = Inspector::TypeBuilder::Console::ConsoleMessage::create()
- .setSource(messageSourceValue(m_source))
- .setLevel(messageLevelValue(m_level))
- .setText(m_message);
- // FIXME: only send out type for ConsoleAPI source messages.
- jsonObj->setType(messageTypeValue(m_type));
- jsonObj->setLine(static_cast<int>(m_line));
- jsonObj->setColumn(static_cast<int>(m_column));
- jsonObj->setUrl(m_url);
- jsonObj->setRepeatCount(static_cast<int>(m_repeatCount));
- if (m_source == NetworkMessageSource && !m_requestId.isEmpty())
- jsonObj->setNetworkRequestId(m_requestId);
- if (m_arguments && m_arguments->argumentCount()) {
- InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState());
- if (!injectedScript.hasNoValue()) {
- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::RemoteObject>> jsonArgs = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::RemoteObject>::create();
- if (m_type == TableMessageType && generatePreview && m_arguments->argumentCount()) {
- Deprecated::ScriptValue table = m_arguments->argumentAt(0);
- Deprecated::ScriptValue columns = m_arguments->argumentCount() > 1 ? m_arguments->argumentAt(1) : Deprecated::ScriptValue();
- RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapTable(table, columns);
- if (!inspectorValue) {
- ASSERT_NOT_REACHED();
- return;
- }
- jsonArgs->addItem(inspectorValue);
- } else {
- for (unsigned i = 0; i < m_arguments->argumentCount(); ++i) {
- RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), "console", generatePreview);
- if (!inspectorValue) {
- ASSERT_NOT_REACHED();
- return;
- }
- jsonArgs->addItem(inspectorValue);
- }
- }
- jsonObj->setParameters(jsonArgs);
- }
- }
- if (m_callStack)
- jsonObj->setStackTrace(m_callStack->buildInspectorArray());
- consoleFrontendDispatcher->messageAdded(jsonObj);
-}
-
-void ConsoleMessage::updateRepeatCountInConsole(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher)
-{
- consoleFrontendDispatcher->messageRepeatCountUpdated(m_repeatCount);
-}
-
-bool ConsoleMessage::isEqual(ConsoleMessage* msg) const
-{
- if (m_arguments) {
- if (!m_arguments->isEqual(msg->m_arguments.get()))
- return false;
- // Never treat objects as equal - their properties might change over time.
- for (size_t i = 0; i < m_arguments->argumentCount(); ++i) {
- if (m_arguments->argumentAt(i).isObject())
- return false;
- }
- } else if (msg->m_arguments)
- return false;
-
- if (m_callStack) {
- if (!m_callStack->isEqual(msg->m_callStack.get()))
- return false;
- } else if (msg->m_callStack)
- return false;
-
- return msg->m_source == m_source
- && msg->m_type == m_type
- && msg->m_level == m_level
- && msg->m_message == m_message
- && msg->m_line == m_line
- && msg->m_column == m_column
- && msg->m_url == m_url
- && msg->m_requestId == m_requestId;
-}
-
-void ConsoleMessage::windowCleared(DOMWindow* window)
-{
- if (!m_arguments)
- return;
- if (domWindowFromExecState(m_arguments->globalState()) != window)
- return;
- if (!m_message)
- m_message = "<message collected>";
- m_arguments.clear();
-}
-
-unsigned ConsoleMessage::argumentCount()
-{
- if (m_arguments)
- return m_arguments->argumentCount();
- return 0;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorConsoleMessageh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ConsoleMessage.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ConsoleMessage.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/ConsoleMessage.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
- * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ConsoleMessage_h
-#define ConsoleMessage_h
-
-#include "ConsoleAPITypes.h"
-#include "ConsoleTypes.h"
-#include "InspectorWebFrontendDispatchers.h"
-#include "ScriptState.h"
-#include <wtf/Forward.h>
-#include <wtf/Vector.h>
-
-namespace Inspector {
-class InjectedScriptManager;
-class InspectorObject;
-}
-
-namespace WebCore {
-
-class DOMWindow;
-class ScriptArguments;
-class ScriptCallFrame;
-class ScriptCallStack;
-
-class ConsoleMessage {
- WTF_MAKE_NONCOPYABLE(ConsoleMessage); WTF_MAKE_FAST_ALLOCATED;
-public:
- ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, unsigned long requestIdentifier = 0);
- ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, const String& url, unsigned line, unsigned column, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
- ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0);
- ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, JSC::ExecState*, unsigned long requestIdentifier = 0);
- ~ConsoleMessage();
-
- void addToFrontend(Inspector::InspectorConsoleFrontendDispatcher*, Inspector::InjectedScriptManager*, bool generatePreview);
- void updateRepeatCountInConsole(Inspector::InspectorConsoleFrontendDispatcher*);
- void incrementCount() { ++m_repeatCount; }
- bool isEqual(ConsoleMessage* msg) const;
-
- MessageSource source() const { return m_source; }
- const String& message() const { return m_message; }
- MessageType type() const { return m_type; }
-
- void windowCleared(DOMWindow*);
-
- unsigned argumentCount();
-
-private:
- void autogenerateMetadata(bool canGenerateCallStack, JSC::ExecState* = nullptr);
-
- MessageSource m_source;
- MessageType m_type;
- MessageLevel m_level;
- String m_message;
- RefPtr<ScriptArguments> m_arguments;
- RefPtr<ScriptCallStack> m_callStack;
- String m_url;
- unsigned m_line;
- unsigned m_column;
- unsigned m_repeatCount;
- String m_requestId;
-};
-
-} // namespace WebCore
-
-#endif // ConsoleMessage_h
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorIdentifiersFactorycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/IdentifiersFactory.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/IdentifiersFactory.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/IdentifiersFactory.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,69 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "IdentifiersFactory.h"
-
-#include <wtf/text/StringBuilder.h>
-
-namespace WebCore {
-
-namespace {
-static long s_lastUsedIdentifier = 0;
-}
-
-// static
-long IdentifiersFactory::s_processId;
-
-// static
-String IdentifiersFactory::createIdentifier()
-{
- return addProcessIdPrefixTo(String::number(++s_lastUsedIdentifier));
-}
-
-// static
-String IdentifiersFactory::requestId(unsigned long identifier)
-{
- if (identifier)
- return addProcessIdPrefixTo(String::number(identifier));
- return String();
-}
-
-// static
-String IdentifiersFactory::addProcessIdPrefixTo(const String& id)
-{
- StringBuilder builder;
- builder.appendNumber(s_processId);
- builder.append('.');
- builder.append(id);
- return builder.toString();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorIdentifiersFactoryh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/IdentifiersFactory.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/IdentifiersFactory.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/IdentifiersFactory.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef IdentifiersFactory_h
-#define IdentifiersFactory_h
-
-#include <wtf/text/WTFString.h>
-
-#if ENABLE(INSPECTOR)
-
-namespace WebCore {
-
-class IdentifiersFactory {
-public:
- static void setProcessId(long processId) { s_processId = processId; }
- static String createIdentifier();
- static String requestId(unsigned long identifier);
-private:
- static String addProcessIdPrefixTo(const String& id);
-
- static long s_processId;
-};
-
-} // namespace WebCore
-
-#endif // !defined(IdentifiersFactory_h)
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAllInOne.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -27,16 +27,13 @@
</span><span class="cx">
</span><span class="cx"> #include "CommandLineAPIHost.cpp"
</span><span class="cx"> #include "CommandLineAPIModule.cpp"
</span><del>-#include "ConsoleMessage.cpp"
</del><span class="cx"> #include "DOMEditor.cpp"
</span><span class="cx"> #include "DOMPatchSupport.cpp"
</span><del>-#include "IdentifiersFactory.cpp"
</del><span class="cx"> #include "InjectedScriptCanvasModule.cpp"
</span><span class="cx"> #include "InspectorApplicationCacheAgent.cpp"
</span><span class="cx"> #include "InspectorCSSAgent.cpp"
</span><span class="cx"> #include "InspectorCanvasAgent.cpp"
</span><span class="cx"> #include "InspectorClient.cpp"
</span><del>-#include "InspectorConsoleAgent.cpp"
</del><span class="cx"> #include "InspectorController.cpp"
</span><span class="cx"> #include "InspectorCounters.cpp"
</span><span class="cx"> #include "InspectorDOMAgent.cpp"
</span><span class="lines">@@ -70,10 +67,8 @@
</span><span class="cx"> #include "PageInjectedScriptHost.cpp"
</span><span class="cx"> #include "PageInjectedScriptManager.cpp"
</span><span class="cx"> #include "PageRuntimeAgent.cpp"
</span><del>-#include "ScriptArguments.cpp"
-#include "ScriptCallFrame.cpp"
-#include "ScriptCallStack.cpp"
</del><span class="cx"> #include "TimelineRecordFactory.cpp"
</span><ins>+#include "WebConsoleAgent.cpp"
</ins><span class="cx"> #include "WebDebuggerAgent.cpp"
</span><span class="cx"> #include "WorkerConsoleAgent.cpp"
</span><span class="cx"> #include "WorkerDebuggerAgent.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,333 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "config.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorConsoleAgent.h"
-
-#include "CommandLineAPIHost.h"
-#include "Console.h"
-#include "ConsoleMessage.h"
-#include "DOMWindow.h"
-#include "InspectorWebFrontendDispatchers.h"
-#include "InstrumentingAgents.h"
-#include "PageInjectedScriptManager.h"
-#include "ResourceError.h"
-#include "ResourceResponse.h"
-#include "ScriptArguments.h"
-#include "ScriptCallFrame.h"
-#include "ScriptCallStack.h"
-#include "ScriptCallStackFactory.h"
-#include "ScriptProfiler.h"
-#include <bindings/ScriptObject.h>
-#include <wtf/CurrentTime.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/text/StringBuilder.h>
-#include <wtf/text/WTFString.h>
-
-using namespace Inspector;
-
-namespace WebCore {
-
-static const unsigned maximumConsoleMessages = 1000;
-static const int expireConsoleMessagesStep = 100;
-
-InspectorConsoleAgent::InspectorConsoleAgent(InstrumentingAgents* instrumentingAgents, PageInjectedScriptManager* injectedScriptManager)
- : InspectorAgentBase(ASCIILiteral("Console"), instrumentingAgents)
- , m_injectedScriptManager(injectedScriptManager)
- , m_previousMessage(nullptr)
- , m_expiredConsoleMessageCount(0)
- , m_enabled(false)
- , m_monitoringXHREnabled(false)
-{
- m_instrumentingAgents->setInspectorConsoleAgent(this);
-}
-
-InspectorConsoleAgent::~InspectorConsoleAgent()
-{
- m_instrumentingAgents->setInspectorConsoleAgent(nullptr);
- m_instrumentingAgents = nullptr;
- m_injectedScriptManager = nullptr;
-}
-
-void InspectorConsoleAgent::enable(ErrorString*)
-{
- if (m_enabled)
- return;
- m_enabled = true;
-
- if (m_expiredConsoleMessageCount) {
- ConsoleMessage expiredMessage(!isWorkerAgent(), OtherMessageSource, LogMessageType, WarningMessageLevel, String::format("%d console messages are not shown.", m_expiredConsoleMessageCount));
- expiredMessage.addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, false);
- }
-
- size_t messageCount = m_consoleMessages.size();
- for (size_t i = 0; i < messageCount; ++i)
- m_consoleMessages[i]->addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, false);
-}
-
-void InspectorConsoleAgent::disable(ErrorString*)
-{
- if (!m_enabled)
- return;
- m_enabled = false;
-}
-
-void InspectorConsoleAgent::clearMessages(ErrorString*)
-{
- m_consoleMessages.clear();
- m_expiredConsoleMessageCount = 0;
- m_previousMessage = nullptr;
- m_injectedScriptManager->releaseObjectGroup("console");
- if (m_frontendDispatcher && m_enabled)
- m_frontendDispatcher->messagesCleared();
-}
-
-void InspectorConsoleAgent::reset()
-{
- ErrorString error;
- clearMessages(&error);
- m_times.clear();
- m_counts.clear();
-}
-
-void InspectorConsoleAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
-{
- m_frontendDispatcher = std::make_unique<InspectorConsoleFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorConsoleBackendDispatcher::create(backendDispatcher, this);
-}
-
-void InspectorConsoleAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
-{
- m_frontendDispatcher = nullptr;
- m_backendDispatcher.clear();
-
- String errorString;
- disable(&errorString);
-}
-
-void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
-{
- if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
- return;
-
- if (type == ClearMessageType) {
- ErrorString error;
- clearMessages(&error);
- }
-
- addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type, level, message, callStack, requestIdentifier)));
-}
-
-void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier)
-{
- if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
- return;
-
- if (type == ClearMessageType) {
- ErrorString error;
- clearMessages(&error);
- }
-
- addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type, level, message, arguments, state, requestIdentifier)));
-}
-
-void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* state, unsigned long requestIdentifier)
-{
- if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
- return;
-
- if (type == ClearMessageType) {
- ErrorString error;
- clearMessages(&error);
- }
-
- bool canGenerateCallStack = !isWorkerAgent() && m_frontendDispatcher;
- addConsoleMessage(adoptPtr(new ConsoleMessage(canGenerateCallStack, source, type, level, message, scriptID, lineNumber, columnNumber, state, requestIdentifier)));
-}
-
-Vector<unsigned> InspectorConsoleAgent::consoleMessageArgumentCounts()
-{
- Vector<unsigned> result(m_consoleMessages.size());
- for (size_t i = 0; i < m_consoleMessages.size(); i++)
- result[i] = m_consoleMessages[i]->argumentCount();
- return result;
-}
-
-void InspectorConsoleAgent::startTiming(const String& title)
-{
- // Follow Firebug's behavior of requiring a title that is not null or
- // undefined for timing functions
- if (title.isNull())
- return;
-
- m_times.add(title, monotonicallyIncreasingTime());
-}
-
-void InspectorConsoleAgent::stopTiming(const String& title, PassRefPtr<ScriptCallStack> callStack)
-{
- // Follow Firebug's behavior of requiring a title that is not null or
- // undefined for timing functions
- if (title.isNull())
- return;
-
- HashMap<String, double>::iterator it = m_times.find(title);
- if (it == m_times.end())
- return;
-
- double startTime = it->value;
- m_times.remove(it);
-
- double elapsed = monotonicallyIncreasingTime() - startTime;
- String message = title + String::format(": %.3fms", elapsed * 1000);
- addMessageToConsole(ConsoleAPIMessageSource, TimingMessageType, DebugMessageLevel, message, callStack);
-}
-
-void InspectorConsoleAgent::count(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
-{
- RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(state));
- const ScriptCallFrame& lastCaller = callStack->at(0);
- // Follow Firebug's behavior of counting with null and undefined title in
- // the same bucket as no argument
- String title;
- arguments->getFirstArgumentAsString(title);
- String identifier = title + '@' + lastCaller.sourceURL() + ':' + String::number(lastCaller.lineNumber());
-
- HashMap<String, unsigned>::iterator it = m_counts.find(identifier);
- int count;
- if (it == m_counts.end())
- count = 1;
- else {
- count = it->value + 1;
- m_counts.remove(it);
- }
-
- m_counts.add(identifier, count);
-
- String message = title + ": " + String::number(count);
- addMessageToConsole(ConsoleAPIMessageSource, LogMessageType, DebugMessageLevel, message, callStack);
-}
-
-void InspectorConsoleAgent::frameWindowDiscarded(DOMWindow* window)
-{
- size_t messageCount = m_consoleMessages.size();
- for (size_t i = 0; i < messageCount; ++i)
- m_consoleMessages[i]->windowCleared(window);
- m_injectedScriptManager->discardInjectedScriptsFor(window);
-}
-
-void InspectorConsoleAgent::didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
-{
- if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
- return;
- if (m_frontendDispatcher && m_monitoringXHREnabled) {
- String message = "XHR finished loading: \"" + url + "\".";
- addMessageToConsole(NetworkMessageSource, LogMessageType, DebugMessageLevel, message, sendURL, sendLineNumber, sendColumnNumber, nullptr, requestIdentifier);
- }
-}
-
-void InspectorConsoleAgent::didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse& response)
-{
- if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
- return;
-
- if (response.httpStatusCode() >= 400) {
- String message = "Failed to load resource: the server responded with a status of " + String::number(response.httpStatusCode()) + " (" + response.httpStatusText() + ')';
- addMessageToConsole(NetworkMessageSource, LogMessageType, ErrorMessageLevel, message, response.url().string(), 0, 0, nullptr, requestIdentifier);
- }
-}
-
-void InspectorConsoleAgent::didFailLoading(unsigned long requestIdentifier, const ResourceError& error)
-{
- if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
- return;
- if (error.isCancellation()) // Report failures only.
- return;
- StringBuilder message;
- message.appendLiteral("Failed to load resource");
- if (!error.localizedDescription().isEmpty()) {
- message.appendLiteral(": ");
- message.append(error.localizedDescription());
- }
- addMessageToConsole(NetworkMessageSource, LogMessageType, ErrorMessageLevel, message.toString(), error.failingURL(), 0, 0, nullptr, requestIdentifier);
-}
-
-void InspectorConsoleAgent::setMonitoringXHREnabled(ErrorString*, bool enabled)
-{
- m_monitoringXHREnabled = enabled;
-}
-
-static bool isGroupMessage(MessageType type)
-{
- return type == StartGroupMessageType
- || type == StartGroupCollapsedMessageType
- || type == EndGroupMessageType;
-}
-
-void InspectorConsoleAgent::addConsoleMessage(PassOwnPtr<ConsoleMessage> consoleMessage)
-{
- ASSERT(m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled());
- ASSERT_ARG(consoleMessage, consoleMessage);
-
- if (m_previousMessage && !isGroupMessage(m_previousMessage->type()) && m_previousMessage->isEqual(consoleMessage.get())) {
- m_previousMessage->incrementCount();
- if (m_frontendDispatcher && m_enabled)
- m_previousMessage->updateRepeatCountInConsole(m_frontendDispatcher.get());
- } else {
- m_previousMessage = consoleMessage.get();
- m_consoleMessages.append(consoleMessage);
- if (m_frontendDispatcher && m_enabled)
- m_previousMessage->addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, true);
- }
-
- if (!m_frontendDispatcher && m_consoleMessages.size() >= maximumConsoleMessages) {
- m_expiredConsoleMessageCount += expireConsoleMessagesStep;
- m_consoleMessages.remove(0, expireConsoleMessagesStep);
- }
-}
-
-class InspectableHeapObject final : public CommandLineAPIHost::InspectableObject {
-public:
- explicit InspectableHeapObject(int heapObjectId) : m_heapObjectId(heapObjectId) { }
- virtual Deprecated::ScriptValue get(JSC::ExecState*) override
- {
- return ScriptProfiler::objectByHeapObjectId(m_heapObjectId);
- }
-private:
- int m_heapObjectId;
-};
-
-void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId)
-{
- if (CommandLineAPIHost* commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost())
- commandLineAPIHost->addInspectedObject(adoptPtr(new InspectableHeapObject(inspectedHeapObjectId)));
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorConsoleAgent.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,115 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InspectorConsoleAgent_h
-#define InspectorConsoleAgent_h
-
-#if ENABLE(INSPECTOR)
-
-#include "ConsoleAPITypes.h"
-#include "ConsoleTypes.h"
-#include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
-#include "ScriptState.h"
-#include <wtf/Forward.h>
-#include <wtf/HashMap.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/Vector.h>
-#include <wtf/text/StringHash.h>
-
-namespace WebCore {
-
-class ConsoleMessage;
-class DOMWindow;
-class InstrumentingAgents;
-class PageInjectedScriptManager;
-class ResourceError;
-class ResourceResponse;
-class ScriptArguments;
-class ScriptCallStack;
-class ScriptProfile;
-
-typedef String ErrorString;
-
-class InspectorConsoleAgent : public InspectorAgentBase, public Inspector::InspectorConsoleBackendDispatcherHandler {
- WTF_MAKE_NONCOPYABLE(InspectorConsoleAgent);
-public:
- InspectorConsoleAgent(InstrumentingAgents*, PageInjectedScriptManager*);
- virtual ~InspectorConsoleAgent();
-
- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- virtual void clearMessages(ErrorString*) override;
- bool enabled() const { return m_enabled; }
- void reset();
-
- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
-
- void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr<ScriptArguments>, unsigned long requestIdentifier = 0);
- void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
-
- // FIXME: Remove once we no longer generate stacks outside of Inspector.
- void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0);
-
- Vector<unsigned> consoleMessageArgumentCounts();
-
- void startTiming(const String& title);
- void stopTiming(const String& title, PassRefPtr<ScriptCallStack>);
- void count(JSC::ExecState*, PassRefPtr<ScriptArguments>);
-
- void frameWindowDiscarded(DOMWindow*);
-
- void didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
- void didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse&);
- void didFailLoading(unsigned long requestIdentifier, const ResourceError&);
- void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
- void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
- virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) override;
- virtual void addInspectedNode(ErrorString*, int nodeId) = 0;
- virtual void addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId) override;
-
- virtual bool isWorkerAgent() = 0;
-
-protected:
- void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
-
- PageInjectedScriptManager* m_injectedScriptManager;
- std::unique_ptr<Inspector::InspectorConsoleFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorConsoleBackendDispatcher> m_backendDispatcher;
- ConsoleMessage* m_previousMessage;
- Vector<OwnPtr<ConsoleMessage>> m_consoleMessages;
- int m_expiredConsoleMessageCount;
- HashMap<String, unsigned> m_counts;
- HashMap<String, double> m_times;
- bool m_enabled;
- bool m_monitoringXHREnabled;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(InspectorConsoleAgent_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -32,14 +32,14 @@
</span><span class="cx"> #define InspectorConsoleInstrumentation_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><del>-#include "ScriptArguments.h"
-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptProfile.h"
</span><ins>+#include <inspector/ScriptArguments.h>
+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
</del><ins>+inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<Inspector::ScriptCallStack> callStack, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier)
</del><ins>+inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<Inspector::ScriptArguments> arguments, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope* workerGlobalScope, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
</del><ins>+inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope* workerGlobalScope, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<Inspector::ScriptCallStack> callStack, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForWorkerGlobalScope(workerGlobalScope))
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::consoleCount(Page* page, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</del><ins>+inline void InspectorInstrumentation::consoleCount(Page* page, JSC::ExecState* state, PassRefPtr<Inspector::ScriptArguments> arguments)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::stopConsoleTiming(Frame* frame, const String& title, PassRefPtr<ScriptCallStack> stack)
</del><ins>+inline void InspectorInstrumentation::stopConsoleTiming(Frame* frame, const String& title, PassRefPtr<Inspector::ScriptCallStack> stack)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::consoleTimeStamp(Frame* frame, PassRefPtr<ScriptArguments> arguments)
</del><ins>+inline void InspectorInstrumentation::consoleTimeStamp(Frame* frame, PassRefPtr<Inspector::ScriptArguments> arguments)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::addProfile(Page* page, PassRefPtr<ScriptProfile> profile, PassRefPtr<ScriptCallStack> callStack)
</del><ins>+inline void InspectorInstrumentation::addProfile(Page* page, PassRefPtr<ScriptProfile> profile, PassRefPtr<Inspector::ScriptCallStack> callStack)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "CommandLineAPIHost.h"
</span><span class="cx"> #include "DOMWrapperWorld.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><del>-#include "IdentifiersFactory.h"
</del><span class="cx"> #include "InspectorApplicationCacheAgent.h"
</span><span class="cx"> #include "InspectorCSSAgent.h"
</span><span class="cx"> #include "InspectorCanvasAgent.h"
</span><span class="lines">@@ -72,6 +71,7 @@
</span><span class="cx"> #include "PageInjectedScriptManager.h"
</span><span class="cx"> #include "PageRuntimeAgent.h"
</span><span class="cx"> #include "Settings.h"
</span><ins>+#include <inspector/IdentifiersFactory.h>
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <inspector/agents/InspectorAgent.h>
</span><span class="cx"> #include <runtime/JSLock.h>
</span><span class="lines">@@ -141,8 +141,9 @@
</span><span class="cx"> m_resourceAgent = resourceAgentPtr.get();
</span><span class="cx"> m_agents.append(std::move(resourceAgentPtr));
</span><span class="cx">
</span><del>- auto consoleAgentPtr = std::make_unique<PageConsoleAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get(), m_domAgent);
- InspectorConsoleAgent* consoleAgent = consoleAgentPtr.get();
</del><ins>+ auto consoleAgentPtr = std::make_unique<PageConsoleAgent>(m_injectedScriptManager.get(), m_domAgent);
+ WebConsoleAgent* consoleAgent = consoleAgentPtr.get();
+ m_instrumentingAgents->setWebConsoleAgent(consoleAgentPtr.get());
</ins><span class="cx"> m_agents.append(std::move(consoleAgentPtr));
</span><span class="cx">
</span><span class="cx"> auto debuggerAgentPtr = std::make_unique<PageDebuggerAgent>(m_injectedScriptManager.get(), m_instrumentingAgents.get(), pageAgent, m_overlay.get());
</span><span class="lines">@@ -271,7 +272,7 @@
</span><span class="cx"> m_inspectorBackendDispatcher.clear();
</span><span class="cx"> m_inspectorFrontendChannel = nullptr;
</span><span class="cx">
</span><del>- // relese overlay page resources
</del><ins>+ // Release overlay page resources.
</ins><span class="cx"> m_overlay->freePage();
</span><span class="cx"> InspectorInstrumentation::frontendDeleted();
</span><span class="cx"> InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLTemplateElement.h"
</span><span class="cx"> #include "HitTestResult.h"
</span><del>-#include "IdentifiersFactory.h"
</del><span class="cx"> #include "InspectorHistory.h"
</span><span class="cx"> #include "InspectorNodeFinder.h"
</span><span class="cx"> #include "InspectorOverlay.h"
</span><span class="lines">@@ -91,6 +90,7 @@
</span><span class="cx"> #include "XPathResult.h"
</span><span class="cx"> #include "htmlediting.h"
</span><span class="cx"> #include "markup.h"
</span><ins>+#include <inspector/IdentifiersFactory.h>
</ins><span class="cx"> #include <inspector/InjectedScript.h>
</span><span class="cx"> #include <inspector/InjectedScriptManager.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #ifndef InspectorFrontendHost_h
</span><span class="cx"> #define InspectorFrontendHost_h
</span><span class="cx">
</span><del>-#include "ConsoleTypes.h"
</del><span class="cx"> #include "ContextMenu.h"
</span><span class="cx"> #include "ContextMenuProvider.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -35,8 +35,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSRule.h"
</span><span class="cx"> #include "CSSStyleRule.h"
</span><del>-#include "ConsoleAPITypes.h"
-#include "ConsoleTypes.h"
</del><span class="cx"> #include "DOMWindow.h"
</span><span class="cx"> #include "DOMWrapperWorld.h"
</span><span class="cx"> #include "Database.h"
</span><span class="lines">@@ -46,7 +44,6 @@
</span><span class="cx"> #include "InspectorApplicationCacheAgent.h"
</span><span class="cx"> #include "InspectorCSSAgent.h"
</span><span class="cx"> #include "InspectorCanvasAgent.h"
</span><del>-#include "InspectorConsoleAgent.h"
</del><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="cx"> #include "InspectorDOMDebuggerAgent.h"
</span><span class="cx"> #include "InspectorDOMStorageAgent.h"
</span><span class="lines">@@ -64,16 +61,18 @@
</span><span class="cx"> #include "PageRuntimeAgent.h"
</span><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "RenderView.h"
</span><del>-#include "ScriptArguments.h"
-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleRule.h"
</span><ins>+#include "WebConsoleAgent.h"
</ins><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="cx"> #include "WorkerRuntimeAgent.h"
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="cx"> #include "XMLHttpRequest.h"
</span><ins>+#include <inspector/ConsoleTypes.h>
+#include <inspector/ScriptArguments.h>
+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <inspector/agents/InspectorDebuggerAgent.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -183,7 +182,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::frameWindowDiscardedImpl(InstrumentingAgents* instrumentingAgents, DOMWindow* window)
</span><span class="cx"> {
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->frameWindowDiscarded(window);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -600,7 +599,7 @@
</span><span class="cx"> InstrumentingAgents* instrumentingAgents = cookie.instrumentingAgents();
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didReceiveResponse(identifier, loader, response, resourceLoader);
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->didReceiveResponse(identifier, response); // This should come AFTER resource notification, front-end relies on this.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -645,7 +644,7 @@
</span><span class="cx"> timelineAgent->didFinishLoadingResource(identifier, true, 0, loader->frame());
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didFailLoading(identifier, loader, error);
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -669,7 +668,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didFinishXHRLoadingImpl(InstrumentingAgents* instrumentingAgents, ThreadableLoaderClient* client, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
</span><span class="cx"> {
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->didFinishXHRLoading(identifier, url, sendURL, sendLineNumber, sendColumnNumber);
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didFinishXHRLoading(client, identifier, sourceString);
</span><span class="lines">@@ -752,7 +751,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (loader->frame()->isMainFrame()) {
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->reset();
</span><span class="cx">
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
</span><span class="lines">@@ -862,13 +861,13 @@
</span><span class="cx"> // JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
</span><span class="cx"> static bool isConsoleAssertMessage(MessageSource source, MessageType type)
</span><span class="cx"> {
</span><del>- return source == ConsoleAPIMessageSource && type == AssertMessageType;
</del><ins>+ return source == MessageSource::ConsoleAPI && type == MessageType::Assert;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Drop this once we no longer generate stacks outside of Inspector.
</span><span class="cx"> void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->addMessageToConsole(source, type, level, message, callStack, requestIdentifier);
</span><span class="cx"> // FIXME: This should just pass the message on to the debugger agent. JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
</span><span class="cx"> if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent()) {
</span><span class="lines">@@ -879,7 +878,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->addMessageToConsole(source, type, level, message, state, arguments, requestIdentifier);
</span><span class="cx"> // FIXME: This should just pass the message on to the debugger agent. JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
</span><span class="cx"> if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent()) {
</span><span class="lines">@@ -890,13 +889,13 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->addMessageToConsole(source, type, level, message, scriptID, lineNumber, columnNumber, state, requestIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::consoleCountImpl(InstrumentingAgents* instrumentingAgents, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->count(state, arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -904,13 +903,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
</span><span class="cx"> timelineAgent->time(frame, title);
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->startTiming(title);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::stopConsoleTimingImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, const String& title, PassRefPtr<ScriptCallStack> stack)
</span><span class="cx"> {
</span><del>- if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</del><ins>+ if (WebConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent())
</ins><span class="cx"> consoleAgent->stopTiming(title, stack);
</span><span class="cx"> if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
</span><span class="cx"> timelineAgent->timeEnd(frame, title);
</span><span class="lines">@@ -1072,7 +1071,7 @@
</span><span class="cx"> bool InspectorInstrumentation::consoleAgentEnabled(ScriptExecutionContext* scriptExecutionContext)
</span><span class="cx"> {
</span><span class="cx"> InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(scriptExecutionContext);
</span><del>- InspectorConsoleAgent* consoleAgent = instrumentingAgents ? instrumentingAgents->inspectorConsoleAgent() : nullptr;
</del><ins>+ InspectorConsoleAgent* consoleAgent = instrumentingAgents ? instrumentingAgents->webConsoleAgent() : nullptr;
</ins><span class="cx"> return consoleAgent && consoleAgent->enabled();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #define InspectorInstrumentation_h
</span><span class="cx">
</span><span class="cx"> #include "CSSSelector.h"
</span><del>-#include "ConsoleAPITypes.h"
-#include "ConsoleTypes.h"
</del><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "FormData.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="lines">@@ -44,12 +42,18 @@
</span><span class="cx"> #include "ScriptState.h"
</span><span class="cx"> #include "StorageArea.h"
</span><span class="cx"> #include "WebSocketFrame.h"
</span><ins>+#include <inspector/ConsoleTypes.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace Deprecated {
</span><span class="cx"> class ScriptObject;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace Inspector {
+class ScriptArguments;
+class ScriptCallStack;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CSSRule;
</span><span class="lines">@@ -77,8 +81,6 @@
</span><span class="cx"> class RenderObject;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><del>-class ScriptArguments;
-class ScriptCallStack;
</del><span class="cx"> class ScriptExecutionContext;
</span><span class="cx"> class ScriptProfile;
</span><span class="cx"> class SecurityOrigin;
</span><span class="lines">@@ -203,18 +205,18 @@
</span><span class="cx"> static void didWriteHTML(const InspectorInstrumentationCookie&, unsigned endLine);
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove once we no longer generate stacks outside of Inspector.
</span><del>- static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0);
- static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr<ScriptArguments>, unsigned long requestIdentifier = 0);
</del><ins>+ static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<Inspector::ScriptCallStack>, unsigned long requestIdentifier = 0);
+ static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>, unsigned long requestIdentifier = 0);
</ins><span class="cx"> static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
</span><span class="cx">
</span><span class="cx"> // FIXME: Convert to ScriptArguments to match non-worker context.
</span><del>- static void addMessageToConsole(WorkerGlobalScope*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0);
</del><ins>+ static void addMessageToConsole(WorkerGlobalScope*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<Inspector::ScriptCallStack>, unsigned long requestIdentifier = 0);
</ins><span class="cx"> static void addMessageToConsole(WorkerGlobalScope*, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
</span><span class="cx">
</span><del>- static void consoleCount(Page*, JSC::ExecState*, PassRefPtr<ScriptArguments>);
</del><ins>+ static void consoleCount(Page*, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx"> static void startConsoleTiming(Frame*, const String& title);
</span><del>- static void stopConsoleTiming(Frame*, const String& title, PassRefPtr<ScriptCallStack>);
- static void consoleTimeStamp(Frame*, PassRefPtr<ScriptArguments>);
</del><ins>+ static void stopConsoleTiming(Frame*, const String& title, PassRefPtr<Inspector::ScriptCallStack>);
+ static void consoleTimeStamp(Frame*, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx">
</span><span class="cx"> static void didRequestAnimationFrame(Document*, int callbackId);
</span><span class="cx"> static void didCancelAnimationFrame(Document*, int callbackId);
</span><span class="lines">@@ -222,7 +224,7 @@
</span><span class="cx"> static void didFireAnimationFrame(const InspectorInstrumentationCookie&);
</span><span class="cx">
</span><span class="cx"> static void addStartProfilingMessageToConsole(Page*, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
</span><del>- static void addProfile(Page*, PassRefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>);
</del><ins>+ static void addProfile(Page*, PassRefPtr<ScriptProfile>, PassRefPtr<Inspector::ScriptCallStack>);
</ins><span class="cx"> static String getCurrentUserInitiatedProfileName(Page*, bool incrementProfileNumber);
</span><span class="cx"> static bool profilerEnabled(Page*);
</span><span class="cx">
</span><span class="lines">@@ -385,16 +387,16 @@
</span><span class="cx"> static InspectorInstrumentationCookie willWriteHTMLImpl(InstrumentingAgents*, unsigned startLine, Frame*);
</span><span class="cx"> static void didWriteHTMLImpl(const InspectorInstrumentationCookie&, unsigned endLine);
</span><span class="cx">
</span><del>- static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr<ScriptArguments>, unsigned long requestIdentifier);
</del><ins>+ static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>, unsigned long requestIdentifier);
</ins><span class="cx"> static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState*, unsigned long requestIdentifier);
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove once we no longer generate stacks outside of Inspector.
</span><del>- static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier);
</del><ins>+ static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<Inspector::ScriptCallStack>, unsigned long requestIdentifier);
</ins><span class="cx">
</span><del>- static void consoleCountImpl(InstrumentingAgents*, JSC::ExecState*, PassRefPtr<ScriptArguments>);
</del><ins>+ static void consoleCountImpl(InstrumentingAgents*, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx"> static void startConsoleTimingImpl(InstrumentingAgents*, Frame*, const String& title);
</span><del>- static void stopConsoleTimingImpl(InstrumentingAgents*, Frame*, const String& title, PassRefPtr<ScriptCallStack>);
- static void consoleTimeStampImpl(InstrumentingAgents*, Frame*, PassRefPtr<ScriptArguments>);
</del><ins>+ static void stopConsoleTimingImpl(InstrumentingAgents*, Frame*, const String& title, PassRefPtr<Inspector::ScriptCallStack>);
+ static void consoleTimeStampImpl(InstrumentingAgents*, Frame*, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx">
</span><span class="cx"> static void didRequestAnimationFrameImpl(InstrumentingAgents*, int callbackId, Frame*);
</span><span class="cx"> static void didCancelAnimationFrameImpl(InstrumentingAgents*, int callbackId, Frame*);
</span><span class="lines">@@ -402,7 +404,7 @@
</span><span class="cx"> static void didFireAnimationFrameImpl(const InspectorInstrumentationCookie&);
</span><span class="cx">
</span><span class="cx"> static void addStartProfilingMessageToConsoleImpl(InstrumentingAgents*, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
</span><del>- static void addProfileImpl(InstrumentingAgents*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>);
</del><ins>+ static void addProfileImpl(InstrumentingAgents*, RefPtr<ScriptProfile>, PassRefPtr<Inspector::ScriptCallStack>);
</ins><span class="cx"> static String getCurrentUserInitiatedProfileNameImpl(InstrumentingAgents*, bool incrementProfileNumber);
</span><span class="cx"> static bool profilerEnabledImpl(InstrumentingAgents*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorLayerTreeAgent.h"
</span><span class="cx">
</span><del>-#include "IdentifiersFactory.h"
</del><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="lines">@@ -44,6 +43,7 @@
</span><span class="cx"> #include "RenderLayerBacking.h"
</span><span class="cx"> #include "RenderLayerCompositor.h"
</span><span class="cx"> #include "RenderView.h"
</span><ins>+#include <inspector/IdentifiersFactory.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -29,11 +29,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "InspectorPageAgent.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorPageAgent.h"
-
</del><span class="cx"> #include "CachedCSSStyleSheet.h"
</span><span class="cx"> #include "CachedFont.h"
</span><span class="cx"> #include "CachedImage.h"
</span><span class="lines">@@ -53,7 +52,6 @@
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><del>-#include "IdentifiersFactory.h"
</del><span class="cx"> #include "ImageBuffer.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="lines">@@ -73,6 +71,7 @@
</span><span class="cx"> #include "UserGestureIndicator.h"
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <inspector/ContentSearchUtilities.h>
</span><ins>+#include <inspector/IdentifiersFactory.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -28,29 +28,27 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "InspectorProfilerAgent.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorProfilerAgent.h"
-
</del><span class="cx"> #include "CommandLineAPIHost.h"
</span><span class="cx"> #include "Console.h"
</span><del>-#include "ConsoleAPITypes.h"
-#include "ConsoleTypes.h"
-#include "InspectorConsoleAgent.h"
</del><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><del>-#include "URL.h"
</del><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageInjectedScriptManager.h"
</span><span class="cx"> #include "PageScriptDebugServer.h"
</span><span class="cx"> #include "ScriptHeapSnapshot.h"
</span><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx"> #include "ScriptProfiler.h"
</span><ins>+#include "URL.h"
</ins><span class="cx"> #include "WorkerScriptDebugServer.h"
</span><span class="cx"> #include <bindings/ScriptObject.h>
</span><ins>+#include <inspector/ConsoleTypes.h>
</ins><span class="cx"> #include <inspector/InjectedScript.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <inspector/agents/InspectorConsoleAgent.h>
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/text/StringConcatenate.h>
</span><span class="lines">@@ -156,14 +154,14 @@
</span><span class="cx"> return;
</span><span class="cx"> RefPtr<ScriptProfile> profile = prpProfile;
</span><span class="cx"> String message = makeString(profile->title(), '#', String::number(profile->uid()));
</span><del>- m_consoleAgent->addMessageToConsole(ConsoleAPIMessageSource, ProfileEndMessageType, DebugMessageLevel, message, sourceURL, lineNumber, columnNumber);
</del><ins>+ m_consoleAgent->addMessageToConsole(MessageSource::ConsoleAPI, MessageType::ProfileEnd, MessageLevel::Debug, message, sourceURL, lineNumber, columnNumber);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorProfilerAgent::addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><span class="cx"> if (!m_frontendDispatcher)
</span><span class="cx"> return;
</span><del>- m_consoleAgent->addMessageToConsole(ConsoleAPIMessageSource, ProfileMessageType, DebugMessageLevel, title, sourceURL, lineNumber, columnNumber);
</del><ins>+ m_consoleAgent->addMessageToConsole(MessageSource::ConsoleAPI, MessageType::Profile, MessageLevel::Debug, title, sourceURL, lineNumber, columnNumber);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorProfilerAgent::collectGarbage(WebCore::ErrorString*)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorProfilerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx"> class InspectorArray;
</span><ins>+class InspectorConsoleAgent;
</ins><span class="cx"> class InspectorObject;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class InspectorConsoleAgent;
</del><span class="cx"> class InstrumentingAgents;
</span><span class="cx"> class Page;
</span><span class="cx"> class PageInjectedScriptManager;
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> class InspectorProfilerAgent : public InspectorAgentBase, public Inspector::InspectorProfilerBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorProfilerAgent); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static std::unique_ptr<InspectorProfilerAgent> create(InstrumentingAgents*, InspectorConsoleAgent*, Page*, PageInjectedScriptManager*);
- static std::unique_ptr<InspectorProfilerAgent> create(InstrumentingAgents*, InspectorConsoleAgent*, WorkerGlobalScope*, PageInjectedScriptManager*);
</del><ins>+ static std::unique_ptr<InspectorProfilerAgent> create(InstrumentingAgents*, Inspector::InspectorConsoleAgent*, Page*, PageInjectedScriptManager*);
+ static std::unique_ptr<InspectorProfilerAgent> create(InstrumentingAgents*, Inspector::InspectorConsoleAgent*, WorkerGlobalScope*, PageInjectedScriptManager*);
</ins><span class="cx">
</span><span class="cx"> virtual ~InspectorProfilerAgent();
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> virtual void getHeapObjectId(ErrorString*, const String& objectId, String* heapSnapshotObjectId) override;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- InspectorProfilerAgent(InstrumentingAgents*, InspectorConsoleAgent*, PageInjectedScriptManager*);
</del><ins>+ InspectorProfilerAgent(InstrumentingAgents*, Inspector::InspectorConsoleAgent*, PageInjectedScriptManager*);
</ins><span class="cx"> virtual void startProfiling(const String& title) = 0;
</span><span class="cx"> virtual PassRefPtr<ScriptProfile> stopProfiling(const String& title) = 0;
</span><span class="cx">
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> PassRefPtr<Inspector::TypeBuilder::Profiler::ProfileHeader> createProfileHeader(const ScriptProfile&);
</span><span class="cx"> PassRefPtr<Inspector::TypeBuilder::Profiler::ProfileHeader> createSnapshotHeader(const ScriptHeapSnapshot&);
</span><span class="cx">
</span><del>- InspectorConsoleAgent* m_consoleAgent;
</del><ins>+ Inspector::InspectorConsoleAgent* m_consoleAgent;
</ins><span class="cx"> PageInjectedScriptManager* m_injectedScriptManager;
</span><span class="cx"> std::unique_ptr<Inspector::InspectorProfilerFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::InspectorProfilerBackendDispatcher> m_backendDispatcher;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -29,11 +29,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "InspectorResourceAgent.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorResourceAgent.h"
-
</del><span class="cx"> #include "CachedRawResource.h"
</span><span class="cx"> #include "CachedResource.h"
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="lines">@@ -44,11 +43,11 @@
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "HTTPHeaderMap.h"
</span><span class="cx"> #include "IconController.h"
</span><del>-#include "IdentifiersFactory.h"
</del><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "InspectorPageAgent.h"
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><ins>+#include "JSMainThreadExecState.h"
</ins><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "NetworkResourcesData.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -58,15 +57,16 @@
</span><span class="cx"> #include "ResourceLoader.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><del>-#include "ScriptCallStack.h"
-#include "ScriptCallStackFactory.h"
</del><span class="cx"> #include "ScriptableDocumentParser.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SubresourceLoader.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "WebSocketFrame.h"
</span><span class="cx"> #include "XMLHttpRequest.h"
</span><ins>+#include <inspector/IdentifiersFactory.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <inspector/ScriptCallStack.h>
+#include <inspector/ScriptCallStackFactory.h>
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><span class="lines">@@ -439,7 +439,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Inspector::TypeBuilder::Network::Initiator> InspectorResourceAgent::buildInitiatorObject(Document* document)
</span><span class="cx"> {
</span><del>- RefPtr<ScriptCallStack> stackTrace = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture, true);
</del><ins>+ RefPtr<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), ScriptCallStack::maxCallStackSizeToCapture, true);
</ins><span class="cx"> if (stackTrace && stackTrace->size() > 0) {
</span><span class="cx"> RefPtr<Inspector::TypeBuilder::Network::Initiator> initiatorObject = Inspector::TypeBuilder::Network::Initiator::create()
</span><span class="cx"> .setType(Inspector::TypeBuilder::Network::Initiator::Type::Script);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameView.h"
</span><del>-#include "IdentifiersFactory.h"
</del><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "InspectorCounters.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="lines">@@ -53,6 +52,7 @@
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "ScriptProfiler.h"
</span><span class="cx"> #include "TimelineRecordFactory.h"
</span><ins>+#include <inspector/IdentifiersFactory.h>
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> , m_inspectorPageAgent(nullptr)
</span><span class="cx"> , m_inspectorCSSAgent(nullptr)
</span><span class="cx"> , m_inspectorLayerTreeAgent(nullptr)
</span><del>- , m_inspectorConsoleAgent(nullptr)
</del><ins>+ , m_webConsoleAgent(nullptr)
</ins><span class="cx"> , m_inspectorDOMAgent(nullptr)
</span><span class="cx"> , m_inspectorResourceAgent(nullptr)
</span><span class="cx"> , m_pageRuntimeAgent(nullptr)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> m_inspectorPageAgent = nullptr;
</span><span class="cx"> m_inspectorCSSAgent = nullptr;
</span><span class="cx"> m_inspectorLayerTreeAgent = nullptr;
</span><del>- m_inspectorConsoleAgent = nullptr;
</del><ins>+ m_webConsoleAgent = nullptr;
</ins><span class="cx"> m_inspectorDOMAgent = nullptr;
</span><span class="cx"> m_inspectorResourceAgent = nullptr;
</span><span class="cx"> m_pageRuntimeAgent = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> class InspectorApplicationCacheAgent;
</span><span class="cx"> class InspectorCSSAgent;
</span><span class="cx"> class InspectorCanvasAgent;
</span><del>-class InspectorConsoleAgent;
</del><span class="cx"> class InspectorDOMAgent;
</span><span class="cx"> class InspectorDOMDebuggerAgent;
</span><span class="cx"> class InspectorDOMStorageAgent;
</span><span class="lines">@@ -62,6 +61,7 @@
</span><span class="cx"> class Page;
</span><span class="cx"> class PageDebuggerAgent;
</span><span class="cx"> class PageRuntimeAgent;
</span><ins>+class WebConsoleAgent;
</ins><span class="cx"> class WorkerGlobalScope;
</span><span class="cx"> class WorkerRuntimeAgent;
</span><span class="cx">
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> InspectorCSSAgent* inspectorCSSAgent() const { return m_inspectorCSSAgent; }
</span><span class="cx"> void setInspectorCSSAgent(InspectorCSSAgent* agent) { m_inspectorCSSAgent = agent; }
</span><span class="cx">
</span><del>- InspectorConsoleAgent* inspectorConsoleAgent() const { return m_inspectorConsoleAgent; }
- void setInspectorConsoleAgent(InspectorConsoleAgent* agent) { m_inspectorConsoleAgent = agent; }
</del><ins>+ WebConsoleAgent* webConsoleAgent() const { return m_webConsoleAgent; }
+ void setWebConsoleAgent(WebConsoleAgent* agent) { m_webConsoleAgent = agent; }
</ins><span class="cx">
</span><span class="cx"> InspectorDOMAgent* inspectorDOMAgent() const { return m_inspectorDOMAgent; }
</span><span class="cx"> void setInspectorDOMAgent(InspectorDOMAgent* agent) { m_inspectorDOMAgent = agent; }
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> InspectorPageAgent* m_inspectorPageAgent;
</span><span class="cx"> InspectorCSSAgent* m_inspectorCSSAgent;
</span><span class="cx"> InspectorLayerTreeAgent* m_inspectorLayerTreeAgent;
</span><del>- InspectorConsoleAgent* m_inspectorConsoleAgent;
</del><ins>+ WebConsoleAgent* m_webConsoleAgent;
</ins><span class="cx"> InspectorDOMAgent* m_inspectorDOMAgent;
</span><span class="cx"> InspectorResourceAgent* m_inspectorResourceAgent;
</span><span class="cx"> PageRuntimeAgent* m_pageRuntimeAgent;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #include "CommandLineAPIHost.h"
</span><del>-#include "DOMWindow.h"
</del><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="cx"> #include "Node.h"
</span><span class="cx"> #include "PageInjectedScriptManager.h"
</span><span class="lines">@@ -43,21 +42,17 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PageConsoleAgent::PageConsoleAgent(InstrumentingAgents* instrumentingAgents, PageInjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent)
- : InspectorConsoleAgent(instrumentingAgents, injectedScriptManager)
</del><ins>+PageConsoleAgent::PageConsoleAgent(PageInjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent)
+ : WebConsoleAgent(injectedScriptManager)
</ins><span class="cx"> , m_inspectorDOMAgent(domAgent)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PageConsoleAgent::~PageConsoleAgent()
-{
- m_inspectorDOMAgent = nullptr;
-}
-
</del><span class="cx"> void PageConsoleAgent::clearMessages(ErrorString* errorString)
</span><span class="cx"> {
</span><span class="cx"> m_inspectorDOMAgent->releaseDanglingNodes();
</span><del>- InspectorConsoleAgent::clearMessages(errorString);
</del><ins>+
+ WebConsoleAgent::clearMessages(errorString);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class InspectableNode final : public CommandLineAPIHost::InspectableObject {
</span><span class="lines">@@ -79,7 +74,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (CommandLineAPIHost* commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost())
</del><ins>+ if (CommandLineAPIHost* commandLineAPIHost = static_cast<PageInjectedScriptManager*>(m_injectedScriptManager)->commandLineAPIHost())
</ins><span class="cx"> commandLineAPIHost->addInspectedObject(adoptPtr(new InspectableNode(node)));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -31,8 +31,7 @@
</span><span class="cx"> #ifndef PageConsoleAgent_h
</span><span class="cx"> #define PageConsoleAgent_h
</span><span class="cx">
</span><del>-#include "InspectorConsoleAgent.h"
-#include <wtf/PassOwnPtr.h>
</del><ins>+#include "WebConsoleAgent.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -40,13 +39,14 @@
</span><span class="cx">
</span><span class="cx"> class InspectorDOMAgent;
</span><span class="cx">
</span><del>-class PageConsoleAgent : public InspectorConsoleAgent {
</del><ins>+class PageConsoleAgent final : public WebConsoleAgent {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(PageConsoleAgent);
</span><ins>+ WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><del>- PageConsoleAgent(InstrumentingAgents*, PageInjectedScriptManager*, InspectorDOMAgent*);
- virtual ~PageConsoleAgent();
</del><ins>+ PageConsoleAgent(PageInjectedScriptManager*, InspectorDOMAgent*);
+ virtual ~PageConsoleAgent() { }
</ins><span class="cx">
</span><del>- virtual bool isWorkerAgent() override { return false; }
</del><ins>+ virtual bool isWorkerAgent() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void clearMessages(ErrorString*) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -43,6 +43,8 @@
</span><span class="cx"> #include "ScriptState.h"
</span><span class="cx"> #include <inspector/InjectedScript.h>
</span><span class="cx"> #include <inspector/InjectedScriptManager.h>
</span><ins>+#include <inspector/ScriptCallStack.h>
+#include <inspector/ScriptCallStackFactory.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="lines">@@ -113,9 +115,9 @@
</span><span class="cx"> PageConsole::unmute();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageDebuggerAgent::breakpointActionLog(JSC::ExecState*, const String& message)
</del><ins>+void PageDebuggerAgent::breakpointActionLog(JSC::ExecState* exec, const String& message)
</ins><span class="cx"> {
</span><del>- m_pageAgent->page()->console().addMessage(JSMessageSource, LogMessageLevel, message);
</del><ins>+ m_pageAgent->page()->console().addMessage(MessageSource::JS, MessageLevel::Log, message, createScriptCallStack(exec, ScriptCallStack::maxCallStackSizeToCapture, true));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageInjectedScriptHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageInjectedScriptHost.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageInjectedScriptHost.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/PageInjectedScriptHost.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+// FIXME: Rename to WebInjectedScriptHost.
</ins><span class="cx"> class PageInjectedScriptHost final : public Inspector::InjectedScriptHost {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<PageInjectedScriptHost> create() { return adoptRef(new PageInjectedScriptHost); }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageInjectedScriptManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageInjectedScriptManager.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageInjectedScriptManager.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/PageInjectedScriptManager.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> class DOMWindow;
</span><span class="cx">
</span><ins>+// FIXME: Rename to WebInjectedScriptManager.
</ins><span class="cx"> class PageInjectedScriptManager final : public Inspector::InjectedScriptManager {
</span><span class="cx"> public:
</span><span class="cx"> PageInjectedScriptManager(Inspector::InspectorEnvironment&, PassRefPtr<Inspector::InjectedScriptHost>);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorScriptArgumentscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ScriptArguments.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ScriptArguments.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/ScriptArguments.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,101 +0,0 @@
</span><del>-/*
- * Copyright (c) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ScriptArguments.h"
-
-#include <bindings/ScriptValue.h>
-
-namespace WebCore {
-
-PassRefPtr<ScriptArguments> ScriptArguments::create(JSC::ExecState* scriptState, Vector<Deprecated::ScriptValue>& arguments)
-{
- return adoptRef(new ScriptArguments(scriptState, arguments));
-}
-
-ScriptArguments::ScriptArguments(JSC::ExecState* scriptState, Vector<Deprecated::ScriptValue>& arguments)
- : m_globalObject(scriptState->vm(), scriptState->lexicalGlobalObject())
-{
- m_arguments.swap(arguments);
-}
-
-ScriptArguments::~ScriptArguments()
-{
-}
-
-const Deprecated::ScriptValue &ScriptArguments::argumentAt(size_t index) const
-{
- ASSERT(m_arguments.size() > index);
- return m_arguments[index];
-}
-
-JSC::ExecState* ScriptArguments::globalState() const
-{
- if (m_globalObject)
- return const_cast<JSC::JSGlobalObject*>(m_globalObject.get())->globalExec();
- return nullptr;
-}
-
-bool ScriptArguments::getFirstArgumentAsString(String& result, bool checkForNullOrUndefined)
-{
- if (!argumentCount())
- return false;
-
- const Deprecated::ScriptValue& value = argumentAt(0);
- if (checkForNullOrUndefined && (value.isNull() || value.isUndefined()))
- return false;
-
- if (!globalState()) {
- ASSERT_NOT_REACHED();
- return false;
- }
-
- result = value.toString(globalState());
- return true;
-}
-
-bool ScriptArguments::isEqual(ScriptArguments* other) const
-{
- if (!other)
- return false;
-
- if (m_arguments.size() != other->m_arguments.size())
- return false;
- if (!globalState() && m_arguments.size())
- return false;
-
- for (size_t i = 0; i < m_arguments.size(); ++i) {
- if (!m_arguments[i].isEqual(other->globalState(), other->m_arguments[i]))
- return false;
- }
- return true;
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorScriptArgumentsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ScriptArguments.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ScriptArguments.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/ScriptArguments.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * Copyright (c) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ScriptArguments_h
-#define ScriptArguments_h
-
-#include <heap/Strong.h>
-#include <wtf/Forward.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace Deprecated {
-class ScriptValue;
-}
-
-namespace JSC {
-class ExecState;
-class JSGlobalObject;
-}
-
-namespace WebCore {
-
-class ScriptArguments : public RefCounted<ScriptArguments> {
-public:
- static PassRefPtr<ScriptArguments> create(JSC::ExecState*, Vector<Deprecated::ScriptValue>& arguments);
-
- ~ScriptArguments();
-
- const Deprecated::ScriptValue& argumentAt(size_t) const;
- size_t argumentCount() const { return m_arguments.size(); }
-
- JSC::ExecState* globalState() const;
-
- bool getFirstArgumentAsString(WTF::String& result, bool checkForNullOrUndefined = false);
- bool isEqual(ScriptArguments*) const;
-
-private:
- ScriptArguments(JSC::ExecState*, Vector<Deprecated::ScriptValue>& arguments);
-
- JSC::Strong<JSC::JSGlobalObject> m_globalObject;
- Vector<Deprecated::ScriptValue> m_arguments;
-};
-
-} // namespace WebCore
-
-#endif // ScriptArguments_h
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorScriptCallFramecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ScriptCallFrame.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ScriptCallFrame.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/ScriptCallFrame.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * Copyright (c) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ScriptCallFrame.h"
-
-#include "InspectorWebFrontendDispatchers.h"
-#include <inspector/InspectorValues.h>
-#include <wtf/RefPtr.h>
-
-using namespace Inspector;
-
-namespace WebCore {
-
-ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scriptName, unsigned lineNumber, unsigned column)
- : m_functionName(functionName)
- , m_scriptName(scriptName)
- , m_lineNumber(lineNumber)
- , m_column(column)
-{
-}
-
-ScriptCallFrame::~ScriptCallFrame()
-{
-}
-
-bool ScriptCallFrame::isEqual(const ScriptCallFrame& o) const
-{
- return m_functionName == o.m_functionName
- && m_scriptName == o.m_scriptName
- && m_lineNumber == o.m_lineNumber
- && m_column == o.m_column;
-}
-
-#if ENABLE(INSPECTOR)
-PassRefPtr<Inspector::TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObject() const
-{
- return Inspector::TypeBuilder::Console::CallFrame::create()
- .setFunctionName(m_functionName)
- .setUrl(m_scriptName)
- .setLineNumber(m_lineNumber)
- .setColumnNumber(m_column)
- .release();
-}
-#endif
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorScriptCallFrameh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ScriptCallFrame.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ScriptCallFrame.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/ScriptCallFrame.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,72 +0,0 @@
</span><del>-/*
- * Copyright (c) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ScriptCallFrame_h
-#define ScriptCallFrame_h
-
-#if ENABLE(INSPECTOR)
-#include "InspectorWebTypeBuilders.h"
-#endif
-
-#include <wtf/Forward.h>
-#include <wtf/text/WTFString.h>
-
-namespace Inspector {
-class InspectorObject;
-}
-
-namespace WebCore {
-
-class ScriptCallFrame {
-public:
- ScriptCallFrame(const String& functionName, const String& scriptName, unsigned lineNumber, unsigned column);
- ~ScriptCallFrame();
-
- const String& functionName() const { return m_functionName; }
- const String& sourceURL() const { return m_scriptName; }
- unsigned lineNumber() const { return m_lineNumber; }
- unsigned columnNumber() const { return m_column; }
-
- bool isEqual(const ScriptCallFrame&) const;
-
-#if ENABLE(INSPECTOR)
- PassRefPtr<Inspector::TypeBuilder::Console::CallFrame> buildInspectorObject() const;
-#endif
-
-private:
- String m_functionName;
- String m_scriptName;
- unsigned m_lineNumber;
- unsigned m_column;
-};
-
-} // namespace WebCore
-
-#endif // ScriptCallFrame_h
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorScriptCallStackcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ScriptCallStack.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ScriptCallStack.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/ScriptCallStack.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-/*
- * Copyright (c) 2008, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ScriptCallStack.h"
-
-#include "InspectorWebTypeBuilders.h"
-#include <inspector/InspectorValues.h>
-
-using namespace Inspector;
-
-namespace WebCore {
-
-PassRefPtr<ScriptCallStack> ScriptCallStack::create(Vector<ScriptCallFrame>& frames)
-{
- return adoptRef(new ScriptCallStack(frames));
-}
-
-ScriptCallStack::ScriptCallStack(Vector<ScriptCallFrame>& frames)
-{
- m_frames.swap(frames);
-}
-
-ScriptCallStack::~ScriptCallStack()
-{
-}
-
-const ScriptCallFrame &ScriptCallStack::at(size_t index) const
-{
- ASSERT(m_frames.size() > index);
- return m_frames[index];
-}
-
-size_t ScriptCallStack::size() const
-{
- return m_frames.size();
-}
-
-bool ScriptCallStack::isEqual(ScriptCallStack* o) const
-{
- if (!o)
- return false;
-
- size_t frameCount = o->m_frames.size();
- if (frameCount != m_frames.size())
- return false;
-
- for (size_t i = 0; i < frameCount; ++i) {
- if (!m_frames[i].isEqual(o->m_frames[i]))
- return false;
- }
-
- return true;
-}
-
-#if ENABLE(INSPECTOR)
-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> ScriptCallStack::buildInspectorArray() const
-{
- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> frames = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>::create();
- for (size_t i = 0; i < m_frames.size(); i++)
- frames->addItem(m_frames.at(i).buildInspectorObject());
- return frames;
-}
-#endif
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorScriptCallStackh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ScriptCallStack.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ScriptCallStack.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/ScriptCallStack.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-/*
- * Copyright (c) 2008, 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ScriptCallStack_h
-#define ScriptCallStack_h
-
-#if ENABLE(INSPECTOR)
-#include "InspectorWebTypeBuilders.h"
-#endif
-
-#include "ScriptCallFrame.h"
-#include <wtf/Forward.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-class ScriptCallStack : public RefCounted<ScriptCallStack> {
-public:
- static const size_t maxCallStackSizeToCapture = 200;
-
- static PassRefPtr<ScriptCallStack> create(Vector<ScriptCallFrame>&);
-
- ~ScriptCallStack();
-
- const ScriptCallFrame &at(size_t) const;
- size_t size() const;
-
- bool isEqual(ScriptCallStack*) const;
-
-#if ENABLE(INSPECTOR)
- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> buildInspectorArray() const;
-#endif
-
-private:
- ScriptCallStack(Vector<ScriptCallFrame>&);
-
- Vector<ScriptCallFrame> m_frames;
-};
-
-} // namespace WebCore
-
-#endif // ScriptCallStack_h
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -37,13 +37,14 @@
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "FloatQuad.h"
</span><span class="cx"> #include "IntRect.h"
</span><ins>+#include "JSMainThreadExecState.h"
</ins><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><del>-#include "ScriptCallStack.h"
-#include "ScriptCallStackFactory.h"
</del><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <inspector/ScriptCallStack.h>
+#include <inspector/ScriptCallStackFactory.h>
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx"> record->setNumber("startTime", startTime);
</span><span class="cx">
</span><span class="cx"> if (maxCallStackDepth) {
</span><del>- RefPtr<ScriptCallStack> stackTrace = createScriptCallStack(maxCallStackDepth, true);
</del><ins>+ RefPtr<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), maxCallStackDepth, true);
</ins><span class="cx"> if (stackTrace && stackTrace->size())
</span><span class="cx"> record->setValue("stackTrace", stackTrace->buildInspectorArray());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebConsoleAgentcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/inspector/WebConsoleAgent.cpp (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebConsoleAgent.cpp (rev 0)
+++ trunk/Source/WebCore/inspector/WebConsoleAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,137 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#include "config.h"
+#include "WebConsoleAgent.h"
+
+#if ENABLE(INSPECTOR)
+
+#include "CommandLineAPIHost.h"
+#include "Console.h"
+#include "DOMWindow.h"
+#include "PageInjectedScriptManager.h"
+#include "ResourceError.h"
+#include "ResourceResponse.h"
+#include "ScriptProfiler.h"
+#include "ScriptState.h"
+#include <inspector/ConsoleMessage.h>
+
+using namespace Inspector;
+
+namespace WebCore {
+
+WebConsoleAgent::WebConsoleAgent(PageInjectedScriptManager* injectedScriptManager)
+ : InspectorConsoleAgent(injectedScriptManager)
+ , m_monitoringXHREnabled(false)
+{
+}
+
+void WebConsoleAgent::setMonitoringXHREnabled(ErrorString*, bool enabled)
+{
+ m_monitoringXHREnabled = enabled;
+}
+
+void WebConsoleAgent::frameWindowDiscarded(DOMWindow* window)
+{
+ size_t messageCount = m_consoleMessages.size();
+ for (size_t i = 0; i < messageCount; ++i) {
+ JSC::ExecState* exec = m_consoleMessages[i]->scriptState();
+ if (!exec)
+ continue;
+ if (domWindowFromExecState(exec) != window)
+ continue;
+ m_consoleMessages[i]->clear();
+ }
+
+ static_cast<PageInjectedScriptManager*>(m_injectedScriptManager)->discardInjectedScriptsFor(window);
+}
+
+void WebConsoleAgent::didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
+{
+ if (!m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled())
+ return;
+
+ if (m_frontendDispatcher && m_monitoringXHREnabled) {
+ String message = "XHR finished loading: \"" + url + "\".";
+ addMessageToConsole(MessageSource::Network, MessageType::Log, MessageLevel::Debug, message, sendURL, sendLineNumber, sendColumnNumber, nullptr, requestIdentifier);
+ }
+}
+
+void WebConsoleAgent::didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse& response)
+{
+ if (!m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled())
+ return;
+
+ if (response.httpStatusCode() >= 400) {
+ String message = "Failed to load resource: the server responded with a status of " + String::number(response.httpStatusCode()) + " (" + response.httpStatusText() + ')';
+ addMessageToConsole(MessageSource::Network, MessageType::Log, MessageLevel::Error, message, response.url().string(), 0, 0, nullptr, requestIdentifier);
+ }
+}
+
+void WebConsoleAgent::didFailLoading(unsigned long requestIdentifier, const ResourceError& error)
+{
+ if (!m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled())
+ return;
+
+ // Report failures only.
+ if (error.isCancellation())
+ return;
+
+ StringBuilder message;
+ message.appendLiteral("Failed to load resource");
+ if (!error.localizedDescription().isEmpty()) {
+ message.appendLiteral(": ");
+ message.append(error.localizedDescription());
+ }
+
+ addMessageToConsole(MessageSource::Network, MessageType::Log, MessageLevel::Error, message.toString(), error.failingURL(), 0, 0, nullptr, requestIdentifier);
+}
+
+class InspectableHeapObject final : public CommandLineAPIHost::InspectableObject {
+public:
+ explicit InspectableHeapObject(int heapObjectId)
+ : m_heapObjectId(heapObjectId)
+ {
+ }
+
+ virtual Deprecated::ScriptValue get(JSC::ExecState*) override
+ {
+ return ScriptProfiler::objectByHeapObjectId(m_heapObjectId);
+ }
+
+private:
+ int m_heapObjectId;
+};
+
+void WebConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId)
+{
+ if (CommandLineAPIHost* commandLineAPIHost = static_cast<PageInjectedScriptManager*>(m_injectedScriptManager)->commandLineAPIHost())
+ commandLineAPIHost->addInspectedObject(adoptPtr(new InspectableHeapObject(inspectedHeapObjectId)));
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebConsoleAgenthfromrev163567trunkSourceWebCoreinspectorConsoleAPITypesh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/inspector/WebConsoleAgent.h (from rev 163567, trunk/Source/WebCore/inspector/ConsoleAPITypes.h) (0 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebConsoleAgent.h (rev 0)
+++ trunk/Source/WebCore/inspector/WebConsoleAgent.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebConsoleAgent_h
+#define WebConsoleAgent_h
+
+#if ENABLE(INSPECTOR)
+
+#include <inspector/agents/InspectorConsoleAgent.h>
+
+namespace WebCore {
+
+class DOMWindow;
+class PageInjectedScriptManager;
+class ResourceError;
+class ResourceResponse;
+typedef String ErrorString;
+
+class WebConsoleAgent : public Inspector::InspectorConsoleAgent {
+ WTF_MAKE_NONCOPYABLE(WebConsoleAgent);
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ WebConsoleAgent(PageInjectedScriptManager*);
+ virtual ~WebConsoleAgent() { }
+
+ virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) override final;
+ virtual void addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId) override final;
+
+ void frameWindowDiscarded(DOMWindow*);
+
+ void didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
+ void didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse&);
+ void didFailLoading(unsigned long requestIdentifier, const ResourceError&);
+
+protected:
+ bool m_monitoringXHREnabled;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(WebConsoleAgent_h)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -38,18 +38,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WorkerConsoleAgent::WorkerConsoleAgent(InstrumentingAgents* instrumentingAgents, PageInjectedScriptManager* injectedScriptManager)
- : InspectorConsoleAgent(instrumentingAgents, injectedScriptManager)
</del><ins>+WorkerConsoleAgent::WorkerConsoleAgent(PageInjectedScriptManager* injectedScriptManager)
+ : WebConsoleAgent(injectedScriptManager)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WorkerConsoleAgent::~WorkerConsoleAgent()
-{
-}
-
</del><span class="cx"> void WorkerConsoleAgent::addInspectedNode(ErrorString* error, int)
</span><span class="cx"> {
</span><del>- *error = "addInspectedNode is not supported for workers";
</del><ins>+ *error = ASCIILiteral("addInspectedNode is not supported for workers");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -31,20 +31,20 @@
</span><span class="cx"> #ifndef WorkerConsoleAgent_h
</span><span class="cx"> #define WorkerConsoleAgent_h
</span><span class="cx">
</span><del>-#include "InspectorConsoleAgent.h"
-#include <wtf/PassOwnPtr.h>
</del><ins>+#include "WebConsoleAgent.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class WorkerConsoleAgent : public InspectorConsoleAgent {
</del><ins>+class WorkerConsoleAgent final : public WebConsoleAgent {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(WorkerConsoleAgent);
</span><ins>+ WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><del>- WorkerConsoleAgent(InstrumentingAgents*, PageInjectedScriptManager*);
- virtual ~WorkerConsoleAgent();
</del><ins>+ WorkerConsoleAgent(PageInjectedScriptManager*);
+ virtual ~WorkerConsoleAgent() { }
</ins><span class="cx">
</span><del>- virtual bool isWorkerAgent() override { return true; }
</del><ins>+ virtual bool isWorkerAgent() const override { return true; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void addInspectedNode(ErrorString*, int nodeId) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx">
</span><span class="cx"> void WorkerDebuggerAgent::breakpointActionLog(JSC::ExecState*, const String& message)
</span><span class="cx"> {
</span><del>- m_inspectedWorkerGlobalScope->addConsoleMessage(JSMessageSource, LogMessageLevel, message);
</del><ins>+ m_inspectedWorkerGlobalScope->addConsoleMessage(MessageSource::JS, MessageLevel::Log, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WorkerScriptDebugServer& WorkerDebuggerAgent::scriptDebugServer()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CommandLineAPIHost.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><del>-#include "InspectorConsoleAgent.h"
</del><span class="cx"> #include "InspectorForwarding.h"
</span><span class="cx"> #include "InspectorHeapProfilerAgent.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="lines">@@ -90,7 +89,9 @@
</span><span class="cx"> m_instrumentingAgents->setWorkerRuntimeAgent(m_runtimeAgent);
</span><span class="cx"> m_agents.append(std::move(runtimeAgent));
</span><span class="cx">
</span><del>- auto consoleAgent = std::make_unique<WorkerConsoleAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get());
</del><ins>+ auto consoleAgent = std::make_unique<WorkerConsoleAgent>(m_injectedScriptManager.get());
+ m_instrumentingAgents->setWebConsoleAgent(consoleAgent.get());
+
</ins><span class="cx"> auto debuggerAgent = std::make_unique<WorkerDebuggerAgent>(m_injectedScriptManager.get(), m_instrumentingAgents.get(), &workerGlobalScope);
</span><span class="cx"> m_runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
</span><span class="cx"> m_agents.append(std::move(debuggerAgent));
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolConsolejson"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/protocol/Console.json (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/Console.json 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/inspector/protocol/Console.json 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,95 +0,0 @@
</span><del>-{
- "domain": "Console",
- "description": "Console domain defines methods and events for interaction with the JavaScript console. Console collects messages created by means of the <a href='http://getfirebug.com/wiki/index.php/Console_API'>JavaScript Console API</a>. One needs to enable this domain using <code>enable</code> command in order to start receiving the console messages. Browser collects messages issued while console domain is not enabled as well and reports them using <code>messageAdded</code> notification upon enabling.",
- "types": [
- {
- "id": "ConsoleMessage",
- "type": "object",
- "description": "Console message.",
- "properties": [
- { "name": "source", "type": "string", "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "other"], "description": "Message source." },
- { "name": "level", "type": "string", "enum": ["log", "warning", "error", "debug"], "description": "Message severity." },
- { "name": "text", "type": "string", "description": "Message text." },
- { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "table", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert", "timing", "profile", "profileEnd"], "description": "Console message type." },
- { "name": "url", "type": "string", "optional": true, "description": "URL of the message origin." },
- { "name": "line", "type": "integer", "optional": true, "description": "Line number in the resource that generated this message." },
- { "name": "column", "type": "integer", "optional": true, "description": "Column number on the line in the resource that generated this message." },
- { "name": "repeatCount", "type": "integer", "optional": true, "description": "Repeat count for repeated messages." },
- { "name": "parameters", "type": "array", "items": { "$ref": "Runtime.RemoteObject" }, "optional": true, "description": "Message parameters in case of the formatted message." },
- { "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "JavaScript stack trace for assertions and error messages." },
- { "name": "networkRequestId", "$ref": "Network.RequestId", "optional": true, "description": "Identifier of the network request associated with this message." }
- ]
- },
- {
- "id": "CallFrame",
- "type": "object",
- "description": "Stack entry for console errors and assertions.",
- "properties": [
- { "name": "functionName", "type": "string", "description": "JavaScript function name." },
- { "name": "url", "type": "string", "description": "JavaScript script name or url." },
- { "name": "lineNumber", "type": "integer", "description": "JavaScript script line number." },
- { "name": "columnNumber", "type": "integer", "description": "JavaScript script column number." }
- ]
- },
- {
- "id": "StackTrace",
- "type": "array",
- "items": { "$ref": "CallFrame" },
- "description": "Call frames for assertions or error messages."
- }
- ],
- "commands": [
- {
- "name": "enable",
- "description": "Enables console domain, sends the messages collected so far to the client by means of the <code>messageAdded</code> notification."
- },
- {
- "name": "disable",
- "description": "Disables console domain, prevents further console messages from being reported to the client."
- },
- {
- "name": "clearMessages",
- "description": "Clears console messages collected in the browser."
- },
- {
- "name": "setMonitoringXHREnabled",
- "parameters": [
- { "name": "enabled", "type": "boolean", "description": "Monitoring enabled state." }
- ],
- "description": "Toggles monitoring of XMLHttpRequest. If <code>true</code>, console will receive messages upon each XHR issued."
- },
- {
- "name": "addInspectedNode",
- "parameters": [
- { "name": "nodeId", "$ref": "DOM.NodeId", "description": "DOM node id to be accessible by means of $x command line API." }
- ],
- "description": "Enables console to refer to the node with given id via $x (see Command Line API for more details $x functions)."
- },
- {
- "name": "addInspectedHeapObject",
- "parameters": [
- { "name": "heapObjectId", "type": "integer" }
- ]
- }
- ],
- "events": [
- {
- "name": "messageAdded",
- "parameters": [
- { "name": "message", "$ref": "ConsoleMessage", "description": "Console message that has been added." }
- ],
- "description": "Issued when new console message is added."
- },
- {
- "name": "messageRepeatCountUpdated",
- "parameters": [
- { "name": "count", "type": "integer", "description": "New repeat count value." }
- ],
- "description": "Issued when subsequent message(s) are equal to the previous one(s)."
- },
- {
- "name": "messagesCleared",
- "description": "Issued when console is cleared. This happens either upon <code>clearMessages</code> command or after page navigation."
- }
- ]
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -614,7 +614,7 @@
</span><span class="cx"> if (frameLoader()->shouldInterruptLoadForXFrameOptions(content, response.url(), identifier)) {
</span><span class="cx"> InspectorInstrumentation::continueAfterXFrameOptionsDenied(m_frame, this, identifier, response);
</span><span class="cx"> String message = "Refused to display '" + response.url().stringCenterEllipsizedToLength() + "' in a frame because it set 'X-Frame-Options' to '" + content + "'.";
</span><del>- frame()->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message, identifier);
</del><ins>+ frame()->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, message, identifier);
</ins><span class="cx"> frame()->document()->enforceSandboxFlags(SandboxOrigin);
</span><span class="cx"> if (HTMLFrameOwnerElement* ownerElement = frame()->ownerElement())
</span><span class="cx"> ownerElement->dispatchEvent(Event::create(eventNames().loadEvent, false, false));
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -102,7 +102,6 @@
</span><span class="cx"> #include "SVGViewElement.h"
</span><span class="cx"> #include "SVGViewSpec.h"
</span><span class="cx"> #include "SchemeRegistry.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="cx"> #include "ScrollAnimator.h"
</span><span class="lines">@@ -370,7 +369,7 @@
</span><span class="cx">
</span><span class="cx"> if (isDocumentSandboxed(&m_frame, SandboxForms)) {
</span><span class="cx"> // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
</span><del>- m_frame.document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Blocked form submission to '" + submission->action().stringCenterEllipsizedToLength() + "' because the form's frame is sandboxed and the 'allow-forms' permission is not set.");
</del><ins>+ m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Blocked form submission to '" + submission->action().stringCenterEllipsizedToLength() + "' because the form's frame is sandboxed and the 'allow-forms' permission is not set.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1479,7 +1478,7 @@
</span><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- frame->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Not allowed to load local resource: " + url);
</del><ins>+ frame->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Not allowed to load local resource: " + url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const ResourceRequest& FrameLoader::initialRequest() const
</span><span class="lines">@@ -2842,7 +2841,7 @@
</span><span class="cx"> // If the navigating FrameLoader has already shown a beforeunload confirmation panel for the current navigation attempt,
</span><span class="cx"> // this frame is not allowed to cause another one to be shown.
</span><span class="cx"> if (frameLoaderBeingNavigated->m_currentNavigationHasShownBeforeUnloadConfirmPanel) {
</span><del>- document->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Blocked attempt to show multiple beforeunload confirmation dialogs for the same navigation.");
</del><ins>+ document->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Blocked attempt to show multiple beforeunload confirmation dialogs for the same navigation."));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2855,7 +2854,7 @@
</span><span class="cx"> if (!parentDocument)
</span><span class="cx"> return true;
</span><span class="cx"> if (!m_frame.document() || !m_frame.document()->securityOrigin()->canAccess(parentDocument->securityOrigin())) {
</span><del>- document->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Blocked attempt to show beforeunload confirmation dialog on behalf of a frame with different security origin. Protocols, domains, and ports must match.");
</del><ins>+ document->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Blocked attempt to show beforeunload confirmation dialog on behalf of a frame with different security origin. Protocols, domains, and ports must match."));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3065,10 +3064,10 @@
</span><span class="cx"> case XFrameOptionsAllowAll:
</span><span class="cx"> return false;
</span><span class="cx"> case XFrameOptionsConflict:
</span><del>- m_frame.document()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Multiple 'X-Frame-Options' headers with conflicting values ('" + content + "') encountered when loading '" + url.stringCenterEllipsizedToLength() + "'. Falling back to 'DENY'.", requestIdentifier);
</del><ins>+ m_frame.document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "Multiple 'X-Frame-Options' headers with conflicting values ('" + content + "') encountered when loading '" + url.stringCenterEllipsizedToLength() + "'. Falling back to 'DENY'.", requestIdentifier);
</ins><span class="cx"> return true;
</span><span class="cx"> case XFrameOptionsInvalid:
</span><del>- m_frame.document()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "Invalid 'X-Frame-Options' header encountered when loading '" + url.stringCenterEllipsizedToLength() + "': '" + content + "' is not a recognized directive. The header will be ignored.", requestIdentifier);
</del><ins>+ m_frame.document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "Invalid 'X-Frame-Options' header encountered when loading '" + url.stringCenterEllipsizedToLength() + "': '" + content + "' is not a recognized directive. The header will be ignored.", requestIdentifier);
</ins><span class="cx"> return false;
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -3441,7 +3440,7 @@
</span><span class="cx"> // Sandboxed frames cannot open new auxiliary browsing contexts.
</span><span class="cx"> if (isDocumentSandboxed(openerFrame, SandboxPopups)) {
</span><span class="cx"> // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
</span><del>- openerFrame->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Blocked opening '" + request.resourceRequest().url().stringCenterEllipsizedToLength() + "' in a new window because the request was made in a sandboxed frame whose 'allow-popups' permission is not set.");
</del><ins>+ openerFrame->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Blocked opening '" + request.resourceRequest().url().stringCenterEllipsizedToLength() + "' in a new window because the request was made in a sandboxed frame whose 'allow-popups' permission is not set.");
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><span class="cx"> #include "RenderImage.h"
</span><span class="cx"> #include "RenderSVGImage.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="lines">@@ -293,7 +292,7 @@
</span><span class="cx"> errorEventSender().dispatchEventSoon(this);
</span><span class="cx">
</span><span class="cx"> DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Cross-origin image load denied by Cross-Origin Resource Sharing policy.")));
</span><del>- element().document().addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, consoleMessage);
</del><ins>+ element().document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage);
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_hasPendingLoadEvent);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMixedContentCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MixedContentChecker.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MixedContentChecker.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/loader/MixedContentChecker.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> void MixedContentChecker::logWarning(bool allowed, const String& action, const URL& target) const
</span><span class="cx"> {
</span><span class="cx"> String message = makeString((allowed ? "" : "[blocked] "), "The page at ", m_frame.document()->url().stringCenterEllipsizedToLength(), " ", action, " insecure content from ", target.stringCenterEllipsizedToLength(), ".\n");
</span><del>- m_frame.document()->addConsoleMessage(SecurityMessageSource, WarningMessageLevel, message);
</del><ins>+ m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Warning, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextTrackLoader.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/loader/TextTrackLoader.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "ResourceBuffer.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "TextTrackCue.h"
</span><span class="cx"> #include "WebVTTParser.h"
</span><span class="lines">@@ -118,7 +117,7 @@
</span><span class="cx"> {
</span><span class="cx"> DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Cross-origin text track load denied by Cross-Origin Resource Sharing policy.")));
</span><span class="cx"> Document* document = toDocument(m_scriptExecutionContext);
</span><del>- document->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, consoleMessage);
</del><ins>+ document->addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage);
</ins><span class="cx"> m_state = Failed;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> if (m_completionType != None)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- frame->document()->addConsoleMessage(NetworkMessageSource, DebugMessageLevel, "Application Cache download process was aborted.");
</del><ins>+ frame->document()->addConsoleMessage(MessageSource::Network, MessageLevel::Debug, ASCIILiteral("Application Cache download process was aborted."));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx">
</span><span class="cx"> if (response.httpStatusCode() / 100 != 2 || response.url() != m_currentHandle->firstRequest().url()) {
</span><span class="cx"> if ((type & ApplicationCacheResource::Explicit) || (type & ApplicationCacheResource::Fallback)) {
</span><del>- m_frame->document()->addConsoleMessage(AppCacheMessageSource, ErrorMessageLevel, "Application Cache update failed, because " + m_currentHandle->firstRequest().url().stringCenterEllipsizedToLength() +
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Error, "Application Cache update failed, because " + m_currentHandle->firstRequest().url().stringCenterEllipsizedToLength() +
</ins><span class="cx"> ((response.httpStatusCode() / 100 != 2) ? " could not be fetched." : " was redirected."));
</span><span class="cx"> // Note that cacheUpdateFailed() can cause the cache group to be deleted.
</span><span class="cx"> cacheUpdateFailed();
</span><span class="lines">@@ -626,7 +626,7 @@
</span><span class="cx"> // FIXME: Should we break earlier and prevent redownloading on later page loads?
</span><span class="cx"> if (m_originQuotaExceededPreviously && m_availableSpaceInQuota < m_cacheBeingUpdated->estimatedSizeInStorage()) {
</span><span class="cx"> m_currentResource = 0;
</span><del>- m_frame->document()->addConsoleMessage(AppCacheMessageSource, ErrorMessageLevel, "Application Cache update failed, because size quota was exceeded.");
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Error, ASCIILiteral("Application Cache update failed, because size quota was exceeded."));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -661,7 +661,7 @@
</span><span class="cx"> m_pendingEntries.remove(url);
</span><span class="cx">
</span><span class="cx"> if ((type & ApplicationCacheResource::Explicit) || (type & ApplicationCacheResource::Fallback)) {
</span><del>- m_frame->document()->addConsoleMessage(AppCacheMessageSource, ErrorMessageLevel, "Application Cache update failed, because " + url.stringCenterEllipsizedToLength() + " could not be fetched.");
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Error, "Application Cache update failed, because " + url.stringCenterEllipsizedToLength() + " could not be fetched.");
</ins><span class="cx"> // Note that cacheUpdateFailed() can cause the cache group to be deleted.
</span><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> } else {
</span><span class="lines">@@ -690,13 +690,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (response.httpStatusCode() / 100 != 2) {
</span><del>- m_frame->document()->addConsoleMessage(OtherMessageSource, ErrorMessageLevel, "Application Cache manifest could not be fetched.");
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::Other, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be fetched."));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (response.url() != m_manifestHandle->firstRequest().url()) {
</span><del>- m_frame->document()->addConsoleMessage(OtherMessageSource, ErrorMessageLevel, "Application Cache manifest could not be fetched, because a redirection was attempted.");
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::Other, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be fetched, because a redirection was attempted."));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx">
</span><span class="cx"> if (!isUpgradeAttempt && !m_manifestResource) {
</span><span class="cx"> // The server returned 304 Not Modified even though we didn't send a conditional request.
</span><del>- m_frame->document()->addConsoleMessage(OtherMessageSource, ErrorMessageLevel, "Application Cache manifest could not be fetched because of an unexpected 304 Not Modified server response.");
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::Other, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be fetched because of an unexpected 304 Not Modified server response."));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx"> Manifest manifest;
</span><span class="cx"> if (!parseManifest(m_manifestURL, m_manifestResource->data()->data(), m_manifestResource->data()->size(), manifest)) {
</span><span class="cx"> // At the time of this writing, lack of "CACHE MANIFEST" signature is the only reason for parseManifest to fail.
</span><del>- m_frame->document()->addConsoleMessage(OtherMessageSource, ErrorMessageLevel, "Application Cache manifest could not be parsed. Does it start with CACHE MANIFEST?");
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::Other, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be parsed. Does it start with CACHE MANIFEST?"));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -929,7 +929,7 @@
</span><span class="cx"> // We ran out of space for this origin. Fall down to the normal error handling
</span><span class="cx"> // after recording this state.
</span><span class="cx"> m_originQuotaExceededPreviously = true;
</span><del>- m_frame->document()->addConsoleMessage(OtherMessageSource, ErrorMessageLevel, "Application Cache update failed, because size quota was exceeded.");
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::Other, MessageLevel::Error, ASCIILiteral("Application Cache update failed, because size quota was exceeded."));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (failureReason == ApplicationCacheStorage::TotalQuotaReached && !m_calledReachedMaxAppCacheSize) {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -632,7 +632,7 @@
</span><span class="cx"> else
</span><span class="cx"> message = "Unsafe attempt to load URL " + url.stringCenterEllipsizedToLength() + " from frame with URL " + m_document->url().stringCenterEllipsizedToLength() + ". Domains, protocols and ports must match.\n";
</span><span class="cx">
</span><del>- frame()->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message);
</del><ins>+ frame()->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedResourceLoader::setAutoLoadImages(bool enable)
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/ChromeClient.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> #define ChromeClient_h
</span><span class="cx">
</span><span class="cx"> #include "AXObjectCache.h"
</span><del>-#include "ConsoleAPITypes.h"
-#include "ConsoleTypes.h"
</del><span class="cx"> #include "Cursor.h"
</span><span class="cx"> #include "FocusDirection.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="lines">@@ -37,6 +35,7 @@
</span><span class="cx"> #include "ScrollingCoordinator.h"
</span><span class="cx"> #include "SearchPopupMenu.h"
</span><span class="cx"> #include "WebCoreKeyboardUIMode.h"
</span><ins>+#include <inspector/ConsoleTypes.h>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span></span></pre></div>
<a id="trunkSourceWebCorepageConsolecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Console.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Console.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/Console.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><del>-#include "ConsoleAPITypes.h"
-#include "ConsoleTypes.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="lines">@@ -42,18 +40,21 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageConsole.h"
</span><span class="cx"> #include "PageGroup.h"
</span><del>-#include "ScriptArguments.h"
-#include "ScriptCallStack.h"
-#include "ScriptCallStackFactory.h"
</del><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx"> #include "ScriptProfiler.h"
</span><span class="cx"> #include "ScriptableDocumentParser.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><ins>+#include <inspector/ConsoleTypes.h>
+#include <inspector/ScriptArguments.h>
+#include <inspector/ScriptCallStack.h>
+#include <inspector/ScriptCallStackFactory.h>
</ins><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+using namespace Inspector;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> Console::Console(Frame* frame)
</span><span class="lines">@@ -81,13 +82,13 @@
</span><span class="cx">
</span><span class="cx"> String message;
</span><span class="cx"> bool gotMessage = arguments->getFirstArgumentAsString(message);
</span><del>- InspectorInstrumentation::addMessageToConsole(page, ConsoleAPIMessageSource, type, level, message, state, arguments);
</del><ins>+ InspectorInstrumentation::addMessageToConsole(page, MessageSource::ConsoleAPI, type, level, message, state, arguments);
</ins><span class="cx">
</span><span class="cx"> if (page->settings().privateBrowsingEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (gotMessage)
</span><del>- page->chrome().client().addMessageToConsole(ConsoleAPIMessageSource, type, level, message, lastCaller.lineNumber(), lastCaller.columnNumber(), lastCaller.sourceURL());
</del><ins>+ page->chrome().client().addMessageToConsole(MessageSource::ConsoleAPI, type, level, message, lastCaller.lineNumber(), lastCaller.columnNumber(), lastCaller.sourceURL());
</ins><span class="cx">
</span><span class="cx"> if (!page->settings().logsPageMessagesToSystemConsoleEnabled() && !PageConsole::shouldPrintExceptions())
</span><span class="cx"> return;
</span><span class="lines">@@ -96,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> printf(": ");
</span><span class="cx">
</span><del>- PageConsole::printMessageSourceAndLevelPrefix(ConsoleAPIMessageSource, level, printTrace);
</del><ins>+ PageConsole::printMessageSourceAndLevelPrefix(MessageSource::ConsoleAPI, level, printTrace);
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < arguments->argumentCount(); ++i) {
</span><span class="cx"> String argAsString = arguments->argumentAt(i).toString(arguments->globalState());
</span><span class="lines">@@ -125,12 +126,12 @@
</span><span class="cx">
</span><span class="cx"> void Console::debug(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- internalAddMessage(page(), LogMessageType, DebugMessageLevel, state, arguments);
</del><ins>+ internalAddMessage(page(), MessageType::Log, MessageLevel::Debug, state, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::error(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- internalAddMessage(page(), LogMessageType, ErrorMessageLevel, state, arguments);
</del><ins>+ internalAddMessage(page(), MessageType::Log, MessageLevel::Error, state, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::info(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="lines">@@ -140,37 +141,37 @@
</span><span class="cx">
</span><span class="cx"> void Console::log(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- internalAddMessage(page(), LogMessageType, LogMessageLevel, state, arguments);
</del><ins>+ internalAddMessage(page(), MessageType::Log, MessageLevel::Log, state, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::warn(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- internalAddMessage(page(), LogMessageType, WarningMessageLevel, state, arguments);
</del><ins>+ internalAddMessage(page(), MessageType::Log, MessageLevel::Warning, state, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::dir(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- internalAddMessage(page(), DirMessageType, LogMessageLevel, state, arguments);
</del><ins>+ internalAddMessage(page(), MessageType::Dir, MessageLevel::Log, state, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::dirxml(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- internalAddMessage(page(), DirXMLMessageType, LogMessageLevel, state, arguments);
</del><ins>+ internalAddMessage(page(), MessageType::DirXML, MessageLevel::Log, state, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::table(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- internalAddMessage(page(), TableMessageType, LogMessageLevel, state, arguments);
</del><ins>+ internalAddMessage(page(), MessageType::Table, MessageLevel::Log, state, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::clear(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- internalAddMessage(page(), ClearMessageType, LogMessageLevel, state, arguments, true);
</del><ins>+ internalAddMessage(page(), MessageType::Clear, MessageLevel::Log, state, arguments, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::trace(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- internalAddMessage(page(), TraceMessageType, LogMessageLevel, state, arguments, true, true);
</del><ins>+ internalAddMessage(page(), MessageType::Trace, MessageLevel::Log, state, arguments, true, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::assertCondition(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments, bool condition)
</span><span class="lines">@@ -178,7 +179,7 @@
</span><span class="cx"> if (condition)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- internalAddMessage(page(), AssertMessageType, ErrorMessageLevel, state, arguments, true);
</del><ins>+ internalAddMessage(page(), MessageType::Assert, MessageLevel::Error, state, arguments, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::count(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="lines">@@ -243,17 +244,17 @@
</span><span class="cx">
</span><span class="cx"> void Console::group(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- InspectorInstrumentation::addMessageToConsole(page(), ConsoleAPIMessageSource, StartGroupMessageType, LogMessageLevel, String(), state, arguments);
</del><ins>+ InspectorInstrumentation::addMessageToConsole(page(), MessageSource::ConsoleAPI, MessageType::StartGroup, MessageLevel::Log, String(), state, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::groupCollapsed(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><del>- InspectorInstrumentation::addMessageToConsole(page(), ConsoleAPIMessageSource, StartGroupCollapsedMessageType, LogMessageLevel, String(), state, arguments);
</del><ins>+ InspectorInstrumentation::addMessageToConsole(page(), MessageSource::ConsoleAPI, MessageType::StartGroupCollapsed, MessageLevel::Log, String(), state, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Console::groupEnd()
</span><span class="cx"> {
</span><del>- InspectorInstrumentation::addMessageToConsole(page(), ConsoleAPIMessageSource, EndGroupMessageType, LogMessageLevel, String(), String(), 0, 0);
</del><ins>+ InspectorInstrumentation::addMessageToConsole(page(), MessageSource::ConsoleAPI, MessageType::EndGroup, MessageLevel::Log, String(), String(), 0, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Page* Console::page() const
</span></span></pre></div>
<a id="trunkSourceWebCorepageConsoleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Console.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Console.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/Console.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -37,11 +37,14 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><ins>+namespace Inspector {
+class ScriptArguments;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Frame;
</span><span class="cx"> class Page;
</span><del>-class ScriptArguments;
</del><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<ScriptProfile>> ProfilesArray;
</span><span class="cx">
</span><span class="lines">@@ -50,26 +53,26 @@
</span><span class="cx"> static PassRefPtr<Console> create(Frame* frame) { return adoptRef(new Console(frame)); }
</span><span class="cx"> virtual ~Console();
</span><span class="cx">
</span><del>- void debug(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void error(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void info(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void log(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void clear(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void warn(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void dir(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void dirxml(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void table(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void trace(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void assertCondition(JSC::ExecState*, PassRefPtr<ScriptArguments>, bool condition);
- void count(JSC::ExecState*, PassRefPtr<ScriptArguments>);
</del><ins>+ void debug(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void error(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void info(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void log(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void clear(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void warn(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void dir(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void dirxml(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void table(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void trace(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void assertCondition(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>, bool condition);
+ void count(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx"> const ProfilesArray& profiles() const { return m_profiles; }
</span><span class="cx"> void profile(JSC::ExecState*, const String& = String());
</span><span class="cx"> void profileEnd(JSC::ExecState*, const String& = String());
</span><span class="cx"> void time(const String&);
</span><span class="cx"> void timeEnd(JSC::ExecState*, const String&);
</span><del>- void timeStamp(PassRefPtr<ScriptArguments>);
- void group(JSC::ExecState*, PassRefPtr<ScriptArguments>);
- void groupCollapsed(JSC::ExecState*, PassRefPtr<ScriptArguments>);
</del><ins>+ void timeStamp(PassRefPtr<Inspector::ScriptArguments>);
+ void group(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void groupCollapsed(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx"> void groupEnd();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorepageConsoleTypesh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/page/ConsoleTypes.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ConsoleTypes.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/ConsoleTypes.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ConsoleTypes_h
-#define ConsoleTypes_h
-
-namespace WebCore {
-
-enum MessageSource {
- XMLMessageSource,
- JSMessageSource,
- NetworkMessageSource,
- ConsoleAPIMessageSource,
- StorageMessageSource,
- AppCacheMessageSource,
- RenderingMessageSource,
- CSSMessageSource,
- SecurityMessageSource,
- OtherMessageSource,
-};
-
-enum MessageLevel {
- DebugMessageLevel = 4,
- LogMessageLevel = 1,
- WarningMessageLevel = 2,
- ErrorMessageLevel = 3
-};
-
-} // namespace WebCore
-
-#endif // ConsoleTypes_h
</del></span></pre></div>
<a id="trunkSourceWebCorepageContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContentSecurityPolicy.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -35,17 +35,18 @@
</span><span class="cx"> #include "FormDataList.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><del>-#include "URL.h"
</del><ins>+#include "JSMainThreadExecState.h"
</ins><span class="cx"> #include "PingLoader.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "SchemeRegistry.h"
</span><del>-#include "ScriptCallStack.h"
-#include "ScriptCallStackFactory.h"
</del><span class="cx"> #include "ScriptState.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "SecurityPolicyViolationEvent.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><ins>+#include "URL.h"
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <inspector/ScriptCallStack.h>
+#include <inspector/ScriptCallStackFactory.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/text/TextPosition.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -1726,7 +1727,7 @@
</span><span class="cx"> init.sourceFile = String();
</span><span class="cx"> init.lineNumber = 0;
</span><span class="cx">
</span><del>- RefPtr<ScriptCallStack> stack = createScriptCallStack(2, false);
</del><ins>+ RefPtr<ScriptCallStack> stack = createScriptCallStack(JSMainThreadExecState::currentState(), 2, false);
</ins><span class="cx"> if (!stack)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1788,7 +1789,7 @@
</span><span class="cx"> cspReport->setString("original-policy", header);
</span><span class="cx"> cspReport->setString("blocked-uri", stripURLForUseInReport(document, blockedURL));
</span><span class="cx">
</span><del>- RefPtr<ScriptCallStack> stack = createScriptCallStack(2, false);
</del><ins>+ RefPtr<ScriptCallStack> stack = createScriptCallStack(JSMainThreadExecState::currentState(), 2, false);
</ins><span class="cx"> if (stack) {
</span><span class="cx"> const ScriptCallFrame& callFrame = getFirstNonNativeFrame(stack);
</span><span class="cx">
</span><span class="lines">@@ -1899,7 +1900,7 @@
</span><span class="cx"> void ContentSecurityPolicy::logToConsole(const String& message, const String& contextURL, const WTF::OrdinalNumber& contextLine, JSC::ExecState* state) const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: <http://webkit.org/b/114317> ContentSecurityPolicy::logToConsole should include a column number
</span><del>- m_scriptExecutionContext->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message, contextURL, contextLine.oneBasedInt(), 0, state);
</del><ins>+ m_scriptExecutionContext->addConsoleMessage(MessageSource::Security, MessageLevel::Error, message, contextURL, contextLine.oneBasedInt(), 0, state);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ContentSecurityPolicy::reportBlockedScriptExecutionToInspector(const String& directiveText) const
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMSecurityPolicy.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMSecurityPolicy.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/DOMSecurityPolicy.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "ContextDestructionObserver.h"
</span><span class="cx"> #include "DOMStringList.h"
</span><span class="cx"> #include "Frame.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include <wtf/text/TextPosition.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "History.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><del>-#include "URL.h"
</del><ins>+#include "JSMainThreadExecState.h"
</ins><span class="cx"> #include "Location.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "MediaQueryList.h"
</span><span class="lines">@@ -85,8 +85,6 @@
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "ScheduledAction.h"
</span><span class="cx"> #include "Screen.h"
</span><del>-#include "ScriptCallStack.h"
-#include "ScriptCallStackFactory.h"
</del><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "SecurityPolicy.h"
</span><span class="lines">@@ -98,10 +96,13 @@
</span><span class="cx"> #include "StyleMedia.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "SuddenTermination.h"
</span><ins>+#include "URL.h"
</ins><span class="cx"> #include "WebKitPoint.h"
</span><span class="cx"> #include "WindowFeatures.h"
</span><span class="cx"> #include "WindowFocusAllowedIndicator.h"
</span><span class="cx"> #include <algorithm>
</span><ins>+#include <inspector/ScriptCallStack.h>
+#include <inspector/ScriptCallStackFactory.h>
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="lines">@@ -124,6 +125,8 @@
</span><span class="cx"> #include "WKContentObservation.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+using namespace Inspector;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class PostMessageTimer : public TimerBase {
</span><span class="lines">@@ -843,7 +846,7 @@
</span><span class="cx"> // Capture stack trace only when inspector front-end is loaded as it may be time consuming.
</span><span class="cx"> RefPtr<ScriptCallStack> stackTrace;
</span><span class="cx"> if (InspectorInstrumentation::consoleAgentEnabled(sourceDocument))
</span><del>- stackTrace = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture, true);
</del><ins>+ stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), ScriptCallStack::maxCallStackSizeToCapture, true);
</ins><span class="cx">
</span><span class="cx"> // Schedule the message.
</span><span class="cx"> PostMessageTimer* timer = new PostMessageTimer(this, message, sourceOrigin, &source, channels.release(), target.get(), stackTrace.release());
</span><span class="lines">@@ -867,7 +870,7 @@
</span><span class="cx"> if (!intendedTargetOrigin->isSameSchemeHostPort(document()->securityOrigin())) {
</span><span class="cx"> String message = "Unable to post message to " + intendedTargetOrigin->toString() +
</span><span class="cx"> ". Recipient has origin " + document()->securityOrigin()->toString() + ".\n";
</span><del>- pageConsole()->addMessage(SecurityMessageSource, ErrorMessageLevel, message, stackTrace);
</del><ins>+ pageConsole()->addMessage(MessageSource::Security, MessageLevel::Error, message, stackTrace);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -966,7 +969,7 @@
</span><span class="cx"> bool allowScriptsToCloseWindows = m_frame->settings().allowScriptsToCloseWindows();
</span><span class="cx">
</span><span class="cx"> if (!(page->openedByDOM() || page->backForward().count() <= 1 || allowScriptsToCloseWindows)) {
</span><del>- pageConsole()->addMessage(JSMessageSource, WarningMessageLevel, ASCIILiteral("Can't close the window since it was not opened by JavaScript"));
</del><ins>+ pageConsole()->addMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("Can't close the window since it was not opened by JavaScript"));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1936,7 +1939,7 @@
</span><span class="cx"> if (message.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- pageConsole()->addMessage(JSMessageSource, ErrorMessageLevel, message);
</del><ins>+ pageConsole()->addMessage(MessageSource::JS, MessageLevel::Error, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DOMWindow::crossDomainAccessErrorMessage(const DOMWindow& activeWindow)
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/DOMWindow.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -34,6 +34,10 @@
</span><span class="cx"> #include "Supplementable.h"
</span><span class="cx"> #include <functional>
</span><span class="cx">
</span><ins>+namespace Inspector {
+class ScriptCallStack;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class BarProp;
</span><span class="lines">@@ -65,7 +69,6 @@
</span><span class="cx"> class PostMessageTimer;
</span><span class="cx"> class ScheduledAction;
</span><span class="cx"> class Screen;
</span><del>- class ScriptCallStack;
</del><span class="cx"> class SecurityOrigin;
</span><span class="cx"> class SerializedScriptValue;
</span><span class="cx"> class Storage;
</span><span class="lines">@@ -239,7 +242,7 @@
</span><span class="cx"> // Needed for Objective-C bindings (see bug 28774).
</span><span class="cx"> void postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort*, const String& targetOrigin, DOMWindow& source, ExceptionCode&);
</span><span class="cx"> void postMessageTimerFired(PassOwnPtr<PostMessageTimer>);
</span><del>- void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetOrigin, PassRefPtr<Event>, PassRefPtr<ScriptCallStack>);
</del><ins>+ void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetOrigin, PassRefPtr<Event>, PassRefPtr<Inspector::ScriptCallStack>);
</ins><span class="cx">
</span><span class="cx"> void scrollBy(int x, int y) const;
</span><span class="cx"> void scrollTo(int x, int y) const;
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/EventSource.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> #include "ResourceError.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="lines">@@ -228,7 +227,7 @@
</span><span class="cx"> message.append(charset);
</span><span class="cx"> message.appendLiteral("\") that is not UTF-8. Aborting the connection.");
</span><span class="cx"> // FIXME: We are missing the source line.
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message.toString());
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, message.toString());
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // To keep the signal-to-noise ratio low, we only log 200-response with an invalid MIME type.
</span><span class="lines">@@ -238,7 +237,7 @@
</span><span class="cx"> message.append(response.mimeType());
</span><span class="cx"> message.appendLiteral("\") that is not \"text/event-stream\". Aborting the connection.");
</span><span class="cx"> // FIXME: We are missing the source line.
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message.toString());
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, message.toString());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -290,7 +289,7 @@
</span><span class="cx"> void EventSource::didFailAccessControlCheck(const ResourceError& error)
</span><span class="cx"> {
</span><span class="cx"> String message = makeString("EventSource cannot load ", error.failingURL(), ". ", error.localizedDescription());
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, message);
</ins><span class="cx">
</span><span class="cx"> abortConnectionAttempt();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsolecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsole.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsole.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/PageConsole.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -31,24 +31,25 @@
</span><span class="cx">
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><del>-#include "ConsoleAPITypes.h"
-#include "ConsoleTypes.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "InspectorConsoleInstrumentation.h"
</span><span class="cx"> #include "InspectorController.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><span class="cx"> #include "Page.h"
</span><del>-#include "ScriptArguments.h"
-#include "ScriptCallStack.h"
-#include "ScriptCallStackFactory.h"
</del><span class="cx"> #include "ScriptableDocumentParser.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><ins>+#include <inspector/ConsoleTypes.h>
+#include <inspector/ScriptArguments.h>
+#include <inspector/ScriptCallStack.h>
+#include <inspector/ScriptCallStackFactory.h>
</ins><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+using namespace Inspector;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> namespace {
</span><span class="lines">@@ -80,34 +81,34 @@
</span><span class="cx"> {
</span><span class="cx"> const char* sourceString;
</span><span class="cx"> switch (source) {
</span><del>- case XMLMessageSource:
</del><ins>+ case MessageSource::XML:
</ins><span class="cx"> sourceString = "XML";
</span><span class="cx"> break;
</span><del>- case JSMessageSource:
</del><ins>+ case MessageSource::JS:
</ins><span class="cx"> sourceString = "JS";
</span><span class="cx"> break;
</span><del>- case NetworkMessageSource:
</del><ins>+ case MessageSource::Network:
</ins><span class="cx"> sourceString = "NETWORK";
</span><span class="cx"> break;
</span><del>- case ConsoleAPIMessageSource:
</del><ins>+ case MessageSource::ConsoleAPI:
</ins><span class="cx"> sourceString = "CONSOLE";
</span><span class="cx"> break;
</span><del>- case StorageMessageSource:
</del><ins>+ case MessageSource::Storage:
</ins><span class="cx"> sourceString = "STORAGE";
</span><span class="cx"> break;
</span><del>- case AppCacheMessageSource:
</del><ins>+ case MessageSource::AppCache:
</ins><span class="cx"> sourceString = "APPCACHE";
</span><span class="cx"> break;
</span><del>- case RenderingMessageSource:
</del><ins>+ case MessageSource::Rendering:
</ins><span class="cx"> sourceString = "RENDERING";
</span><span class="cx"> break;
</span><del>- case CSSMessageSource:
</del><ins>+ case MessageSource::CSS:
</ins><span class="cx"> sourceString = "CSS";
</span><span class="cx"> break;
</span><del>- case SecurityMessageSource:
</del><ins>+ case MessageSource::Security:
</ins><span class="cx"> sourceString = "SECURITY";
</span><span class="cx"> break;
</span><del>- case OtherMessageSource:
</del><ins>+ case MessageSource::Other:
</ins><span class="cx"> sourceString = "OTHER";
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -118,16 +119,16 @@
</span><span class="cx">
</span><span class="cx"> const char* levelString;
</span><span class="cx"> switch (level) {
</span><del>- case DebugMessageLevel:
</del><ins>+ case MessageLevel::Debug:
</ins><span class="cx"> levelString = "DEBUG";
</span><span class="cx"> break;
</span><del>- case LogMessageLevel:
</del><ins>+ case MessageLevel::Log:
</ins><span class="cx"> levelString = "LOG";
</span><span class="cx"> break;
</span><del>- case WarningMessageLevel:
</del><ins>+ case MessageLevel::Warning:
</ins><span class="cx"> levelString = "WARN";
</span><span class="cx"> break;
</span><del>- case ErrorMessageLevel:
</del><ins>+ case MessageLevel::Error:
</ins><span class="cx"> levelString = "ERROR";
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -147,6 +148,7 @@
</span><span class="cx"> String url;
</span><span class="cx"> if (document)
</span><span class="cx"> url = document->url().string();
</span><ins>+
</ins><span class="cx"> // FIXME: The below code attempts to determine line numbers for parser generated errors, but this is not the only reason why we can get here.
</span><span class="cx"> // For example, if we are still parsing and get a WebSocket network error, it will be erroneously attributed to a line where parsing was paused.
</span><span class="cx"> // Also, we should determine line numbers for script generated messages (e.g. calling getImageData on a canvas).
</span><span class="lines">@@ -162,7 +164,7 @@
</span><span class="cx"> column = position.m_column.oneBasedInt();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- addMessage(source, level, message, url, line, column, 0, 0, requestIdentifier);
</del><ins>+ addMessage(source, level, message, url, line, column, 0, JSMainThreadExecState::currentState(), requestIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack)
</span><span class="lines">@@ -172,15 +174,15 @@
</span><span class="cx">
</span><span class="cx"> void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><del>- if (muteCount && source != ConsoleAPIMessageSource)
</del><ins>+ if (muteCount && source != MessageSource::ConsoleAPI)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (callStack)
</span><del>- InspectorInstrumentation::addMessageToConsole(&m_page, source, LogMessageType, level, message, callStack, requestIdentifier);
</del><ins>+ InspectorInstrumentation::addMessageToConsole(&m_page, source, MessageType::Log, level, message, callStack, requestIdentifier);
</ins><span class="cx"> else
</span><del>- InspectorInstrumentation::addMessageToConsole(&m_page, source, LogMessageType, level, message, url, lineNumber, columnNumber, state, requestIdentifier);
</del><ins>+ InspectorInstrumentation::addMessageToConsole(&m_page, source, MessageType::Log, level, message, url, lineNumber, columnNumber, state, requestIdentifier);
</ins><span class="cx">
</span><del>- if (source == CSSMessageSource)
</del><ins>+ if (source == MessageSource::CSS)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_page.settings().privateBrowsingEnabled())
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsoleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsole.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsole.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/PageConsole.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #ifndef PageConsole_h
</span><span class="cx"> #define PageConsole_h
</span><span class="cx">
</span><del>-#include "ConsoleTypes.h"
-#include "ScriptCallStack.h"
</del><ins>+#include <inspector/ConsoleTypes.h>
+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> static void printSourceURLAndPosition(const String& sourceURL, unsigned lineNumber, unsigned columnNumber = 0);
</span><span class="cx"> static void printMessageSourceAndLevelPrefix(MessageSource, MessageLevel, bool showAsTrace = false);
</span><span class="cx">
</span><del>- void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> = 0, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
- void addMessage(MessageSource, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>);
</del><ins>+ void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack> = 0, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
+ void addMessage(MessageSource, MessageLevel, const String& message, PassRefPtr<Inspector::ScriptCallStack>);
</ins><span class="cx"> void addMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0, Document* = 0);
</span><span class="cx">
</span><span class="cx"> static void mute();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePointerLockControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PointerLockController.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PointerLockController.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/page/PointerLockController.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> if (target->document().isSandboxed(SandboxPointerLock)) {
</span><span class="cx"> // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
</span><del>- target->document().addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Blocked pointer lock on an element because the element's frame is sandboxed and the 'allow-pointer-lock' permission is not set.");
</del><ins>+ target->document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, ASCIILiteral("Blocked pointer lock on an element because the element's frame is sandboxed and the 'allow-pointer-lock' permission is not set."));
</ins><span class="cx"> enqueueEvent(eventNames().webkitpointerlockerrorEvent, target);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/CrossThreadCopier.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/CrossThreadCopier.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/platform/CrossThreadCopier.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx"> typedef T Type;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- template<typename T> struct IsConvertibleToInteger {
- static const bool value = std::is_integral<T>::value || std::is_convertible<T, long double>::value;
</del><ins>+ template<typename T> struct IsEnumOrConvertibleToInteger {
+ static const bool value = std::is_integral<T>::value || std::is_enum<T>::value || std::is_convertible<T, long double>::value;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T> struct IsThreadSafeRefCountedPointer {
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>- template<bool isConvertibleToInteger, bool isThreadSafeRefCounted, typename T> struct CrossThreadCopierBase;
</del><ins>+ template<bool isEnumOrConvertibleToInteger, bool isThreadSafeRefCounted, typename T> struct CrossThreadCopierBase;
</ins><span class="cx">
</span><span class="cx"> // Integers get passed through without any changes.
</span><span class="cx"> template<typename T> struct CrossThreadCopierBase<true, false, T> : public CrossThreadCopierPassThrough<T> {
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>- struct CrossThreadCopier : public CrossThreadCopierBase<CrossThreadCopierBaseHelper::IsConvertibleToInteger<T>::value, CrossThreadCopierBaseHelper::IsThreadSafeRefCountedPointer<T>::value, T> {
</del><ins>+ struct CrossThreadCopier : public CrossThreadCopierBase<CrossThreadCopierBaseHelper::IsEnumOrConvertibleToInteger<T>::value, CrossThreadCopierBaseHelper::IsThreadSafeRefCountedPointer<T>::value, T> {
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T> struct AllowCrossThreadAccessWrapper {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> const URL& url = cachedImage.url();
</span><span class="cx"> String urlString = url.isNull() ? "''" : url.stringCenterEllipsizedToLength();
</span><del>- document.addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Unsafe attempt to load URL " + urlString + ".");
</del><ins>+ document.addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Unsafe attempt to load URL " + urlString + ".");
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGDocumentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -131,17 +131,17 @@
</span><span class="cx"> static void reportMessage(Document* document, MessageLevel level, const String& message)
</span><span class="cx"> {
</span><span class="cx"> if (document->frame())
</span><del>- document->addConsoleMessage(RenderingMessageSource, level, message);
</del><ins>+ document->addConsoleMessage(MessageSource::Rendering, level, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGDocumentExtensions::reportWarning(const String& message)
</span><span class="cx"> {
</span><del>- reportMessage(m_document, WarningMessageLevel, "Warning: " + message);
</del><ins>+ reportMessage(m_document, MessageLevel::Warning, "Warning: " + message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGDocumentExtensions::reportError(const String& message)
</span><span class="cx"> {
</span><del>- reportMessage(m_document, ErrorMessageLevel, "Error: " + message);
</del><ins>+ reportMessage(m_document, MessageLevel::Error, "Error: " + message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGDocumentExtensions::addPendingResource(const AtomicString& id, Element* element)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> #include "HistoryController.h"
</span><span class="cx"> #include "HistoryItem.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><del>-#include "InspectorConsoleAgent.h"
</del><span class="cx"> #include "InspectorController.h"
</span><span class="cx"> #include "InspectorCounters.h"
</span><span class="cx"> #include "InspectorForwarding.h"
</span><span class="lines">@@ -65,8 +64,8 @@
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "InspectorOverlay.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><ins>+#include "IntRect.h"
</ins><span class="cx"> #include "InternalSettings.h"
</span><del>-#include "IntRect.h"
</del><span class="cx"> #include "Language.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "MallocStatistics.h"
</span><span class="lines">@@ -95,6 +94,7 @@
</span><span class="cx"> #include "TreeScope.h"
</span><span class="cx"> #include "TypeConversions.h"
</span><span class="cx"> #include "ViewportArguments.h"
</span><ins>+#include "WebConsoleAgent.h"
</ins><span class="cx"> #include "WorkerThread.h"
</span><span class="cx"> #include <bytecode/CodeBlock.h>
</span><span class="cx"> #include <inspector/InspectorAgentBase.h>
</span><span class="lines">@@ -1427,9 +1427,11 @@
</span><span class="cx"> InstrumentingAgents* instrumentingAgents = instrumentationForPage(document->page());
</span><span class="cx"> if (!instrumentingAgents)
</span><span class="cx"> return Vector<String>();
</span><del>- InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent();
</del><ins>+
+ InspectorConsoleAgent* consoleAgent = instrumentingAgents->webConsoleAgent();
</ins><span class="cx"> if (!consoleAgent)
</span><span class="cx"> return Vector<String>();
</span><ins>+
</ins><span class="cx"> Vector<unsigned> counts = consoleAgent->consoleMessageArgumentCounts();
</span><span class="cx"> Vector<String> result(counts.size());
</span><span class="cx"> for (size_t i = 0; i < counts.size(); i++)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "PlatformStrategies.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "SecurityOriginHash.h"
</span><span class="cx"> #include "SharedWorker.h"
</span><span class="lines">@@ -56,6 +55,7 @@
</span><span class="cx"> #include "WorkerReportingProxy.h"
</span><span class="cx"> #include "WorkerScriptLoader.h"
</span><span class="cx"> #include "WorkerScriptLoaderClient.h"
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersSharedWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "MessageEvent.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "SharedWorkerThread.h"
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -80,10 +80,10 @@
</span><span class="cx"> return static_cast<SharedWorkerThread*>(Base::thread());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack> callStack)
</del><ins>+void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack> callStack)
</ins><span class="cx"> {
</span><span class="cx"> WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber, columnNumber, callStack);
</span><del>- addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, columnNumber, callStack);
</del><ins>+ addMessageToWorkerConsole(MessageSource::JS, MessageLevel::Error, errorMessage, sourceURL, lineNumber, columnNumber, callStack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersSharedWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SharedWorkerGlobalScope(const String& name, const URL&, const String& userAgent, std::unique_ptr<GroupSettings>, SharedWorkerThread*);
</span><del>- virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) override;
</del><ins>+ virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack>) override;
</ins><span class="cx">
</span><span class="cx"> String m_name;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -21,12 +21,11 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="lines">@@ -39,13 +38,12 @@
</span><span class="cx"> #include "EventException.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "InspectorConsoleInstrumentation.h"
</span><del>-#include "URL.h"
</del><span class="cx"> #include "MessagePort.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "ScheduledAction.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><ins>+#include "URL.h"
</ins><span class="cx"> #include "WorkerInspectorController.h"
</span><span class="cx"> #include "WorkerLocation.h"
</span><span class="cx"> #include "WorkerNavigator.h"
</span><span class="lines">@@ -55,12 +53,15 @@
</span><span class="cx"> #include "WorkerThreadableLoader.h"
</span><span class="cx"> #include "XMLHttpRequestException.h"
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> #include "NotificationCenter.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+using namespace Inspector;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CloseWorkerGlobalScopeTask : public ScriptExecutionContext::Task {
</span><span class="lines">@@ -275,9 +276,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isContextThread());
</span><span class="cx"> if (callStack)
</span><del>- InspectorInstrumentation::addMessageToConsole(this, source, LogMessageType, level, message, callStack, requestIdentifier);
</del><ins>+ InspectorInstrumentation::addMessageToConsole(this, source, MessageType::Log, level, message, callStack, requestIdentifier);
</ins><span class="cx"> else
</span><del>- InspectorInstrumentation::addMessageToConsole(this, source, LogMessageType, level, message, sourceURL, lineNumber, columnNumber, state, requestIdentifier);
</del><ins>+ InspectorInstrumentation::addMessageToConsole(this, source, MessageType::Log, level, message, sourceURL, lineNumber, columnNumber, state, requestIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WorkerGlobalScope::isContextThread() const
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx"> WorkerGlobalScope(const URL&, const String& userAgent, std::unique_ptr<GroupSettings>, WorkerThread*, PassRefPtr<SecurityOrigin> topOrigin);
</span><span class="cx"> void applyContentSecurityPolicyFromString(const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);
</span><span class="cx">
</span><del>- virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) override;
- void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
</del><ins>+ virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack>) override;
+ void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void refScriptExecutionContext() override { ref(); }
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> virtual void refEventTarget() override final { ref(); }
</span><span class="cx"> virtual void derefEventTarget() override final { deref(); }
</span><span class="cx">
</span><del>- virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override;
</del><ins>+ virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override;
</ins><span class="cx">
</span><span class="cx"> virtual EventTarget* errorEventTarget() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -26,14 +26,13 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "WorkerMessagingProxy.h"
</span><span class="cx">
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "CrossThreadTask.h"
</span><ins>+#include "DOMWindow.h"
</ins><span class="cx"> #include "DedicatedWorkerGlobalScope.h"
</span><span class="cx"> #include "DedicatedWorkerThread.h"
</span><del>-#include "DOMWindow.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ErrorEvent.h"
</span><span class="cx"> #include "Event.h"
</span><span class="lines">@@ -43,12 +42,13 @@
</span><span class="cx"> #include "MessageEvent.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "PageGroup.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "Worker.h"
</span><span class="cx"> #include "WorkerDebuggerAgent.h"
</span><span class="cx"> #include "WorkerInspectorController.h"
</span><ins>+#include <inspector/ConsoleTypes.h>
</ins><span class="cx"> #include <inspector/InspectorAgentBase.h>
</span><ins>+#include <inspector/ScriptCallStack.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerReportingProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerReportingProxy.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerReportingProxy.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/workers/WorkerReportingProxy.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef WorkerReportingProxy_h
</span><span class="cx"> #define WorkerReportingProxy_h
</span><span class="cx">
</span><del>-#include "ConsoleTypes.h"
</del><ins>+#include <inspector/ConsoleTypes.h>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "ParsedContentType.h"
</span><span class="cx"> #include "ResourceError.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><del>-#include "ScriptCallStack.h"
</del><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="lines">@@ -160,7 +159,7 @@
</span><span class="cx"> return;
</span><span class="cx"> // FIXME: It's not good to report the bad usage without indicating what source line it came from.
</span><span class="cx"> // We should pass additional parameters so we can tell the console where the mistake occurred.
</span><del>- context->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
</del><ins>+ context->addConsoleMessage(MessageSource::JS, MessageLevel::Error, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<XMLHttpRequest> XMLHttpRequest::create(ScriptExecutionContext& context)
</span><span class="lines">@@ -709,7 +708,7 @@
</span><span class="cx"> void XMLHttpRequest::send(ArrayBuffer* body, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> String consoleMessage("ArrayBuffer is deprecated in XMLHttpRequest.send(). Use ArrayBufferView instead.");
</span><del>- scriptExecutionContext()->addConsoleMessage(JSMessageSource, WarningMessageLevel, consoleMessage);
</del><ins>+ scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, consoleMessage);
</ins><span class="cx">
</span><span class="cx"> HistogramSupport::histogramEnumeration("WebCore.XHR.send.ArrayBufferOrView", XMLHttpRequestSendArrayBuffer, XMLHttpRequestSendArrayBufferOrViewMax);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLTProcessorLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -86,20 +86,20 @@
</span><span class="cx"> MessageLevel level;
</span><span class="cx"> switch (error->level) {
</span><span class="cx"> case XML_ERR_NONE:
</span><del>- level = DebugMessageLevel;
</del><ins>+ level = MessageLevel::Debug;
</ins><span class="cx"> break;
</span><span class="cx"> case XML_ERR_WARNING:
</span><del>- level = WarningMessageLevel;
</del><ins>+ level = MessageLevel::Warning;
</ins><span class="cx"> break;
</span><span class="cx"> case XML_ERR_ERROR:
</span><span class="cx"> case XML_ERR_FATAL:
</span><span class="cx"> default:
</span><del>- level = ErrorMessageLevel;
</del><ins>+ level = MessageLevel::Error;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // xmlError->int2 is the column number of the error or 0 if N/A.
</span><del>- console->addMessage(XMLMessageSource, level, error->message, error->file, error->line, error->int2);
</del><ins>+ console->addMessage(MessageSource::XML, level, error->message, error->file, error->line, error->int2);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: There seems to be no way to control the ctxt pointer for loading here, thus we have globals.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Console support to JSContext Inspection
+ https://bugs.webkit.org/show_bug.cgi?id=127941
+
+ Reviewed by Geoffrey Garen.
+
+ * UserInterface/InspectorJSBackendCommands.js:
+ * UserInterface/InspectorWebBackendCommands.js:
+ ConsoleAgent moved to JavaScript section.
+
</ins><span class="cx"> 2014-02-06 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove display:run-in support.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceInspectorJSBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -6,6 +6,21 @@
</span><span class="cx"> // found in the LICENSE file.
</span><span class="cx">
</span><span class="cx">
</span><ins>+// Console.
+InspectorBackend.registerConsoleDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Console");
+InspectorBackend.registerEnum("Console.ConsoleMessageSource", {XML: "xml", Javascript: "javascript", Network: "network", ConsoleAPI: "console-api", Storage: "storage", Appcache: "appcache", Rendering: "rendering", CSS: "css", Security: "security", Other: "other"});
+InspectorBackend.registerEnum("Console.ConsoleMessageLevel", {Log: "log", Warning: "warning", Error: "error", Debug: "debug"});
+InspectorBackend.registerEnum("Console.ConsoleMessageType", {Log: "log", Dir: "dir", DirXML: "dirxml", Table: "table", Trace: "trace", Clear: "clear", StartGroup: "startGroup", StartGroupCollapsed: "startGroupCollapsed", EndGroup: "endGroup", Assert: "assert", Timing: "timing", Profile: "profile", ProfileEnd: "profileEnd"});
+InspectorBackend.registerEvent("Console.messageAdded", ["message"]);
+InspectorBackend.registerEvent("Console.messageRepeatCountUpdated", ["count"]);
+InspectorBackend.registerEvent("Console.messagesCleared", []);
+InspectorBackend.registerCommand("Console.enable", [], []);
+InspectorBackend.registerCommand("Console.disable", [], []);
+InspectorBackend.registerCommand("Console.clearMessages", [], []);
+InspectorBackend.registerCommand("Console.setMonitoringXHREnabled", [{"name": "enabled", "type": "boolean", "optional": false}], []);
+InspectorBackend.registerCommand("Console.addInspectedNode", [{"name": "nodeId", "type": "number", "optional": false}], []);
+InspectorBackend.registerCommand("Console.addInspectedHeapObject", [{"name": "heapObjectId", "type": "number", "optional": false}], []);
+
</ins><span class="cx"> // Debugger.
</span><span class="cx"> InspectorBackend.registerDebuggerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Debugger");
</span><span class="cx"> InspectorBackend.registerEnum("Debugger.BreakpointActionType", {Log: "log", Evaluate: "evaluate", Sound: "sound", Probe: "probe"});
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceInspectorWebBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -63,21 +63,6 @@
</span><span class="cx"> InspectorBackend.registerCommand("Canvas.getResourceInfo", [{"name": "resourceId", "type": "string", "optional": false}], ["resourceInfo"]);
</span><span class="cx"> InspectorBackend.registerCommand("Canvas.getResourceState", [{"name": "traceLogId", "type": "string", "optional": false}, {"name": "resourceId", "type": "string", "optional": false}], ["resourceState"]);
</span><span class="cx">
</span><del>-// Console.
-InspectorBackend.registerConsoleDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Console");
-InspectorBackend.registerEnum("Console.ConsoleMessageSource", {XML: "xml", Javascript: "javascript", Network: "network", ConsoleAPI: "console-api", Storage: "storage", Appcache: "appcache", Rendering: "rendering", CSS: "css", Security: "security", Other: "other"});
-InspectorBackend.registerEnum("Console.ConsoleMessageLevel", {Log: "log", Warning: "warning", Error: "error", Debug: "debug"});
-InspectorBackend.registerEnum("Console.ConsoleMessageType", {Log: "log", Dir: "dir", DirXML: "dirxml", Table: "table", Trace: "trace", Clear: "clear", StartGroup: "startGroup", StartGroupCollapsed: "startGroupCollapsed", EndGroup: "endGroup", Assert: "assert", Timing: "timing", Profile: "profile", ProfileEnd: "profileEnd"});
-InspectorBackend.registerEvent("Console.messageAdded", ["message"]);
-InspectorBackend.registerEvent("Console.messageRepeatCountUpdated", ["count"]);
-InspectorBackend.registerEvent("Console.messagesCleared", []);
-InspectorBackend.registerCommand("Console.enable", [], []);
-InspectorBackend.registerCommand("Console.disable", [], []);
-InspectorBackend.registerCommand("Console.clearMessages", [], []);
-InspectorBackend.registerCommand("Console.setMonitoringXHREnabled", [{"name": "enabled", "type": "boolean", "optional": false}], []);
-InspectorBackend.registerCommand("Console.addInspectedNode", [{"name": "nodeId", "type": "number", "optional": false}], []);
-InspectorBackend.registerCommand("Console.addInspectedHeapObject", [{"name": "heapObjectId", "type": "number", "optional": false}], []);
-
</del><span class="cx"> // DOM.
</span><span class="cx"> InspectorBackend.registerDOMDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "DOM");
</span><span class="cx"> InspectorBackend.registerEvent("DOM.documentUpdated", []);
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Console support to JSContext Inspection
+ https://bugs.webkit.org/show_bug.cgi?id=127941
+
+ Reviewed by Geoffrey Garen.
+
+ * WebCoreSupport/ChromeClientGtk.cpp:
+ (WebKit::ChromeClient::addMessageToConsole):
+
</ins><span class="cx"> 2014-02-05 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(SVG) guards
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportChromeClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx"> return runJavaScriptConfirm(frame, message);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ChromeClient::addMessageToConsole(WebCore::MessageSource source, WebCore::MessageLevel level, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceId)
</del><ins>+void ChromeClient::addMessageToConsole(Inspector::MessageSource source, Inspector::MessageLevel level, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceId)
</ins><span class="cx"> {
</span><span class="cx"> gboolean retval;
</span><span class="cx"> g_signal_emit_by_name(m_webView, "console-message", message.utf8().data(), lineNumber, sourceId.utf8().data(), &retval);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Console support to JSContext Inspection
+ https://bugs.webkit.org/show_bug.cgi?id=127941
+
+ Reviewed by Geoffrey Garen.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (stringForMessageSource):
+ (stringForMessageLevel):
+ (WebChromeClient::addMessageToConsole):
+
</ins><span class="cx"> 2014-02-05 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Change Page, FocusController to use ViewState
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> * are met:
</span><span class="cx"> *
</span><span class="cx"> * 1. Redistributions of source code must retain the above copyright
</span><del>- * notice, this list of conditions and the following disclaimer.
</del><ins>+ * notice, this list of conditions and the following disclaimer.
</ins><span class="cx"> * 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><del>- * documentation and/or other materials provided with the distribution.
</del><ins>+ * documentation and/or other materials provided with the distribution.
</ins><span class="cx"> * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
</span><span class="cx"> * its contributors may be used to endorse or promote products derived
</span><del>- * from this software without specific prior written permission.
</del><ins>+ * from this software without specific prior written permission.
</ins><span class="cx"> *
</span><span class="cx"> * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</span><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="lines">@@ -35,9 +35,6 @@
</span><span class="cx"> #import <wtf/Platform.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx"> #import <WebCore/Chrome.h>
</span><del>-
-using WebCore::MessageLevel;
-using WebCore::MessageSource;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class WebView;
</span><span class="lines">@@ -82,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setResizable(bool) override;
</span><span class="cx">
</span><del>- virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceURL) override;
</del><ins>+ virtual void addMessageToConsole(Inspector::MessageSource, Inspector::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceURL) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool canRunBeforeUnloadConfirmPanel() override;
</span><span class="cx"> virtual bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame*) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> * are met:
</span><span class="cx"> *
</span><span class="cx"> * 1. Redistributions of source code must retain the above copyright
</span><del>- * notice, this list of conditions and the following disclaimer.
</del><ins>+ * notice, this list of conditions and the following disclaimer.
</ins><span class="cx"> * 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><del>- * documentation and/or other materials provided with the distribution.
</del><ins>+ * documentation and/or other materials provided with the distribution.
</ins><span class="cx"> * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
</span><span class="cx"> * its contributors may be used to endorse or promote products derived
</span><del>- * from this software without specific prior written permission.
</del><ins>+ * from this software without specific prior written permission.
</ins><span class="cx"> *
</span><span class="cx"> * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</span><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="lines">@@ -370,25 +370,25 @@
</span><span class="cx"> inline static NSString *stringForMessageSource(MessageSource source)
</span><span class="cx"> {
</span><span class="cx"> switch (source) {
</span><del>- case XMLMessageSource:
</del><ins>+ case MessageSource::XML:
</ins><span class="cx"> return WebConsoleMessageXMLMessageSource;
</span><del>- case JSMessageSource:
</del><ins>+ case MessageSource::JS:
</ins><span class="cx"> return WebConsoleMessageJSMessageSource;
</span><del>- case NetworkMessageSource:
</del><ins>+ case MessageSource::Network:
</ins><span class="cx"> return WebConsoleMessageNetworkMessageSource;
</span><del>- case ConsoleAPIMessageSource:
</del><ins>+ case MessageSource::ConsoleAPI:
</ins><span class="cx"> return WebConsoleMessageConsoleAPIMessageSource;
</span><del>- case StorageMessageSource:
</del><ins>+ case MessageSource::Storage:
</ins><span class="cx"> return WebConsoleMessageStorageMessageSource;
</span><del>- case AppCacheMessageSource:
</del><ins>+ case MessageSource::AppCache:
</ins><span class="cx"> return WebConsoleMessageAppCacheMessageSource;
</span><del>- case RenderingMessageSource:
</del><ins>+ case MessageSource::Rendering:
</ins><span class="cx"> return WebConsoleMessageRenderingMessageSource;
</span><del>- case CSSMessageSource:
</del><ins>+ case MessageSource::CSS:
</ins><span class="cx"> return WebConsoleMessageCSSMessageSource;
</span><del>- case SecurityMessageSource:
</del><ins>+ case MessageSource::Security:
</ins><span class="cx"> return WebConsoleMessageSecurityMessageSource;
</span><del>- case OtherMessageSource:
</del><ins>+ case MessageSource::Other:
</ins><span class="cx"> return WebConsoleMessageOtherMessageSource;
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -398,20 +398,20 @@
</span><span class="cx"> inline static NSString *stringForMessageLevel(MessageLevel level)
</span><span class="cx"> {
</span><span class="cx"> switch (level) {
</span><del>- case DebugMessageLevel:
</del><ins>+ case MessageLevel::Debug:
</ins><span class="cx"> return WebConsoleMessageDebugMessageLevel;
</span><del>- case LogMessageLevel:
</del><ins>+ case MessageLevel::Log:
</ins><span class="cx"> return WebConsoleMessageLogMessageLevel;
</span><del>- case WarningMessageLevel:
</del><ins>+ case MessageLevel::Warning:
</ins><span class="cx"> return WebConsoleMessageWarningMessageLevel;
</span><del>- case ErrorMessageLevel:
</del><ins>+ case MessageLevel::Error:
</ins><span class="cx"> return WebConsoleMessageErrorMessageLevel;
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return @"";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned int lineNumber, unsigned columnNumber, const String& sourceURL)
</del><ins>+void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceURL)
</ins><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> id delegate = [m_webView UIDelegate];
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> respondsToNewSelector = YES;
</span><span class="cx"> else {
</span><span class="cx"> // The old selector only takes JSMessageSource messages.
</span><del>- if (source != JSMessageSource)
</del><ins>+ if (source != MessageSource::JS)
</ins><span class="cx"> return;
</span><span class="cx"> selector = @selector(webView:addMessageToConsole:);
</span><span class="cx"> if (![delegate respondsToSelector:selector])
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit/win/ChangeLog 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Console support to JSContext Inspection
+ https://bugs.webkit.org/show_bug.cgi?id=127941
+
+ Reviewed by Geoffrey Garen.
+
+ * WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2014-02-06 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Correct IME Regression after r141479
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setResizable(bool);
</span><span class="cx">
</span><del>- virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& url);
</del><ins>+ virtual void addMessageToConsole(Inspector::MessageSource, Inspector::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& url);
</ins><span class="cx">
</span><span class="cx"> virtual bool canRunBeforeUnloadConfirmPanel();
</span><span class="cx"> virtual bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame* frame);
</span></span></pre></div>
<a id="trunkSourceWebKitwinceChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/wince/ChangeLog (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/ChangeLog 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit/wince/ChangeLog 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Console support to JSContext Inspection
+ https://bugs.webkit.org/show_bug.cgi?id=127941
+
+ Reviewed by Geoffrey Garen.
+
+ * WebCoreSupport/ChromeClientWinCE.h:
+
</ins><span class="cx"> 2014-01-30 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> Remove the ACCELERATED_COMPOSITING flag
</span></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportChromeClientWinCEh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setResizable(bool) override;
</span><span class="cx">
</span><del>- virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceID) override;
</del><ins>+ virtual void addMessageToConsole(Inspector::MessageSource, Inspector::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceID) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool canRunBeforeUnloadConfirmPanel() override;
</span><span class="cx"> virtual bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Console support to JSContext Inspection
+ https://bugs.webkit.org/show_bug.cgi?id=127941
+
+ Reviewed by Geoffrey Garen.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2014-02-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add preferences property to WKWebViewConfiguration
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (163567 => 163568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-02-06 23:29:43 UTC (rev 163567)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-02-06 23:45:53 UTC (rev 163568)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setResizable(bool) override;
</span><span class="cx">
</span><del>- virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) override;
</del><ins>+ virtual void addMessageToConsole(Inspector::MessageSource, Inspector::MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool canRunBeforeUnloadConfirmPanel() override;
</span><span class="cx"> virtual bool runBeforeUnloadConfirmPanel(const String& message, WebCore::Frame*) override;
</span></span></pre>
</div>
</div>
</body>
</html>