<!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>[188334] trunk/Source/WebCore</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/188334">188334</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-08-12 03:33:41 -0700 (Wed, 12 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove promise attribute specific handling from binding generator
https://bugs.webkit.org/show_bug.cgi?id=147828
Reviewed by Darin Adler.
Reverting http://trac.webkit.org/changeset/184643, as CachedAttribute is used instead.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader): Deleted.
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjConstructor): Deleted.
(WebCore::setJSTestObjConstructorStaticStringAttr): Deleted.
* bindings/scripts/test/JS/JSTestObj.h:
* bindings/scripts/test/ObjC/DOMTestObj.h:
* bindings/scripts/test/ObjC/DOMTestObj.mm:
(-[DOMTestObj voidMethod]): Deleted.
(-[DOMTestObj voidMethodWithArgs:strArg:objArg:]): Deleted.
* bindings/scripts/test/TestObj.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestObjh">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestObjmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188333 => 188334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-12 10:12:28 UTC (rev 188333)
+++ trunk/Source/WebCore/ChangeLog 2015-08-12 10:33:41 UTC (rev 188334)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-08-12 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><ins>+ Remove promise attribute specific handling from binding generator
+ https://bugs.webkit.org/show_bug.cgi?id=147828
+
+ Reviewed by Darin Adler.
+
+ Reverting http://trac.webkit.org/changeset/184643, as CachedAttribute is used instead.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader): Deleted.
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjConstructor): Deleted.
+ (WebCore::setJSTestObjConstructorStaticStringAttr): Deleted.
+ * bindings/scripts/test/JS/JSTestObj.h:
+ * bindings/scripts/test/ObjC/DOMTestObj.h:
+ * bindings/scripts/test/ObjC/DOMTestObj.mm:
+ (-[DOMTestObj voidMethod]): Deleted.
+ (-[DOMTestObj voidMethodWithArgs:strArg:objArg:]): Deleted.
+ * bindings/scripts/test/TestObj.idl:
+
+2015-08-12 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
</ins><span class="cx"> XHR.setRequestHeader should remove trailing and leading whitespaces from the header value
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147445
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (188333 => 188334)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1049,14 +1049,7 @@
</span><span class="cx"> $needsVisitChildren = 1;
</span><span class="cx"> push(@headerContent, "#endif\n") if $conditionalString;
</span><span class="cx"> }
</span><del>- elsif (IsReturningPromise($attribute)) {
- $headerIncludes{"JSDOMPromise.h"} = 1;
</del><span class="cx">
</span><del>- 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;
- }
</del><span class="cx"> if ($attribute->signature->extendedAttributes->{"ForwardDeclareInHeader"}) {
</span><span class="cx"> $hasForwardDeclaringAttributes = 1;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (188333 => 188334)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -299,7 +299,6 @@
</span><span class="cx"> JSC::EncodedJSValue jsTestObjAttribute(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx"> JSC::EncodedJSValue jsTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx"> void setJSTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::EncodedJSValue);
</span><del>-JSC::EncodedJSValue jsTestObjTestPromiseAttr(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
</del><span class="cx"> JSC::EncodedJSValue jsTestObjConstructor(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx">
</span><span class="cx"> class JSTestObjPrototype : public JSC::JSNonFinalObject {
</span><span class="lines">@@ -367,9 +366,9 @@
</span><span class="cx"> { 0, 16 },
</span><span class="cx"> { -1, -1 },
</span><span class="cx"> { 1, -1 },
</span><del>- { 6, -1 },
</del><span class="cx"> { -1, -1 },
</span><span class="cx"> { -1, -1 },
</span><ins>+ { -1, -1 },
</ins><span class="cx"> { 3, -1 },
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -394,10 +393,9 @@
</span><span class="cx"> { 0, 0, NoIntrinsic, 0, 0 },
</span><span class="cx"> #endif
</span><span class="cx"> { "contentDocument", DontDelete | ReadOnly | CustomAccessor, NoIntrinsic, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjContentDocument), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) },
</span><del>- { "testPromiseAttr", DontDelete | ReadOnly | CustomAccessor, NoIntrinsic, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjTestPromiseAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) },
</del><span class="cx"> };
</span><span class="cx">
</span><del>-static const HashTable JSTestObjTable = { 7, 15, true, JSTestObjTableValues, 0, JSTestObjTableIndex };
</del><ins>+static const HashTable JSTestObjTable = { 6, 15, true, JSTestObjTableValues, 0, JSTestObjTableIndex };
</ins><span class="cx"> /* Hash table for constructor */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestObjConstructorTableValues[] =
</span><span class="lines">@@ -1887,16 +1885,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-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));
-}
-
-
</del><span class="cx"> EncodedJSValue jsTestObjConstructor(ExecState* exec, JSObject* baseValue, EncodedJSValue, PropertyName)
</span><span class="cx"> {
</span><span class="cx"> JSTestObjPrototype* domObject = jsDynamicCast<JSTestObjPrototype*>(baseValue);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h (188333 => 188334)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> #ifndef JSTestObj_h
</span><span class="cx"> #define JSTestObj_h
</span><span class="cx">
</span><del>-#include "JSDOMPromise.h"
</del><span class="cx"> #include "JSDOMWrapper.h"
</span><span class="cx"> #include "TestObj.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -55,14 +54,12 @@
</span><span class="cx"> static JSC::JSValue getConstructor(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> JSC::WriteBarrier<JSC::Unknown> m_cachedAttribute1;
</span><span class="cx"> JSC::WriteBarrier<JSC::Unknown> m_cachedAttribute2;
</span><del>- JSC::Strong<JSC::JSPromiseDeferred> m_testPromiseAttrPromiseDeferred;
</del><span class="cx"> static void visitChildren(JSCell*, JSC::SlotVisitor&);
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> // Custom attributes
</span><span class="cx"> JSC::JSValue customAttr(JSC::ExecState*) const;
</span><span class="cx"> void setCustomAttr(JSC::ExecState*, JSC::JSValue);
</span><del>- JSC::JSValue testPromiseAttr(JSC::ExecState*) const;
</del><span class="cx">
</span><span class="cx"> // Custom functions
</span><span class="cx"> JSC::JSValue customMethod(JSC::ExecState*);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h (188333 => 188334)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> @class DOMDictionary;
</span><span class="cx"> @class DOMDocument;
</span><span class="cx"> @class DOMNode;
</span><del>-@class DOMPromise;
</del><span class="cx"> @class DOMSVGDocument;
</span><span class="cx"> @class DOMSVGPoint;
</span><span class="cx"> @class DOMTestEnumType;
</span><span class="lines">@@ -121,7 +120,6 @@
</span><span class="cx"> @property int nullableLongSettableAttribute;
</span><span class="cx"> @property int nullableStringValue;
</span><span class="cx"> @property (readonly, copy) NSString *attribute;
</span><del>-@property (readonly, strong) DOMPromise *testPromiseAttr;
</del><span class="cx">
</span><span class="cx"> - (void)voidMethod;
</span><span class="cx"> - (void)voidMethodWithArgs:(int)longArg strArg:(NSString *)strArg objArg:(DOMTestObj *)objArg;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestObjmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm (188333 => 188334)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #import "DOMDictionaryInternal.h"
</span><span class="cx"> #import "DOMDocumentInternal.h"
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><del>-#import "DOMPromiseInternal.h"
</del><span class="cx"> #import "DOMSVGDocumentInternal.h"
</span><span class="cx"> #import "DOMSVGPointInternal.h"
</span><span class="cx"> #import "DOMTestEnumTypeInternal.h"
</span><span class="lines">@@ -52,7 +51,6 @@
</span><span class="cx"> #import "JSMainThreadExecState.h"
</span><span class="cx"> #import "Node.h"
</span><span class="cx"> #import "ObjCEventListener.h"
</span><del>-#import "Promise.h"
</del><span class="cx"> #import "SVGDocument.h"
</span><span class="cx"> #import "SVGPoint.h"
</span><span class="cx"> #import "SerializedScriptValue.h"
</span><span class="lines">@@ -806,12 +804,6 @@
</span><span class="cx"> return IMPL->attribute();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMPromise *)testPromiseAttr
-{
- WebCore::JSMainThreadNullState state;
- return kit(WTF::getPtr(IMPL->testPromiseAttr()));
-}
-
</del><span class="cx"> - (void)voidMethod
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (188333 => 188334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2015-08-12 10:12:28 UTC (rev 188333)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2015-08-12 10:33:41 UTC (rev 188334)
</span><span class="lines">@@ -281,9 +281,6 @@
</span><span class="cx"> attribute _optional attributeWithReservedEnumType;
</span><span class="cx"> void _any(unrestricted float a, long b);
</span><span class="cx">
</span><del>- // Promise attributes
- [CustomGetter] readonly attribute Promise testPromiseAttr;
-
</del><span class="cx"> // Promise function
</span><span class="cx"> Promise testPromiseFunction();
</span><span class="cx"> Promise testPromiseFunctionWithFloatArgument(float a);
</span></span></pre>
</div>
</div>
</body>
</html>