Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (188333 => 188334)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-08-12 10:12:28 UTC (rev 188333)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-08-12 10:33:41 UTC (rev 188334)
@@ -1049,14 +1049,7 @@
$needsVisitChildren = 1;
push(@headerContent, "#endif\n") if $conditionalString;
}
- elsif (IsReturningPromise($attribute)) {
- $headerIncludes{"JSDOMPromise.h"} = 1;
- my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
- push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
- push(@headerContent, " JSC::Strong<JSC::JSPromiseDeferred> m_" . $attribute->signature->name . "PromiseDeferred;\n");
- push(@headerContent, "#endif\n") if $conditionalString;
- }
if ($attribute->signature->extendedAttributes->{"ForwardDeclareInHeader"}) {
$hasForwardDeclaringAttributes = 1;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (188333 => 188334)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2015-08-12 10:12:28 UTC (rev 188333)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2015-08-12 10:33:41 UTC (rev 188334)
@@ -299,7 +299,6 @@
JSC::EncodedJSValue jsTestObjAttribute(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
JSC::EncodedJSValue jsTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
void setJSTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::EncodedJSValue);
-JSC::EncodedJSValue jsTestObjTestPromiseAttr(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
JSC::EncodedJSValue jsTestObjConstructor(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
class JSTestObjPrototype : public JSC::JSNonFinalObject {
@@ -367,9 +366,9 @@
{ 0, 16 },
{ -1, -1 },
{ 1, -1 },
- { 6, -1 },
{ -1, -1 },
{ -1, -1 },
+ { -1, -1 },
{ 3, -1 },
};
@@ -394,10 +393,9 @@
{ 0, 0, NoIntrinsic, 0, 0 },
#endif
{ "contentDocument", DontDelete | ReadOnly | CustomAccessor, NoIntrinsic, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjContentDocument), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) },
- { "testPromiseAttr", DontDelete | ReadOnly | CustomAccessor, NoIntrinsic, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjTestPromiseAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) },
};
-static const HashTable JSTestObjTable = { 7, 15, true, JSTestObjTableValues, 0, JSTestObjTableIndex };
+static const HashTable JSTestObjTable = { 6, 15, true, JSTestObjTableValues, 0, JSTestObjTableIndex };
/* Hash table for constructor */
static const HashTableValue JSTestObjConstructorTableValues[] =
@@ -1887,16 +1885,6 @@
}
-EncodedJSValue jsTestObjTestPromiseAttr(ExecState* exec, JSObject* slotBase, EncodedJSValue thisValue, PropertyName)
-{
- UNUSED_PARAM(exec);
- UNUSED_PARAM(slotBase);
- UNUSED_PARAM(thisValue);
- auto* castedThis = jsCast<JSTestObj*>(slotBase);
- return JSValue::encode(castedThis->testPromiseAttr(exec));
-}
-
-
EncodedJSValue jsTestObjConstructor(ExecState* exec, JSObject* baseValue, EncodedJSValue, PropertyName)
{
JSTestObjPrototype* domObject = jsDynamicCast<JSTestObjPrototype*>(baseValue);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h (188333 => 188334)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2015-08-12 10:12:28 UTC (rev 188333)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2015-08-12 10:33:41 UTC (rev 188334)
@@ -21,7 +21,6 @@
#ifndef JSTestObj_h
#define JSTestObj_h
-#include "JSDOMPromise.h"
#include "JSDOMWrapper.h"
#include "TestObj.h"
#include <wtf/NeverDestroyed.h>
@@ -55,14 +54,12 @@
static JSC::JSValue getConstructor(JSC::VM&, JSC::JSGlobalObject*);
JSC::WriteBarrier<JSC::Unknown> m_cachedAttribute1;
JSC::WriteBarrier<JSC::Unknown> m_cachedAttribute2;
- JSC::Strong<JSC::JSPromiseDeferred> m_testPromiseAttrPromiseDeferred;
static void visitChildren(JSCell*, JSC::SlotVisitor&);
// Custom attributes
JSC::JSValue customAttr(JSC::ExecState*) const;
void setCustomAttr(JSC::ExecState*, JSC::JSValue);
- JSC::JSValue testPromiseAttr(JSC::ExecState*) const;
// Custom functions
JSC::JSValue customMethod(JSC::ExecState*);
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h (188333 => 188334)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h 2015-08-12 10:12:28 UTC (rev 188333)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h 2015-08-12 10:33:41 UTC (rev 188334)
@@ -29,7 +29,6 @@
@class DOMDictionary;
@class DOMDocument;
@class DOMNode;
-@class DOMPromise;
@class DOMSVGDocument;
@class DOMSVGPoint;
@class DOMTestEnumType;
@@ -121,7 +120,6 @@
@property int nullableLongSettableAttribute;
@property int nullableStringValue;
@property (readonly, copy) NSString *attribute;
-@property (readonly, strong) DOMPromise *testPromiseAttr;
- (void)voidMethod;
- (void)voidMethodWithArgs:(int)longArg strArg:(NSString *)strArg objArg:(DOMTestObj *)objArg;
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm (188333 => 188334)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2015-08-12 10:12:28 UTC (rev 188333)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2015-08-12 10:33:41 UTC (rev 188334)
@@ -32,7 +32,6 @@
#import "DOMDictionaryInternal.h"
#import "DOMDocumentInternal.h"
#import "DOMNodeInternal.h"
-#import "DOMPromiseInternal.h"
#import "DOMSVGDocumentInternal.h"
#import "DOMSVGPointInternal.h"
#import "DOMTestEnumTypeInternal.h"
@@ -52,7 +51,6 @@
#import "JSMainThreadExecState.h"
#import "Node.h"
#import "ObjCEventListener.h"
-#import "Promise.h"
#import "SVGDocument.h"
#import "SVGPoint.h"
#import "SerializedScriptValue.h"
@@ -806,12 +804,6 @@
return IMPL->attribute();
}
-- (DOMPromise *)testPromiseAttr
-{
- WebCore::JSMainThreadNullState state;
- return kit(WTF::getPtr(IMPL->testPromiseAttr()));
-}
-
- (void)voidMethod
{
WebCore::JSMainThreadNullState state;
