<!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>[174938] releases/WebKitGTK/webkit-2.6/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/174938">174938</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-21 03:07:39 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173805">r173805</a> - Web Inspector: fix TypeSet hierarchy in TypeTokenView
https://bugs.webkit.org/show_bug.cgi?id=136982
Reviewed by Joseph Pecoraro.
Source/JavaScriptCore:
TypeSet was computing the set of type booleans in the Inspector::Protocol::Runtime::TypeSet
object incorrectly because it was calling TypeSet::doesTypeConformTo(T) which checks if the
type set has only been of type T. It now checks '(m_seenTypes & T) != TypeNothing' to see
if type T is in the set of seen types, but not the entire set itself.
* runtime/TypeSet.cpp:
(JSC::TypeSet::inspectorTypeSet):
Source/WebInspectorUI:
The protocol object representation of TypeSet was being computed
incorrectly in JSC::TypeSet. This patch fixes that problem
and also asserts that the type information that the Web Inspector
receives is not empty.
* UserInterface/Models/TypeSet.js:
(WebInspector.TypeSet):
* UserInterface/Views/TypeTokenView.js:
(WebInspector.TypeTokenView.prototype._displayTypeName):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreruntimeTypeSetcpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/runtime/TypeSet.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebInspectorUIChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebInspectorUIUserInterfaceModelsTypeSetjs">releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/UserInterface/Models/TypeSet.js</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebInspectorUIUserInterfaceViewsTypeTokenViewjs">releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog (174937 => 174938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog 2014-10-21 09:41:07 UTC (rev 174937)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog 2014-10-21 10:07:39 UTC (rev 174938)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-21 Saam Barati <saambarati1@gmail.com>
+
+ Web Inspector: fix TypeSet hierarchy in TypeTokenView
+ https://bugs.webkit.org/show_bug.cgi?id=136982
+
+ Reviewed by Joseph Pecoraro.
+
+ TypeSet was computing the set of type booleans in the Inspector::Protocol::Runtime::TypeSet
+ object incorrectly because it was calling TypeSet::doesTypeConformTo(T) which checks if the
+ type set has only been of type T. It now checks '(m_seenTypes & T) != TypeNothing' to see
+ if type T is in the set of seen types, but not the entire set itself.
+
+ * runtime/TypeSet.cpp:
+ (JSC::TypeSet::inspectorTypeSet):
+
</ins><span class="cx"> 2014-10-20 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> [Follow up] Web Process crash when starting the web inspector after r174025.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreruntimeTypeSetcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/runtime/TypeSet.cpp (174937 => 174938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/runtime/TypeSet.cpp 2014-10-21 09:41:07 UTC (rev 174937)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/runtime/TypeSet.cpp 2014-10-21 10:07:39 UTC (rev 174938)
</span><span class="lines">@@ -269,14 +269,14 @@
</span><span class="cx"> PassRefPtr<Inspector::Protocol::Runtime::TypeSet> TypeSet::inspectorTypeSet() const
</span><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::Runtime::TypeSet::create()
</span><del>- .setIsFunction(doesTypeConformTo(TypeFunction))
- .setIsUndefined(doesTypeConformTo(TypeUndefined))
- .setIsNull(doesTypeConformTo(TypeNull))
- .setIsBoolean(doesTypeConformTo(TypeBoolean))
- .setIsInteger(doesTypeConformTo(TypeMachineInt))
- .setIsNumber(doesTypeConformTo(TypeNumber))
- .setIsString(doesTypeConformTo(TypeString))
- .setIsObject(doesTypeConformTo(TypeObject))
</del><ins>+ .setIsFunction((m_seenTypes & TypeFunction) != TypeNothing)
+ .setIsUndefined((m_seenTypes & TypeUndefined) != TypeNothing)
+ .setIsNull((m_seenTypes & TypeNull) != TypeNothing)
+ .setIsBoolean((m_seenTypes & TypeBoolean) != TypeNothing)
+ .setIsInteger((m_seenTypes & TypeMachineInt) != TypeNothing)
+ .setIsNumber((m_seenTypes & TypeNumber) != TypeNothing)
+ .setIsString((m_seenTypes & TypeString) != TypeNothing)
+ .setIsObject((m_seenTypes & TypeObject) != TypeNothing)
</ins><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/ChangeLog (174937 => 174938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/ChangeLog 2014-10-21 09:41:07 UTC (rev 174937)
+++ releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/ChangeLog 2014-10-21 10:07:39 UTC (rev 174938)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-09-21 Saam Barati <saambarati1@gmail.com>
+
+ Web Inspector: fix TypeSet hierarchy in TypeTokenView
+ https://bugs.webkit.org/show_bug.cgi?id=136982
+
+ Reviewed by Joseph Pecoraro.
+
+ The protocol object representation of TypeSet was being computed
+ incorrectly in JSC::TypeSet. This patch fixes that problem
+ and also asserts that the type information that the Web Inspector
+ receives is not empty.
+
+ * UserInterface/Models/TypeSet.js:
+ (WebInspector.TypeSet):
+ * UserInterface/Views/TypeTokenView.js:
+ (WebInspector.TypeTokenView.prototype._displayTypeName):
+
</ins><span class="cx"> 2014-10-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Test TestWebKitAPI/WebKit2Gtk/TestInspectorServer fails
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebInspectorUIUserInterfaceModelsTypeSetjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/UserInterface/Models/TypeSet.js (174937 => 174938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/UserInterface/Models/TypeSet.js 2014-10-21 09:41:07 UTC (rev 174937)
+++ releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/UserInterface/Models/TypeSet.js 2014-10-21 10:07:39 UTC (rev 174938)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> if (typeSet.isObject)
</span><span class="cx"> bitString |= WebInspector.TypeSet.TypeBit.Object;
</span><span class="cx">
</span><ins>+ console.assert(bitString);
</ins><span class="cx"> this._bitString = bitString;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebInspectorUIUserInterfaceViewsTypeTokenViewjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js (174937 => 174938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js 2014-10-21 09:41:07 UTC (rev 174937)
+++ releases/WebKitGTK/webkit-2.6/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js 2014-10-21 10:07:39 UTC (rev 174938)
</span><span class="lines">@@ -138,11 +138,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _displayTypeName: function()
</del><ins>+ _displayTypeName: function()
</ins><span class="cx"> {
</span><span class="cx"> var typeSet = WebInspector.TypeSet.fromPayload(this._types);
</span><span class="cx">
</span><del>- if (this._types.leastCommonAncestor) {
</del><ins>+ if (this._types.leastCommonAncestor && !(this._types.primitiveTypeNames && this._types.primitiveTypeNames.length)) {
</ins><span class="cx"> if (typeSet.isContainedIn(WebInspector.TypeSet.TypeBit.Object))
</span><span class="cx"> return this._types.leastCommonAncestor;
</span><span class="cx"> if (typeSet.isContainedIn(WebInspector.TypeSet.TypeBit.Object | WebInspector.TypeSet.NullOrUndefinedTypeBits))
</span></span></pre>
</div>
</div>
</body>
</html>