<!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>[163794] trunk/Source</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/163794">163794</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 10:02:59 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSC environment variables should override other mechanisms for setting options
https://bugs.webkit.org/show_bug.cgi?id=128511
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
* runtime/Options.cpp:
(JSC::Options::setOption):
* runtime/Options.h:
Source/WebKit2:
* WebProcess/mac/WebProcessMac.mm:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionscpp">trunk/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessmacWebProcessMacmm">trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163793 => 163794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-10 17:58:18 UTC (rev 163793)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-10 18:02:59 UTC (rev 163794)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-10 Filip Pizlo <fpizlo@apple.com>
+
+ JSC environment variables should override other mechanisms for setting options
+ https://bugs.webkit.org/show_bug.cgi?id=128511
+
+ Reviewed by Geoffrey Garen.
+
+ * runtime/Options.cpp:
+ (JSC::Options::setOption):
+ * runtime/Options.h:
+
</ins><span class="cx"> 2014-02-10 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using String::deprecatedCharacters to call WTF::Collator
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (163793 => 163794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp 2014-02-10 17:58:18 UTC (rev 163793)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp 2014-02-10 18:02:59 UTC (rev 163794)
</span><span class="lines">@@ -77,18 +77,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>-void overrideOptionWithHeuristic(T& variable, const char* name)
</del><ins>+bool overrideOptionWithHeuristic(T& variable, const char* name)
</ins><span class="cx"> {
</span><span class="cx"> #if !OS(WINCE)
</span><span class="cx"> const char* stringValue = getenv(name);
</span><span class="cx"> if (!stringValue)
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> if (parse(stringValue, variable))
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx">
</span><span class="cx"> fprintf(stderr, "WARNING: failed to parse %s=%s\n", name, stringValue);
</span><span class="cx"> #endif
</span><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static unsigned computeNumberOfWorkerThreads(int maxNumberOfWorkerThreads)
</span><span class="lines">@@ -236,7 +237,8 @@
</span><span class="cx"> // The evn var should be the name of the option prefixed with
</span><span class="cx"> // "JSC_".
</span><span class="cx"> #define FOR_EACH_OPTION(type_, name_, defaultValue_) \
</span><del>- overrideOptionWithHeuristic(name_(), "JSC_" #name_);
</del><ins>+ if (overrideOptionWithHeuristic(name_(), "JSC_" #name_)) \
+ s_options[OPT_##name_].didOverride = true;
</ins><span class="cx"> JSC_OPTIONS(FOR_EACH_OPTION)
</span><span class="cx"> #undef FOR_EACH_OPTION
</span><span class="cx">
</span><span class="lines">@@ -273,6 +275,7 @@
</span><span class="cx"> bool success = parse(valueStr, value); \
</span><span class="cx"> if (success) { \
</span><span class="cx"> name_() = value; \
</span><ins>+ s_options[OPT_##name_].didOverride = true; \
</ins><span class="cx"> recomputeDependentOptions(); \
</span><span class="cx"> return true; \
</span><span class="cx"> } \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (163793 => 163794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2014-02-10 17:58:18 UTC (rev 163793)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2014-02-10 18:02:59 UTC (rev 163794)
</span><span class="lines">@@ -268,7 +268,8 @@
</span><span class="cx">
</span><span class="cx"> // Declare accessors for each option:
</span><span class="cx"> #define FOR_EACH_OPTION(type_, name_, defaultValue_) \
</span><del>- ALWAYS_INLINE static type_& name_() { return s_options[OPT_##name_].u.type_##Val; }
</del><ins>+ ALWAYS_INLINE static type_& name_() { return s_options[OPT_##name_].u.type_##Val; } \
+ static bool name_##WasOverridden() { return s_options[OPT_##name_].didOverride; }
</ins><span class="cx">
</span><span class="cx"> JSC_OPTIONS(FOR_EACH_OPTION)
</span><span class="cx"> #undef FOR_EACH_OPTION
</span><span class="lines">@@ -291,6 +292,7 @@
</span><span class="cx"> int32 int32Val;
</span><span class="cx"> OptionRange optionRangeVal;
</span><span class="cx"> } u;
</span><ins>+ bool didOverride;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // For storing constant meta data about each option:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163793 => 163794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-10 17:58:18 UTC (rev 163793)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-10 18:02:59 UTC (rev 163794)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-10 Filip Pizlo <fpizlo@apple.com>
+
+ JSC environment variables should override other mechanisms for setting options
+ https://bugs.webkit.org/show_bug.cgi?id=128511
+
+ Reviewed by Geoffrey Garen.
+
+ * WebProcess/mac/WebProcessMac.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2014-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add API to create a webview related to another one
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessmacWebProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (163793 => 163794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2014-02-10 17:58:18 UTC (rev 163793)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2014-02-10 18:02:59 UTC (rev 163794)
</span><span class="lines">@@ -173,7 +173,8 @@
</span><span class="cx"> m_shouldForceScreenFontSubstitution = parameters.shouldForceScreenFontSubstitution;
</span><span class="cx"> Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
</span><span class="cx">
</span><del>- JSC::Options::useFTLJIT() = parameters.shouldEnableFTL;
</del><ins>+ if (!JSC::Options::useFTLJITWasOverridden())
+ JSC::Options::useFTLJIT() = parameters.shouldEnableFTL;
</ins><span class="cx">
</span><span class="cx"> m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>