<!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>[179053] 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/179053">179053</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-23 18:34:18 -0800 (Fri, 23 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Rename InjectedScriptHost::type to subtype
https://bugs.webkit.org/show_bug.cgi?id=140841
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-01-23
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
We were using this to set the subtype of an "object" type RemoteObject
so we should clean up the name and call it subtype.
* inspector/InjectedScriptHost.h:
* inspector/InjectedScriptSource.js:
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::subtype):
(Inspector::JSInjectedScriptHost::type): Deleted.
* inspector/JSInjectedScriptHost.h:
* inspector/JSInjectedScriptHostPrototype.cpp:
(Inspector::JSInjectedScriptHostPrototype::finishCreation):
(Inspector::jsInjectedScriptHostPrototypeFunctionSubtype):
(Inspector::jsInjectedScriptHostPrototypeFunctionType): Deleted.
Source/WebCore:
* inspector/WebInjectedScriptHost.cpp:
(WebCore::WebInjectedScriptHost::subtype):
(WebCore::WebInjectedScriptHost::type): Deleted.
* inspector/WebInjectedScriptHost.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptHosth">trunk/Source/JavaScriptCore/inspector/InjectedScriptHost.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHosth">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostPrototypecpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHostPrototype.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebInjectedScriptHostcpp">trunk/Source/WebCore/inspector/WebInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebInjectedScriptHosth">trunk/Source/WebCore/inspector/WebInjectedScriptHost.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179052 => 179053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-24 02:34:18 UTC (rev 179053)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-23 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Rename InjectedScriptHost::type to subtype
+ https://bugs.webkit.org/show_bug.cgi?id=140841
+
+ Reviewed by Timothy Hatcher.
+
+ We were using this to set the subtype of an "object" type RemoteObject
+ so we should clean up the name and call it subtype.
+
+ * inspector/InjectedScriptHost.h:
+ * inspector/InjectedScriptSource.js:
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::subtype):
+ (Inspector::JSInjectedScriptHost::type): Deleted.
+ * inspector/JSInjectedScriptHost.h:
+ * inspector/JSInjectedScriptHostPrototype.cpp:
+ (Inspector::JSInjectedScriptHostPrototype::finishCreation):
+ (Inspector::jsInjectedScriptHostPrototypeFunctionSubtype):
+ (Inspector::jsInjectedScriptHostPrototypeFunctionType): Deleted.
+
</ins><span class="cx"> 2015-01-23 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> LayoutTests/js/script-tests/reentrant-caching.js crashing on 32 bit builds
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptHost.h (179052 => 179053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptHost.h 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptHost.h 2015-01-24 02:34:18 UTC (rev 179053)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> static PassRefPtr<InjectedScriptHost> create() { return adoptRef(new InjectedScriptHost); }
</span><span class="cx"> virtual ~InjectedScriptHost();
</span><span class="cx">
</span><del>- virtual JSC::JSValue type(JSC::ExecState*, JSC::JSValue) { return JSC::jsUndefined(); }
</del><ins>+ virtual JSC::JSValue subtype(JSC::ExecState*, JSC::JSValue) { return JSC::jsUndefined(); }
</ins><span class="cx"> virtual bool isHTMLAllCollection(JSC::JSValue) { return false; }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue jsWrapper(JSC::ExecState*, JSC::JSGlobalObject*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (179052 => 179053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-01-24 02:34:18 UTC (rev 179053)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> var columnNames = null;
</span><span class="cx"> if (typeof columns === "string")
</span><span class="cx"> columns = [columns];
</span><del>- if (InjectedScriptHost.type(columns) === "array") {
</del><ins>+ if (InjectedScriptHost.subtype(columns) === "array") {
</ins><span class="cx"> columnNames = [];
</span><span class="cx"> for (var i = 0; i < columns.length; ++i)
</span><span class="cx"> columnNames.push(String(columns[i]));
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> if (this._isHTMLAllCollection(obj))
</span><span class="cx"> return "array";
</span><span class="cx">
</span><del>- var preciseType = InjectedScriptHost.type(obj);
</del><ins>+ var preciseType = InjectedScriptHost.subtype(obj);
</ins><span class="cx"> if (preciseType)
</span><span class="cx"> return preciseType;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp (179052 => 179053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2015-01-24 02:34:18 UTC (rev 179053)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> return jsBoolean(impl().isHTMLAllCollection(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSInjectedScriptHost::type(ExecState* exec)
</del><ins>+JSValue JSInjectedScriptHost::subtype(ExecState* exec)
</ins><span class="cx"> {
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="cx"> return jsUndefined();
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> if (value.inherits(JSFloat32Array::info()) || value.inherits(JSFloat64Array::info()))
</span><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("array"));
</span><span class="cx">
</span><del>- return impl().type(exec, value);
</del><ins>+ return impl().subtype(exec, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSInjectedScriptHost::functionDetails(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.h (179052 => 179053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.h 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.h 2015-01-24 02:34:18 UTC (rev 179053)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> // Functions.
</span><span class="cx"> JSC::JSValue internalConstructorName(JSC::ExecState*);
</span><span class="cx"> JSC::JSValue isHTMLAllCollection(JSC::ExecState*);
</span><del>- JSC::JSValue type(JSC::ExecState*);
</del><ins>+ JSC::JSValue subtype(JSC::ExecState*);
</ins><span class="cx"> JSC::JSValue functionDetails(JSC::ExecState*);
</span><span class="cx"> JSC::JSValue getInternalProperties(JSC::ExecState*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHostPrototype.cpp (179052 => 179053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHostPrototype.cpp 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHostPrototype.cpp 2015-01-24 02:34:18 UTC (rev 179053)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionType(ExecState*);
</del><ins>+static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionSubtype(ExecState*);
</ins><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionFunctionDetails(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionGetInternalProperties(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionInternalConstructorName(ExecState*);
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> ASSERT(inherits(info()));
</span><span class="cx"> vm.prototypeMap.addPrototype(this);
</span><span class="cx">
</span><del>- JSC_NATIVE_FUNCTION("type", jsInjectedScriptHostPrototypeFunctionType, DontEnum, 1);
</del><ins>+ JSC_NATIVE_FUNCTION("subtype", jsInjectedScriptHostPrototypeFunctionSubtype, DontEnum, 1);
</ins><span class="cx"> JSC_NATIVE_FUNCTION("functionDetails", jsInjectedScriptHostPrototypeFunctionFunctionDetails, DontEnum, 1);
</span><span class="cx"> JSC_NATIVE_FUNCTION("getInternalProperties", jsInjectedScriptHostPrototypeFunctionGetInternalProperties, DontEnum, 1);
</span><span class="cx"> JSC_NATIVE_FUNCTION("internalConstructorName", jsInjectedScriptHostPrototypeFunctionInternalConstructorName, DontEnum, 1);
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> return JSValue::encode(castedThis->isHTMLAllCollection(exec));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionType(ExecState* exec)
</del><ins>+EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionSubtype(ExecState* exec)
</ins><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> JSInjectedScriptHost* castedThis = jsDynamicCast<JSInjectedScriptHost*>(thisValue);
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> return throwVMTypeError(exec);
</span><span class="cx">
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSInjectedScriptHost::info());
</span><del>- return JSValue::encode(castedThis->type(exec));
</del><ins>+ return JSValue::encode(castedThis->subtype(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionFunctionDetails(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179052 => 179053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/WebCore/ChangeLog 2015-01-24 02:34:18 UTC (rev 179053)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-23 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Rename InjectedScriptHost::type to subtype
+ https://bugs.webkit.org/show_bug.cgi?id=140841
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/WebInjectedScriptHost.cpp:
+ (WebCore::WebInjectedScriptHost::subtype):
+ (WebCore::WebInjectedScriptHost::type): Deleted.
+ * inspector/WebInjectedScriptHost.h:
+
</ins><span class="cx"> 2015-01-23 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac][EME] Support ClearKey encryption with AES128-encrypted HLS
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebInjectedScriptHost.cpp (179052 => 179053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebInjectedScriptHost.cpp 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/WebCore/inspector/WebInjectedScriptHost.cpp 2015-01-24 02:34:18 UTC (rev 179053)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> if (value.inherits(JS##interfaceName::info())) \
</span><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("error"));
</span><span class="cx">
</span><del>-JSValue WebInjectedScriptHost::type(JSC::ExecState* exec, JSC::JSValue value)
</del><ins>+JSValue WebInjectedScriptHost::subtype(JSC::ExecState* exec, JSC::JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> if (value.inherits(JSNode::info()))
</span><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("node"));
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("array"));
</span><span class="cx"> if (value.inherits(JSHTMLCollection::info()))
</span><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("array"));
</span><del>-
</del><ins>+
</ins><span class="cx"> DOM_EXCEPTION_INTERFACES_FOR_EACH(RETURN_ERROR_IF_VALUE_INHERITS_EXCEPTION_TYPE)
</span><span class="cx">
</span><span class="cx"> return jsUndefined();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebInjectedScriptHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebInjectedScriptHost.h (179052 => 179053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebInjectedScriptHost.h 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/WebCore/inspector/WebInjectedScriptHost.h 2015-01-24 02:34:18 UTC (rev 179053)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<WebInjectedScriptHost> create() { return adoptRef(new WebInjectedScriptHost); }
</span><span class="cx">
</span><del>- virtual JSC::JSValue type(JSC::ExecState*, JSC::JSValue) override;
</del><ins>+ virtual JSC::JSValue subtype(JSC::ExecState*, JSC::JSValue) override;
</ins><span class="cx"> virtual bool isHTMLAllCollection(JSC::JSValue) override;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>