<!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>[182826] trunk/Source/JavaScriptCore</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/182826">182826</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-14 17:47:25 -0700 (Tue, 14 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace JavaScriptCoreOutputConsoleMessagesToSystemConsole default with an SPI
https://bugs.webkit.org/show_bug.cgi?id=143691
Reviewed by Geoffrey Garen.
* API/JSRemoteInspector.h:
* API/JSRemoteInspector.cpp:
(JSRemoteInspectorSetLogToSystemConsole):
Add SPI to enable/disable logging to the system console.
This only affects JSContext `console` logs and warnings.
* inspector/JSGlobalObjectConsoleClient.h:
* inspector/JSGlobalObjectConsoleClient.cpp:
(Inspector::JSGlobalObjectConsoleClient::logToSystemConsole):
(Inspector::JSGlobalObjectConsoleClient::setLogToSystemConsole):
(Inspector::JSGlobalObjectConsoleClient::messageWithTypeAndLevel):
(Inspector::JSGlobalObjectConsoleClient::initializeLogToSystemConsole): Deleted.
Simplify access to the setting now that it doesn't need to
initialize its value from preferences.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSRemoteInspectorcpp">trunk/Source/JavaScriptCore/API/JSRemoteInspector.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSRemoteInspectorh">trunk/Source/JavaScriptCore/API/JSRemoteInspector.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClientcpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClienth">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSRemoteInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSRemoteInspector.cpp (182825 => 182826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSRemoteInspector.cpp 2015-04-15 00:27:26 UTC (rev 182825)
+++ trunk/Source/JavaScriptCore/API/JSRemoteInspector.cpp 2015-04-15 00:47:25 UTC (rev 182826)
</span><span class="lines">@@ -26,11 +26,14 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSRemoteInspector.h"
</span><span class="cx">
</span><ins>+#include "JSGlobalObjectConsoleClient.h"
+
</ins><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> #include "RemoteInspector.h"
</span><del>-using namespace Inspector;
</del><span class="cx"> #endif
</span><span class="cx">
</span><ins>+using namespace Inspector;
+
</ins><span class="cx"> void JSRemoteInspectorDisableAutoStart(void)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="lines">@@ -56,3 +59,8 @@
</span><span class="cx"> UNUSED_PARAM(auditLength);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+void JSRemoteInspectorSetLogToSystemConsole(bool logToSystemConsole)
+{
+ JSGlobalObjectConsoleClient::setLogToSystemConsole(logToSystemConsole);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSRemoteInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSRemoteInspector.h (182825 => 182826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSRemoteInspector.h 2015-04-15 00:27:26 UTC (rev 182825)
+++ trunk/Source/JavaScriptCore/API/JSRemoteInspector.h 2015-04-15 00:47:25 UTC (rev 182826)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx"> JS_EXPORT void JSRemoteInspectorStart(void) CF_AVAILABLE(10_11, 9_0);
</span><span class="cx"> JS_EXPORT void JSRemoteInspectorSetParentProcessInformation(pid_t, const uint8_t* auditData, size_t auditLength) CF_AVAILABLE(10_11, 9_0);
</span><span class="cx">
</span><ins>+JS_EXPORT void JSRemoteInspectorSetLogToSystemConsole(bool) CF_AVAILABLE(10_11, 9_0);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (182825 => 182826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-15 00:27:26 UTC (rev 182825)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-15 00:47:25 UTC (rev 182826)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-04-14 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Replace JavaScriptCoreOutputConsoleMessagesToSystemConsole default with an SPI
+ https://bugs.webkit.org/show_bug.cgi?id=143691
+
+ Reviewed by Geoffrey Garen.
+
+ * API/JSRemoteInspector.h:
+ * API/JSRemoteInspector.cpp:
+ (JSRemoteInspectorSetLogToSystemConsole):
+ Add SPI to enable/disable logging to the system console.
+ This only affects JSContext `console` logs and warnings.
+
+ * inspector/JSGlobalObjectConsoleClient.h:
+ * inspector/JSGlobalObjectConsoleClient.cpp:
+ (Inspector::JSGlobalObjectConsoleClient::logToSystemConsole):
+ (Inspector::JSGlobalObjectConsoleClient::setLogToSystemConsole):
+ (Inspector::JSGlobalObjectConsoleClient::messageWithTypeAndLevel):
+ (Inspector::JSGlobalObjectConsoleClient::initializeLogToSystemConsole): Deleted.
+ Simplify access to the setting now that it doesn't need to
+ initialize its value from preferences.
+
+2015-04-14 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Auto-attach fails after r179562, initialization too late after dispatch
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143682
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp (182825 => 182826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp 2015-04-15 00:27:26 UTC (rev 182825)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp 2015-04-15 00:47:25 UTC (rev 182826)
</span><span class="lines">@@ -32,51 +32,26 @@
</span><span class="cx"> #include "ScriptCallStack.h"
</span><span class="cx"> #include "ScriptCallStackFactory.h"
</span><span class="cx">
</span><del>-#if USE(CF)
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
</del><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+#if !LOG_DISABLED
+static bool sLogToSystemConsole = true;
+#else
</ins><span class="cx"> static bool sLogToSystemConsole = false;
</span><del>-static bool sSetLogToSystemConsole = false;
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> bool JSGlobalObjectConsoleClient::logToSystemConsole()
</span><span class="cx"> {
</span><del>- if (!sSetLogToSystemConsole) {
- static std::once_flag initializeLogging;
- std::call_once(initializeLogging, []{
- JSGlobalObjectConsoleClient::initializeLogToSystemConsole();
- });
- }
</del><span class="cx"> return sLogToSystemConsole;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectConsoleClient::setLogToSystemConsole(bool shouldLog)
</span><span class="cx"> {
</span><del>- sSetLogToSystemConsole = true;
</del><span class="cx"> sLogToSystemConsole = shouldLog;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectConsoleClient::initializeLogToSystemConsole()
-{
- // If setLogToSystemConsole() was called, no need to query the default value.
- if (sSetLogToSystemConsole)
- return;
-
-#if !LOG_DISABLED
- sLogToSystemConsole = true;
-#elif USE(CF)
- Boolean keyExistsAndHasValidFormat = false;
- Boolean preference = CFPreferencesGetAppBooleanValue(CFSTR("JavaScriptCoreOutputConsoleMessagesToSystemConsole"), kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
- if (keyExistsAndHasValidFormat)
- sLogToSystemConsole = preference;
-#endif
- sSetLogToSystemConsole = true;
-}
-
</del><span class="cx"> JSGlobalObjectConsoleClient::JSGlobalObjectConsoleClient(InspectorConsoleAgent* consoleAgent)
</span><span class="cx"> : ConsoleClient()
</span><span class="cx"> , m_consoleAgent(consoleAgent)
</span><span class="lines">@@ -85,7 +60,6 @@
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</span><span class="cx"> {
</span><del>-
</del><span class="cx"> if (JSGlobalObjectConsoleClient::logToSystemConsole())
</span><span class="cx"> ConsoleClient::printConsoleMessageWithArguments(MessageSource::ConsoleAPI, type, level, exec, arguments.copyRef());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h (182825 => 182826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h 2015-04-15 00:27:26 UTC (rev 182825)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h 2015-04-15 00:47:25 UTC (rev 182826)
</span><span class="lines">@@ -51,8 +51,6 @@
</span><span class="cx"> virtual void timeStamp(JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static void initializeLogToSystemConsole();
-
</del><span class="cx"> void warnUnimplemented(const String& method);
</span><span class="cx"> void internalAddMessage(MessageType, MessageLevel, JSC::ExecState*, RefPtr<ScriptArguments>&&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>