<!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>[199276] 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/199276">199276</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-09 13:54:57 -0700 (Sat, 09 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/199242">r199242</a>.
https://bugs.webkit.org/show_bug.cgi?id=156442
Caused many many leaks (Requested by ap on #webkit).
Reverted changeset:
"Web Inspector: get rid of InspectorBasicValue and
InspectorString subclasses"
https://bugs.webkit.org/show_bug.cgi?id=156407
http://trac.webkit.org/changeset/199242</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebindingsScriptValuecpp">trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptBasecpp">trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorValuescpp">trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorValuesh">trunk/Source/JavaScriptCore/inspector/InspectorValues.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayEncodedValuecpp">trunk/Source/JavaScriptCore/replay/EncodedValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayEncodedValueh">trunk/Source/JavaScriptCore/replay/EncodedValue.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp">trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199275 => 199276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-09 20:41:04 UTC (rev 199275)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-09 20:54:57 UTC (rev 199276)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-09 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r199242.
+ https://bugs.webkit.org/show_bug.cgi?id=156442
+
+ Caused many many leaks (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "Web Inspector: get rid of InspectorBasicValue and
+ InspectorString subclasses"
+ https://bugs.webkit.org/show_bug.cgi?id=156407
+ http://trac.webkit.org/changeset/199242
+
</ins><span class="cx"> 2016-04-09 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Debug JSC test failure: stress/multi-put-by-offset-reallocation-butterfly-cse.js.ftl-no-cjit-small-pool
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp (199275 => 199276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2016-04-09 20:41:04 UTC (rev 199275)
+++ trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2016-04-09 20:54:57 UTC (rev 199276)
</span><span class="lines">@@ -112,13 +112,13 @@
</span><span class="cx"> if (value.isNull() || value.isUndefined())
</span><span class="cx"> return InspectorValue::null();
</span><span class="cx"> if (value.isBoolean())
</span><del>- return InspectorValue::create(value.asBoolean());
</del><ins>+ return InspectorBasicValue::create(value.asBoolean());
</ins><span class="cx"> if (value.isNumber() && value.isDouble())
</span><del>- return InspectorValue::create(value.asNumber());
</del><ins>+ return InspectorBasicValue::create(value.asNumber());
</ins><span class="cx"> if (value.isNumber() && value.isMachineInt())
</span><del>- return InspectorValue::create(static_cast<int>(value.asMachineInt()));
</del><ins>+ return InspectorBasicValue::create(static_cast<int>(value.asMachineInt()));
</ins><span class="cx"> if (value.isString())
</span><del>- return InspectorValue::create(value.getString(scriptState));
</del><ins>+ return InspectorString::create(value.getString(scriptState));
</ins><span class="cx">
</span><span class="cx"> if (value.isObject()) {
</span><span class="cx"> if (isJSArray(value)) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp (199275 => 199276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2016-04-09 20:41:04 UTC (rev 199275)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2016-04-09 20:54:57 UTC (rev 199276)
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx"> if (!hadException) {
</span><span class="cx"> *result = resultValue.toInspectorValue(m_injectedScriptObject.scriptState());
</span><span class="cx"> if (!*result)
</span><del>- *result = InspectorValue::create(String::format("Object has too long reference chain (must not be longer than %d)", InspectorValue::maxDepth));
</del><ins>+ *result = InspectorString::create(String::format("Object has too long reference chain (must not be longer than %d)", InspectorValue::maxDepth));
</ins><span class="cx"> } else
</span><del>- *result = InspectorValue::create("Exception while making a call.");
</del><ins>+ *result = InspectorString::create("Exception while making a call.");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedScriptBase::makeEvalCall(ErrorString& errorString, Deprecated::ScriptFunctionCall& function, RefPtr<Protocol::Runtime::RemoteObject>* objectResult, Protocol::OptOutput<bool>* wasThrown, Protocol::OptOutput<int>* savedResultIndex)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp (199275 => 199276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp 2016-04-09 20:41:04 UTC (rev 199275)
+++ trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp 2016-04-09 20:54:57 UTC (rev 199276)
</span><span class="lines">@@ -363,17 +363,17 @@
</span><span class="cx"> result = InspectorValue::null();
</span><span class="cx"> break;
</span><span class="cx"> case BOOL_TRUE:
</span><del>- result = InspectorValue::create(true);
</del><ins>+ result = InspectorBasicValue::create(true);
</ins><span class="cx"> break;
</span><span class="cx"> case BOOL_FALSE:
</span><del>- result = InspectorValue::create(false);
</del><ins>+ result = InspectorBasicValue::create(false);
</ins><span class="cx"> break;
</span><span class="cx"> case NUMBER: {
</span><span class="cx"> bool ok;
</span><span class="cx"> double value = charactersToDouble(tokenStart, tokenEnd - tokenStart, &ok);
</span><span class="cx"> if (!ok)
</span><span class="cx"> return nullptr;
</span><del>- result = InspectorValue::create(value);
</del><ins>+ result = InspectorBasicValue::create(value);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case STRING: {
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> bool ok = decodeString(tokenStart + 1, tokenEnd - 1, value);
</span><span class="cx"> if (!ok)
</span><span class="cx"> return nullptr;
</span><del>- result = InspectorValue::create(value);
</del><ins>+ result = InspectorString::create(value);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ARRAY_BEGIN: {
</span><span class="lines">@@ -498,39 +498,59 @@
</span><span class="cx">
</span><span class="cx"> } // anonymous namespace
</span><span class="cx">
</span><del>-Ref<InspectorValue> InspectorValue::null()
</del><ins>+bool InspectorValue::asBoolean(bool&) const
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorValue);
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorValue> InspectorValue::create(bool value)
</del><ins>+bool InspectorValue::asDouble(double&) const
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorValue(value));
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorValue> InspectorValue::create(int value)
</del><ins>+bool InspectorValue::asDouble(float&) const
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorValue(value));
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorValue> InspectorValue::create(double value)
</del><ins>+bool InspectorValue::asInteger(int&) const
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorValue(value));
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorValue> InspectorValue::create(const String& value)
</del><ins>+bool InspectorValue::asInteger(unsigned&) const
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorValue(value));
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorValue> InspectorValue::create(const char* value)
</del><ins>+bool InspectorValue::asInteger(long&) const
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorValue(value));
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asValue(RefPtr<Inspector::InspectorValue> & value)
</del><ins>+bool InspectorValue::asInteger(long long&) const
</ins><span class="cx"> {
</span><del>- value = this;
</del><ins>+ return false;
+}
+
+bool InspectorValue::asInteger(unsigned long&) const
+{
+ return false;
+}
+
+bool InspectorValue::asInteger(unsigned long long&) const
+{
+ return false;
+}
+
+bool InspectorValue::asString(String&) const
+{
+ return false;
+}
+
+bool InspectorValue::asValue(RefPtr<InspectorValue>& output)
+{
+ output = this;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -567,8 +587,15 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asBoolean(bool& output) const
</del><ins>+void InspectorValue::writeJSON(StringBuilder& output) const
</ins><span class="cx"> {
</span><ins>+ ASSERT(m_type == Type::Null);
+
+ output.appendLiteral("null");
+}
+
+bool InspectorBasicValue::asBoolean(bool& output) const
+{
</ins><span class="cx"> if (type() != Type::Boolean)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -576,7 +603,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asDouble(double& output) const
</del><ins>+bool InspectorBasicValue::asDouble(double& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Double)
</span><span class="cx"> return false;
</span><span class="lines">@@ -585,7 +612,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asDouble(float& output) const
</del><ins>+bool InspectorBasicValue::asDouble(float& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Double)
</span><span class="cx"> return false;
</span><span class="lines">@@ -594,7 +621,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(int& output) const
</del><ins>+bool InspectorBasicValue::asInteger(int& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><span class="lines">@@ -603,7 +630,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(unsigned& output) const
</del><ins>+bool InspectorBasicValue::asInteger(unsigned& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><span class="lines">@@ -612,7 +639,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(long& output) const
</del><ins>+bool InspectorBasicValue::asInteger(long& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><span class="lines">@@ -621,7 +648,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(long long& output) const
</del><ins>+bool InspectorBasicValue::asInteger(long long& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><span class="lines">@@ -630,7 +657,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(unsigned long& output) const
</del><ins>+bool InspectorBasicValue::asInteger(unsigned long& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><span class="lines">@@ -639,7 +666,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(unsigned long long& output) const
</del><ins>+bool InspectorBasicValue::asInteger(unsigned long long& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><span class="lines">@@ -648,32 +675,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asString(String& output) const
</del><ins>+void InspectorBasicValue::writeJSON(StringBuilder& output) const
</ins><span class="cx"> {
</span><del>- if (type() != Type::String)
- return false;
</del><ins>+ ASSERT(type() == Type::Boolean || type() == Type::Double || type() == Type::Integer);
</ins><span class="cx">
</span><del>- output = m_stringValue;
- return true;
-}
-
-void InspectorValue::writeJSON(StringBuilder& output) const
-{
- switch (m_type) {
- case Type::Null:
- output.appendLiteral("null");
- break;
- case Type::Boolean:
</del><ins>+ if (type() == Type::Boolean) {
</ins><span class="cx"> if (m_booleanValue)
</span><span class="cx"> output.appendLiteral("true");
</span><span class="cx"> else
</span><span class="cx"> output.appendLiteral("false");
</span><del>- break;
- case Type::String:
- doubleQuoteString(m_stringValue, output);
- break;
- case Type::Double:
- case Type::Integer: {
</del><ins>+ } else if (type() == Type::Double || type() == Type::Integer) {
</ins><span class="cx"> NumberToLStringBuffer buffer;
</span><span class="cx"> if (!std::isfinite(m_doubleValue)) {
</span><span class="cx"> output.appendLiteral("null");
</span><span class="lines">@@ -692,13 +703,21 @@
</span><span class="cx"> } else
</span><span class="cx"> length = decimal.toStringDecimal(buffer, WTF::NumberToStringBufferLength);
</span><span class="cx"> output.append(buffer, length);
</span><del>- break;
</del><span class="cx"> }
</span><del>- default:
- ASSERT_NOT_REACHED();
- }
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+bool InspectorString::asString(String& output) const
+{
+ output = m_stringValue;
+ return true;
+}
+
+void InspectorString::writeJSON(StringBuilder& output) const
+{
+ ASSERT(type() == Type::String);
+ doubleQuoteString(m_stringValue, output);
+}
+
</ins><span class="cx"> InspectorObjectBase::~InspectorObjectBase()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -786,7 +805,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorObjectBase::InspectorObjectBase()
</span><del>- : Inspector::InspectorValue(Type::Object)
</del><ins>+ : InspectorValue(Type::Object)
</ins><span class="cx"> , m_data()
</span><span class="cx"> , m_order()
</span><span class="cx"> {
</span><span class="lines">@@ -836,4 +855,34 @@
</span><span class="cx"> return adoptRef(*new InspectorArray);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Ref<InspectorValue> InspectorValue::null()
+{
+ return adoptRef(*new InspectorValue);
+}
+
+Ref<InspectorString> InspectorString::create(const String& value)
+{
+ return adoptRef(*new InspectorString(value));
+}
+
+Ref<InspectorString> InspectorString::create(const char* value)
+{
+ return adoptRef(*new InspectorString(value));
+}
+
+Ref<InspectorBasicValue> InspectorBasicValue::create(bool value)
+{
+ return adoptRef(*new InspectorBasicValue(value));
+}
+
+Ref<InspectorBasicValue> InspectorBasicValue::create(int value)
+{
+ return adoptRef(*new InspectorBasicValue(value));
+}
+
+Ref<InspectorBasicValue> InspectorBasicValue::create(double value)
+{
+ return adoptRef(*new InspectorBasicValue(value));
+}
+
</ins><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorValues.h (199275 => 199276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorValues.h 2016-04-09 20:41:04 UTC (rev 199275)
+++ trunk/Source/JavaScriptCore/inspector/InspectorValues.h 2016-04-09 20:54:57 UTC (rev 199276)
</span><span class="lines">@@ -51,14 +51,11 @@
</span><span class="cx"> public:
</span><span class="cx"> static const int maxDepth = 1000;
</span><span class="cx">
</span><ins>+ InspectorValue()
+ : m_type(Type::Null) { }
</ins><span class="cx"> virtual ~InspectorValue() { }
</span><span class="cx">
</span><span class="cx"> static Ref<InspectorValue> null();
</span><del>- static Ref<InspectorValue> create(bool);
- static Ref<InspectorValue> create(int);
- static Ref<InspectorValue> create(double);
- static Ref<InspectorValue> create(const String&);
- static Ref<InspectorValue> create(const char*);
</del><span class="cx">
</span><span class="cx"> enum class Type {
</span><span class="cx"> Null = 0,
</span><span class="lines">@@ -67,24 +64,24 @@
</span><span class="cx"> Integer,
</span><span class="cx"> String,
</span><span class="cx"> Object,
</span><del>- Array,
</del><ins>+ Array
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Type type() const { return m_type; }
</span><ins>+
</ins><span class="cx"> bool isNull() const { return m_type == Type::Null; }
</span><span class="cx">
</span><del>- bool asBoolean(bool&) const;
- bool asInteger(int&) const;
- bool asInteger(unsigned&) const;
- bool asInteger(long&) const;
- bool asInteger(long long&) const;
- bool asInteger(unsigned long&) const;
- bool asInteger(unsigned long long&) const;
- bool asDouble(double&) const;
- bool asDouble(float&) const;
- bool asString(String&) const;
- bool asValue(RefPtr<InspectorValue>&);
-
</del><ins>+ virtual bool asBoolean(bool&) const;
+ virtual bool asInteger(int&) const;
+ virtual bool asInteger(unsigned&) const;
+ virtual bool asInteger(long&) const;
+ virtual bool asInteger(long long&) const;
+ virtual bool asInteger(unsigned long&) const;
+ virtual bool asInteger(unsigned long long&) const;
+ virtual bool asDouble(double&) const;
+ virtual bool asDouble(float&) const;
+ virtual bool asString(String&) const;
+ virtual bool asValue(RefPtr<InspectorValue>&);
</ins><span class="cx"> virtual bool asObject(RefPtr<InspectorObject>&);
</span><span class="cx"> virtual bool asArray(RefPtr<InspectorArray>&);
</span><span class="cx">
</span><span class="lines">@@ -94,41 +91,73 @@
</span><span class="cx"> virtual void writeJSON(StringBuilder& output) const;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- InspectorValue()
- : m_type(Type::Null) { }
</del><ins>+ explicit InspectorValue(Type type) : m_type(type) { }
</ins><span class="cx">
</span><del>- explicit InspectorValue(Type type)
- : m_type(type) { }
</del><ins>+private:
+ Type m_type;
+};
</ins><span class="cx">
</span><del>- explicit InspectorValue(bool value)
- : m_type(Type::Boolean)
</del><ins>+class JS_EXPORT_PRIVATE InspectorBasicValue : public InspectorValue {
+public:
+
+ static Ref<InspectorBasicValue> create(bool);
+ static Ref<InspectorBasicValue> create(int);
+ static Ref<InspectorBasicValue> create(double);
+
+ bool asBoolean(bool&) const override;
+ // Numbers from the frontend are always parsed as doubles, so we allow
+ // clients to convert to integral values with this function.
+ bool asInteger(int&) const override;
+ bool asInteger(unsigned&) const override;
+ bool asInteger(long&) const override;
+ bool asInteger(long long&) const override;
+ bool asInteger(unsigned long&) const override;
+ bool asInteger(unsigned long long&) const override;
+ bool asDouble(double&) const override;
+ bool asDouble(float&) const override;
+
+ void writeJSON(StringBuilder& output) const override;
+
+private:
+ explicit InspectorBasicValue(bool value)
+ : InspectorValue(Type::Boolean)
</ins><span class="cx"> , m_booleanValue(value) { }
</span><span class="cx">
</span><del>- explicit InspectorValue(int value)
- : m_type(Type::Integer)
</del><ins>+ explicit InspectorBasicValue(int value)
+ : InspectorValue(Type::Integer)
</ins><span class="cx"> , m_doubleValue(static_cast<double>(value)) { }
</span><span class="cx">
</span><del>- explicit InspectorValue(double value)
- : m_type(Type::Double)
</del><ins>+ explicit InspectorBasicValue(double value)
+ : InspectorValue(Type::Double)
</ins><span class="cx"> , m_doubleValue(value) { }
</span><span class="cx">
</span><del>- explicit InspectorValue(const String& value)
- : m_type(Type::String)
- , m_stringValue(value) { }
-
- explicit InspectorValue(const char* value)
- : m_type(Type::String)
- , m_stringValue(value) { }
-
-private:
- Type m_type { Type::Null };
</del><span class="cx"> union {
</span><span class="cx"> bool m_booleanValue;
</span><span class="cx"> double m_doubleValue;
</span><del>- String m_stringValue;
</del><span class="cx"> };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class JS_EXPORT_PRIVATE InspectorString : public InspectorValue {
+public:
+ static Ref<InspectorString> create(const String&);
+ static Ref<InspectorString> create(const char*);
+
+ bool asString(String& output) const override;
+
+ void writeJSON(StringBuilder& output) const override;
+
+private:
+ explicit InspectorString(const String& value)
+ : InspectorValue(Type::String)
+ , m_stringValue(value) { }
+
+ explicit InspectorString(const char* value)
+ : InspectorValue(Type::String)
+ , m_stringValue(value) { }
+
+ String m_stringValue;
+};
+
</ins><span class="cx"> class JS_EXPORT_PRIVATE InspectorObjectBase : public InspectorValue {
</span><span class="cx"> private:
</span><span class="cx"> typedef HashMap<String, RefPtr<InspectorValue>> Dictionary;
</span><span class="lines">@@ -300,22 +329,22 @@
</span><span class="cx">
</span><span class="cx"> inline void InspectorObjectBase::setBoolean(const String& name, bool value)
</span><span class="cx"> {
</span><del>- setValue(name, InspectorValue::create(value));
</del><ins>+ setValue(name, InspectorBasicValue::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorObjectBase::setInteger(const String& name, int value)
</span><span class="cx"> {
</span><del>- setValue(name, InspectorValue::create(value));
</del><ins>+ setValue(name, InspectorBasicValue::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorObjectBase::setDouble(const String& name, double value)
</span><span class="cx"> {
</span><del>- setValue(name, InspectorValue::create(value));
</del><ins>+ setValue(name, InspectorBasicValue::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorObjectBase::setString(const String& name, const String& value)
</span><span class="cx"> {
</span><del>- setValue(name, InspectorValue::create(value));
</del><ins>+ setValue(name, InspectorString::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorObjectBase::setValue(const String& name, RefPtr<InspectorValue>&& value)
</span><span class="lines">@@ -341,22 +370,22 @@
</span><span class="cx">
</span><span class="cx"> inline void InspectorArrayBase::pushBoolean(bool value)
</span><span class="cx"> {
</span><del>- m_data.append(InspectorValue::create(value));
</del><ins>+ m_data.append(InspectorBasicValue::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorArrayBase::pushInteger(int value)
</span><span class="cx"> {
</span><del>- m_data.append(InspectorValue::create(value));
</del><ins>+ m_data.append(InspectorBasicValue::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorArrayBase::pushDouble(double value)
</span><span class="cx"> {
</span><del>- m_data.append(InspectorValue::create(value));
</del><ins>+ m_data.append(InspectorBasicValue::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorArrayBase::pushString(const String& value)
</span><span class="cx"> {
</span><del>- m_data.append(InspectorValue::create(value));
</del><ins>+ m_data.append(InspectorString::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorArrayBase::pushValue(RefPtr<InspectorValue>&& value)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayEncodedValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/EncodedValue.cpp (199275 => 199276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/EncodedValue.cpp 2016-04-09 20:41:04 UTC (rev 199275)
+++ trunk/Source/JavaScriptCore/replay/EncodedValue.cpp 2016-04-09 20:54:57 UTC (rev 199276)
</span><span class="lines">@@ -67,37 +67,37 @@
</span><span class="cx">
</span><span class="cx"> template<> EncodedValue ScalarEncodingTraits<bool>::encodeValue(const bool& value)
</span><span class="cx"> {
</span><del>- return EncodedValue(InspectorValue::create(value));
</del><ins>+ return EncodedValue(InspectorBasicValue::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> EncodedValue ScalarEncodingTraits<double>::encodeValue(const double& value)
</span><span class="cx"> {
</span><del>- return EncodedValue(InspectorValue::create(value));
</del><ins>+ return EncodedValue(InspectorBasicValue::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> EncodedValue ScalarEncodingTraits<float>::encodeValue(const float& value)
</span><span class="cx"> {
</span><del>- return EncodedValue(InspectorValue::create((double)value));
</del><ins>+ return EncodedValue(InspectorBasicValue::create((double)value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> EncodedValue ScalarEncodingTraits<int32_t>::encodeValue(const int32_t& value)
</span><span class="cx"> {
</span><del>- return EncodedValue(InspectorValue::create((double)value));
</del><ins>+ return EncodedValue(InspectorBasicValue::create((double)value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> EncodedValue ScalarEncodingTraits<int64_t>::encodeValue(const int64_t& value)
</span><span class="cx"> {
</span><del>- return EncodedValue(InspectorValue::create((double)value));
</del><ins>+ return EncodedValue(InspectorBasicValue::create((double)value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> EncodedValue ScalarEncodingTraits<uint32_t>::encodeValue(const uint32_t& value)
</span><span class="cx"> {
</span><del>- return EncodedValue(InspectorValue::create((double)value));
</del><ins>+ return EncodedValue(InspectorBasicValue::create((double)value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> EncodedValue ScalarEncodingTraits<uint64_t>::encodeValue(const uint64_t& value)
</span><span class="cx"> {
</span><del>- return EncodedValue(InspectorValue::create((double)value));
</del><ins>+ return EncodedValue(InspectorBasicValue::create((double)value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> bool EncodedValue::convertTo<bool>()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayEncodedValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/EncodedValue.h (199275 => 199276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/EncodedValue.h 2016-04-09 20:41:04 UTC (rev 199275)
+++ trunk/Source/JavaScriptCore/replay/EncodedValue.h 2016-04-09 20:54:57 UTC (rev 199276)
</span><span class="lines">@@ -59,12 +59,12 @@
</span><span class="cx">
</span><span class="cx"> static EncodedValue createString(const String& value)
</span><span class="cx"> {
</span><del>- return EncodedValue(Inspector::InspectorValue::create(value));
</del><ins>+ return EncodedValue(Inspector::InspectorString::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static EncodedValue createString(const char* value)
</span><span class="cx"> {
</span><del>- return EncodedValue(Inspector::InspectorValue::create(value));
</del><ins>+ return EncodedValue(Inspector::InspectorString::create(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199275 => 199276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-09 20:41:04 UTC (rev 199275)
+++ trunk/Source/WebCore/ChangeLog 2016-04-09 20:54:57 UTC (rev 199276)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-04-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r199242.
+ https://bugs.webkit.org/show_bug.cgi?id=156442
+
+ Caused many many leaks (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "Web Inspector: get rid of InspectorBasicValue and
+ InspectorString subclasses"
+ https://bugs.webkit.org/show_bug.cgi?id=156407
+ http://trac.webkit.org/changeset/199242
+
+2016-04-09 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r199268.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156440
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp (199275 => 199276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2016-04-09 20:41:04 UTC (rev 199275)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2016-04-09 20:54:57 UTC (rev 199276)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> for (auto& value : rowList->values()) {
</span><span class="cx"> RefPtr<InspectorValue> inspectorValue;
</span><span class="cx"> switch (value.type()) {
</span><del>- case SQLValue::StringValue: inspectorValue = InspectorValue::create(value.string()); break;
- case SQLValue::NumberValue: inspectorValue = InspectorValue::create(value.number()); break;
</del><ins>+ case SQLValue::StringValue: inspectorValue = InspectorString::create(value.string()); break;
+ case SQLValue::NumberValue: inspectorValue = InspectorBasicValue::create(value.number()); break;
</ins><span class="cx"> case SQLValue::NullValue: inspectorValue = InspectorValue::null(); break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>