Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (179052 => 179053)
--- trunk/Source/_javascript_Core/ChangeLog 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-01-24 02:34:18 UTC (rev 179053)
@@ -1,3 +1,24 @@
+2015-01-23 Joseph Pecoraro <[email protected]>
+
+ 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.
+
2015-01-23 Michael Saboff <[email protected]>
LayoutTests/js/script-tests/reentrant-caching.js crashing on 32 bit builds
Modified: trunk/Source/_javascript_Core/inspector/InjectedScriptHost.h (179052 => 179053)
--- trunk/Source/_javascript_Core/inspector/InjectedScriptHost.h 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/_javascript_Core/inspector/InjectedScriptHost.h 2015-01-24 02:34:18 UTC (rev 179053)
@@ -39,7 +39,7 @@
static PassRefPtr<InjectedScriptHost> create() { return adoptRef(new InjectedScriptHost); }
virtual ~InjectedScriptHost();
- virtual JSC::JSValue type(JSC::ExecState*, JSC::JSValue) { return JSC::jsUndefined(); }
+ virtual JSC::JSValue subtype(JSC::ExecState*, JSC::JSValue) { return JSC::jsUndefined(); }
virtual bool isHTMLAllCollection(JSC::JSValue) { return false; }
JSC::JSValue jsWrapper(JSC::ExecState*, JSC::JSGlobalObject*);
Modified: trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js (179052 => 179053)
--- trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js 2015-01-24 02:34:18 UTC (rev 179053)
@@ -104,7 +104,7 @@
var columnNames = null;
if (typeof columns === "string")
columns = [columns];
- if (InjectedScriptHost.type(columns) === "array") {
+ if (InjectedScriptHost.subtype(columns) === "array") {
columnNames = [];
for (var i = 0; i < columns.length; ++i)
columnNames.push(String(columns[i]));
@@ -611,7 +611,7 @@
if (this._isHTMLAllCollection(obj))
return "array";
- var preciseType = InjectedScriptHost.type(obj);
+ var preciseType = InjectedScriptHost.subtype(obj);
if (preciseType)
return preciseType;
Modified: trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp (179052 => 179053)
--- trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp 2015-01-24 02:34:18 UTC (rev 179053)
@@ -106,7 +106,7 @@
return jsBoolean(impl().isHTMLAllCollection(value));
}
-JSValue JSInjectedScriptHost::type(ExecState* exec)
+JSValue JSInjectedScriptHost::subtype(ExecState* exec)
{
if (exec->argumentCount() < 1)
return jsUndefined();
@@ -136,7 +136,7 @@
if (value.inherits(JSFloat32Array::info()) || value.inherits(JSFloat64Array::info()))
return jsNontrivialString(exec, ASCIILiteral("array"));
- return impl().type(exec, value);
+ return impl().subtype(exec, value);
}
JSValue JSInjectedScriptHost::functionDetails(ExecState* exec)
Modified: trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.h (179052 => 179053)
--- trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.h 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.h 2015-01-24 02:34:18 UTC (rev 179053)
@@ -62,7 +62,7 @@
// Functions.
JSC::JSValue internalConstructorName(JSC::ExecState*);
JSC::JSValue isHTMLAllCollection(JSC::ExecState*);
- JSC::JSValue type(JSC::ExecState*);
+ JSC::JSValue subtype(JSC::ExecState*);
JSC::JSValue functionDetails(JSC::ExecState*);
JSC::JSValue getInternalProperties(JSC::ExecState*);
Modified: trunk/Source/_javascript_Core/inspector/JSInjectedScriptHostPrototype.cpp (179052 => 179053)
--- trunk/Source/_javascript_Core/inspector/JSInjectedScriptHostPrototype.cpp 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/_javascript_Core/inspector/JSInjectedScriptHostPrototype.cpp 2015-01-24 02:34:18 UTC (rev 179053)
@@ -38,7 +38,7 @@
namespace Inspector {
-static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionType(ExecState*);
+static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionSubtype(ExecState*);
static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionFunctionDetails(ExecState*);
static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionGetInternalProperties(ExecState*);
static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionInternalConstructorName(ExecState*);
@@ -54,7 +54,7 @@
ASSERT(inherits(info()));
vm.prototypeMap.addPrototype(this);
- JSC_NATIVE_FUNCTION("type", jsInjectedScriptHostPrototypeFunctionType, DontEnum, 1);
+ JSC_NATIVE_FUNCTION("subtype", jsInjectedScriptHostPrototypeFunctionSubtype, DontEnum, 1);
JSC_NATIVE_FUNCTION("functionDetails", jsInjectedScriptHostPrototypeFunctionFunctionDetails, DontEnum, 1);
JSC_NATIVE_FUNCTION("getInternalProperties", jsInjectedScriptHostPrototypeFunctionGetInternalProperties, DontEnum, 1);
JSC_NATIVE_FUNCTION("internalConstructorName", jsInjectedScriptHostPrototypeFunctionInternalConstructorName, DontEnum, 1);
@@ -100,7 +100,7 @@
return JSValue::encode(castedThis->isHTMLAllCollection(exec));
}
-EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionType(ExecState* exec)
+EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionSubtype(ExecState* exec)
{
JSValue thisValue = exec->thisValue();
JSInjectedScriptHost* castedThis = jsDynamicCast<JSInjectedScriptHost*>(thisValue);
@@ -108,7 +108,7 @@
return throwVMTypeError(exec);
ASSERT_GC_OBJECT_INHERITS(castedThis, JSInjectedScriptHost::info());
- return JSValue::encode(castedThis->type(exec));
+ return JSValue::encode(castedThis->subtype(exec));
}
EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionFunctionDetails(ExecState* exec)
Modified: trunk/Source/WebCore/ChangeLog (179052 => 179053)
--- 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)
@@ -1,3 +1,15 @@
+2015-01-23 Joseph Pecoraro <[email protected]>
+
+ 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:
+
2015-01-23 Jer Noble <[email protected]>
[Mac][EME] Support ClearKey encryption with AES128-encrypted HLS
Modified: trunk/Source/WebCore/inspector/WebInjectedScriptHost.cpp (179052 => 179053)
--- 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)
@@ -41,7 +41,7 @@
if (value.inherits(JS##interfaceName::info())) \
return jsNontrivialString(exec, ASCIILiteral("error"));
-JSValue WebInjectedScriptHost::type(JSC::ExecState* exec, JSC::JSValue value)
+JSValue WebInjectedScriptHost::subtype(JSC::ExecState* exec, JSC::JSValue value)
{
if (value.inherits(JSNode::info()))
return jsNontrivialString(exec, ASCIILiteral("node"));
@@ -49,7 +49,7 @@
return jsNontrivialString(exec, ASCIILiteral("array"));
if (value.inherits(JSHTMLCollection::info()))
return jsNontrivialString(exec, ASCIILiteral("array"));
-
+
DOM_EXCEPTION_INTERFACES_FOR_EACH(RETURN_ERROR_IF_VALUE_INHERITS_EXCEPTION_TYPE)
return jsUndefined();
Modified: trunk/Source/WebCore/inspector/WebInjectedScriptHost.h (179052 => 179053)
--- 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)
@@ -34,7 +34,7 @@
public:
static PassRefPtr<WebInjectedScriptHost> create() { return adoptRef(new WebInjectedScriptHost); }
- virtual JSC::JSValue type(JSC::ExecState*, JSC::JSValue) override;
+ virtual JSC::JSValue subtype(JSC::ExecState*, JSC::JSValue) override;
virtual bool isHTMLAllCollection(JSC::JSValue) override;
};
