<!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>[199188] 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/199188">199188</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-07 14:56:57 -0700 (Thu, 07 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebIDL] Add support for [EnabledAtRuntime] attributes on non-global objects
https://bugs.webkit.org/show_bug.cgi?id=156346
Reviewed by Ryosuke Niwa.
Add support for [EnabledAtRuntime] attributes on non-global objects by
using the same approach as for [EnabledAtRuntime] operations. This means
we add these attributes to the static property table but they get removed
at runtime in JS*Prototype::finishCreation(), if the feature is disabled,
after the eager reification of the prototype.
* bindings/scripts/CodeGeneratorJS.pm:
(GeneratePropertiesHashTable):
(GenerateImplementation):
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
(webkit_dom_test_obj_set_property):
(webkit_dom_test_obj_get_property):
(webkit_dom_test_obj_class_init):
(webkit_dom_test_obj_enabled_at_runtime_operation):
(webkit_dom_test_obj_get_enabled_at_runtime_attribute):
(webkit_dom_test_obj_set_enabled_at_runtime_attribute):
* bindings/scripts/test/GObject/WebKitDOMTestObj.h:
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::JSTestObjPrototype::finishCreation):
(WebCore::jsTestObjEnabledAtRuntimeAttribute):
(WebCore::setJSTestObjEnabledAtRuntimeAttribute):
(WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation1):
(WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation2):
(WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation):
* bindings/scripts/test/ObjC/DOMTestObj.h:
* bindings/scripts/test/ObjC/DOMTestObj.mm:
(-[DOMTestObj enabledAtRuntimeAttribute]):
(-[DOMTestObj setEnabledAtRuntimeAttribute:]):
(-[DOMTestObj enabledAtRuntimeOperation:]):
* 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="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</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 (199187 => 199188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-07 21:55:26 UTC (rev 199187)
+++ trunk/Source/WebCore/ChangeLog 2016-04-07 21:56:57 UTC (rev 199188)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2016-04-07 Chris Dumez <cdumez@apple.com>
+
+ [WebIDL] Add support for [EnabledAtRuntime] attributes on non-global objects
+ https://bugs.webkit.org/show_bug.cgi?id=156346
+
+ Reviewed by Ryosuke Niwa.
+
+ Add support for [EnabledAtRuntime] attributes on non-global objects by
+ using the same approach as for [EnabledAtRuntime] operations. This means
+ we add these attributes to the static property table but they get removed
+ at runtime in JS*Prototype::finishCreation(), if the feature is disabled,
+ after the eager reification of the prototype.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GeneratePropertiesHashTable):
+ (GenerateImplementation):
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ (webkit_dom_test_obj_set_property):
+ (webkit_dom_test_obj_get_property):
+ (webkit_dom_test_obj_class_init):
+ (webkit_dom_test_obj_enabled_at_runtime_operation):
+ (webkit_dom_test_obj_get_enabled_at_runtime_attribute):
+ (webkit_dom_test_obj_set_enabled_at_runtime_attribute):
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::JSTestObjPrototype::finishCreation):
+ (WebCore::jsTestObjEnabledAtRuntimeAttribute):
+ (WebCore::setJSTestObjEnabledAtRuntimeAttribute):
+ (WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation1):
+ (WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation2):
+ (WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation):
+ * bindings/scripts/test/ObjC/DOMTestObj.h:
+ * bindings/scripts/test/ObjC/DOMTestObj.mm:
+ (-[DOMTestObj enabledAtRuntimeAttribute]):
+ (-[DOMTestObj setEnabledAtRuntimeAttribute:]):
+ (-[DOMTestObj enabledAtRuntimeOperation:]):
+ * bindings/scripts/test/TestObj.idl:
+
</ins><span class="cx"> 2016-04-07 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Attempted build fix.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (199187 => 199188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-07 21:55:26 UTC (rev 199187)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-07 21:56:57 UTC (rev 199188)
</span><span class="lines">@@ -696,6 +696,9 @@
</span><span class="cx"> my $interface = shift;
</span><span class="cx"> my $attribute = shift;
</span><span class="cx">
</span><ins>+ # FIXME: The bindings generator does not support putting runtime-enabled attributes on the instance yet (except for global objects).
+ return 0 if $attribute->signature->extendedAttributes->{"EnabledAtRuntime"} && !IsDOMGlobalObject($interface);
+
</ins><span class="cx"> return 1 if InterfaceRequiresAttributesOnInstance($interface);
</span><span class="cx"> return 1 if $attribute->signature->type =~ /Constructor$/;
</span><span class="cx">
</span><span class="lines">@@ -723,7 +726,7 @@
</span><span class="cx">
</span><span class="cx"> return 1 if IsDOMGlobalObject($interface);
</span><span class="cx">
</span><del>- # FIXME: The bindings generator does not support putting runtime-enabled on the instance yet (except for global objects).
</del><ins>+ # FIXME: The bindings generator does not support putting runtime-enabled operations on the instance yet (except for global objects).
</ins><span class="cx"> return 0 if $function->signature->extendedAttributes->{"EnabledAtRuntime"};
</span><span class="cx">
</span><span class="cx"> # [Unforgeable] operations should be on the instance.
</span><span class="lines">@@ -1392,7 +1395,7 @@
</span><span class="cx">
</span><span class="cx"> sub GeneratePropertiesHashTable
</span><span class="cx"> {
</span><del>- my ($object, $interface, $isInstance, $hashKeys, $hashSpecials, $hashValue1, $hashValue2, $conditionals, $runtimeEnabledFunctions) = @_;
</del><ins>+ my ($object, $interface, $isInstance, $hashKeys, $hashSpecials, $hashValue1, $hashValue2, $conditionals, $runtimeEnabledFunctions, $runtimeEnabledAttributes) = @_;
</ins><span class="cx">
</span><span class="cx"> # FIXME: These should be functions on $interface.
</span><span class="cx"> my $interfaceName = $interface->name;
</span><span class="lines">@@ -1444,6 +1447,14 @@
</span><span class="cx"> if ($conditional) {
</span><span class="cx"> $conditionals->{$name} = $conditional;
</span><span class="cx"> }
</span><ins>+
+ if ($attribute->signature->extendedAttributes->{"EnabledAtRuntime"}) {
+ if ($isInstance) {
+ die "We currently do not support [EnabledAtRuntime] attributes on the instance (except for global objects).";
+ } else {
+ push(@$runtimeEnabledAttributes, $attribute);
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my @functions = @{$interface->functions};
</span><span class="lines">@@ -1951,12 +1962,13 @@
</span><span class="cx"> my %conditionals = ();
</span><span class="cx"> my $hashName = $className . "Table";
</span><span class="cx"> my @runtimeEnabledFunctions = ();
</span><ins>+ my @runtimeEnabledAttributes = ();
</ins><span class="cx">
</span><span class="cx"> # Generate hash table for properties on the instance.
</span><span class="cx"> my $numInstanceProperties = GeneratePropertiesHashTable($object, $interface, 1,
</span><span class="cx"> \@hashKeys, \@hashSpecials,
</span><span class="cx"> \@hashValue1, \@hashValue2,
</span><del>- \%conditionals, \@runtimeEnabledFunctions);
</del><ins>+ \%conditionals, \@runtimeEnabledFunctions, \@runtimeEnabledAttributes);
</ins><span class="cx">
</span><span class="cx"> $object->GenerateHashTable($hashName, $numInstanceProperties,
</span><span class="cx"> \@hashKeys, \@hashSpecials,
</span><span class="lines">@@ -2070,12 +2082,13 @@
</span><span class="cx"> @hashSpecials = ();
</span><span class="cx"> %conditionals = ();
</span><span class="cx"> @runtimeEnabledFunctions = ();
</span><ins>+ @runtimeEnabledAttributes = ();
</ins><span class="cx">
</span><span class="cx"> # Generate hash table for properties on the prototype.
</span><span class="cx"> my $numPrototypeProperties = GeneratePropertiesHashTable($object, $interface, 0,
</span><span class="cx"> \@hashKeys, \@hashSpecials,
</span><span class="cx"> \@hashValue1, \@hashValue2,
</span><del>- \%conditionals, \@runtimeEnabledFunctions);
</del><ins>+ \%conditionals, \@runtimeEnabledFunctions, \@runtimeEnabledAttributes);
</ins><span class="cx"> my $hashSize = $numPrototypeProperties;
</span><span class="cx">
</span><span class="cx"> foreach my $constant (@{$interface->constants}) {
</span><span class="lines">@@ -2134,11 +2147,13 @@
</span><span class="cx"> push(@implContent, " Base::finishCreation(vm);\n");
</span><span class="cx"> push(@implContent, " reifyStaticProperties(vm, ${className}PrototypeTableValues, *this);\n");
</span><span class="cx">
</span><del>- foreach my $function (@runtimeEnabledFunctions) {
- my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
</del><ins>+ my @runtimeEnabledProperties = @runtimeEnabledFunctions;
+ push(@runtimeEnabledProperties, @runtimeEnabledAttributes);
+ foreach my $functionOrAttribute (@runtimeEnabledProperties) {
+ my $signature = $functionOrAttribute->signature;
+ my $conditionalString = $codeGenerator->GenerateConditionalString($signature);
</ins><span class="cx"> push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
</span><span class="cx"> AddToImplIncludes("RuntimeEnabledFeatures.h");
</span><del>- my $signature = $function->signature;
</del><span class="cx"> my $enable_function = GetRuntimeEnableFunctionName($signature);
</span><span class="cx"> my $name = $signature->name;
</span><span class="cx"> push(@implContent, " if (!${enable_function}()) {\n");
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (199187 => 199188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2016-04-07 21:55:26 UTC (rev 199187)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2016-04-07 21:56:57 UTC (rev 199188)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR,
</span><span class="cx"> PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR,
</span><span class="cx"> PROP_REFLECTED_CUSTOM_URL_ATTR,
</span><ins>+ PROP_ENABLED_AT_RUNTIME_ATTRIBUTE,
</ins><span class="cx"> PROP_ATTR_WITH_GETTER_EXCEPTION,
</span><span class="cx"> PROP_ATTR_WITH_GETTER_EXCEPTION_WITH_MESSAGE,
</span><span class="cx"> PROP_ATTR_WITH_SETTER_EXCEPTION,
</span><span class="lines">@@ -217,6 +218,9 @@
</span><span class="cx"> case PROP_REFLECTED_CUSTOM_URL_ATTR:
</span><span class="cx"> webkit_dom_test_obj_set_reflected_custom_url_attr(self, g_value_get_string(value));
</span><span class="cx"> break;
</span><ins>+ case PROP_ENABLED_AT_RUNTIME_ATTRIBUTE:
+ webkit_dom_test_obj_set_enabled_at_runtime_attribute(self, g_value_get_string(value));
+ break;
</ins><span class="cx"> case PROP_ATTR_WITH_GETTER_EXCEPTION:
</span><span class="cx"> webkit_dom_test_obj_set_attr_with_getter_exception(self, g_value_get_long(value));
</span><span class="cx"> break;
</span><span class="lines">@@ -351,6 +355,9 @@
</span><span class="cx"> case PROP_REFLECTED_CUSTOM_URL_ATTR:
</span><span class="cx"> g_value_take_string(value, webkit_dom_test_obj_get_reflected_custom_url_attr(self));
</span><span class="cx"> break;
</span><ins>+ case PROP_ENABLED_AT_RUNTIME_ATTRIBUTE:
+ g_value_take_string(value, webkit_dom_test_obj_get_enabled_at_runtime_attribute(self));
+ break;
</ins><span class="cx"> case PROP_ATTR_WITH_GETTER_EXCEPTION:
</span><span class="cx"> g_value_set_long(value, webkit_dom_test_obj_get_attr_with_getter_exception(self, nullptr));
</span><span class="cx"> break;
</span><span class="lines">@@ -756,6 +763,16 @@
</span><span class="cx">
</span><span class="cx"> g_object_class_install_property(
</span><span class="cx"> gobjectClass,
</span><ins>+ PROP_ENABLED_AT_RUNTIME_ATTRIBUTE,
+ g_param_spec_string(
+ "enabled-at-runtime-attribute",
+ "TestObj:enabled-at-runtime-attribute",
+ "read-write gchar* TestObj:enabled-at-runtime-attribute",
+ "",
+ WEBKIT_PARAM_READWRITE));
+
+ g_object_class_install_property(
+ gobjectClass,
</ins><span class="cx"> PROP_ATTR_WITH_GETTER_EXCEPTION,
</span><span class="cx"> g_param_spec_long(
</span><span class="cx"> "attr-with-getter-exception",
</span><span class="lines">@@ -1152,6 +1169,36 @@
</span><span class="cx"> new (priv) WebKitDOMTestObjPrivate();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void webkit_dom_test_obj_enabled_at_runtime_operation(WebKitDOMTestObj* self, const gchar* testParam)
+{
+#if ENABLE(TEST_FEATURE)
+ WebCore::JSMainThreadNullState state;
+ g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
+ g_return_if_fail(testParam);
+ WebCore::TestObj* item = WebKit::core(self);
+ WTF::String convertedTestParam = WTF::String::fromUTF8(testParam);
+ item->enabledAtRuntimeOperation(convertedTestParam);
+#else
+ UNUSED_PARAM(self);
+ UNUSED_PARAM(testParam);
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Test Feature")
+#endif /* ENABLE(TEST_FEATURE) */
+}
+
+void webkit_dom_test_obj_enabled_at_runtime_operation(WebKitDOMTestObj* self, glong testParam)
+{
+#if ENABLE(TEST_FEATURE)
+ WebCore::JSMainThreadNullState state;
+ g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
+ WebCore::TestObj* item = WebKit::core(self);
+ item->enabledAtRuntimeOperation(testParam);
+#else
+ UNUSED_PARAM(self);
+ UNUSED_PARAM(testParam);
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Test Feature")
+#endif /* ENABLE(TEST_FEATURE) */
+}
+
</ins><span class="cx"> void webkit_dom_test_obj_void_method(WebKitDOMTestObj* self)
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -2162,6 +2209,37 @@
</span><span class="cx"> item->setAttributeWithoutSynchronization(WebCore::HTMLNames::customContentURLAttrAttr, convertedValue);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+gchar* webkit_dom_test_obj_get_enabled_at_runtime_attribute(WebKitDOMTestObj* self)
+{
+#if ENABLE(TEST_FEATURE)
+ WebCore::JSMainThreadNullState state;
+ g_return_val_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self), 0);
+ WebCore::TestObj* item = WebKit::core(self);
+ gchar* result = convertToUTF8String(item->enabledAtRuntimeAttribute());
+ return result;
+#else
+ UNUSED_PARAM(self);
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Test Feature")
+ return 0;
+#endif /* ENABLE(TEST_FEATURE) */
+}
+
+void webkit_dom_test_obj_set_enabled_at_runtime_attribute(WebKitDOMTestObj* self, const gchar* value)
+{
+#if ENABLE(TEST_FEATURE)
+ WebCore::JSMainThreadNullState state;
+ g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
+ g_return_if_fail(value);
+ WebCore::TestObj* item = WebKit::core(self);
+ WTF::String convertedValue = WTF::String::fromUTF8(value);
+ item->setEnabledAtRuntimeAttribute(convertedValue);
+#else
+ UNUSED_PARAM(self);
+ UNUSED_PARAM(value);
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Test Feature")
+#endif /* ENABLE(TEST_FEATURE) */
+}
+
</ins><span class="cx"> glong webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError** error)
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h (199187 => 199188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2016-04-07 21:55:26 UTC (rev 199187)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2016-04-07 21:56:57 UTC (rev 199188)
</span><span class="lines">@@ -115,6 +115,26 @@
</span><span class="cx"> webkit_dom_test_obj_get_type(void);
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * webkit_dom_test_obj_enabled_at_runtime_operation:
+ * @self: A #WebKitDOMTestObj
+ * @testParam: A #gchar
+ *
+ * Stability: Unstable
+**/
+WEBKIT_API void
+webkit_dom_test_obj_enabled_at_runtime_operation(WebKitDOMTestObj* self, const gchar* testParam);
+
+/**
+ * webkit_dom_test_obj_enabled_at_runtime_operation:
+ * @self: A #WebKitDOMTestObj
+ * @testParam: A #glong
+ *
+ * Stability: Unstable
+**/
+WEBKIT_API void
+webkit_dom_test_obj_enabled_at_runtime_operation(WebKitDOMTestObj* self, glong testParam);
+
+/**
</ins><span class="cx"> * webkit_dom_test_obj_void_method:
</span><span class="cx"> * @self: A #WebKitDOMTestObj
</span><span class="cx"> *
</span><span class="lines">@@ -1208,6 +1228,27 @@
</span><span class="cx"> webkit_dom_test_obj_set_reflected_custom_url_attr(WebKitDOMTestObj* self, const gchar* value);
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * webkit_dom_test_obj_get_enabled_at_runtime_attribute:
+ * @self: A #WebKitDOMTestObj
+ *
+ * Returns: A #gchar
+ *
+ * Stability: Unstable
+**/
+WEBKIT_API gchar*
+webkit_dom_test_obj_get_enabled_at_runtime_attribute(WebKitDOMTestObj* self);
+
+/**
+ * webkit_dom_test_obj_set_enabled_at_runtime_attribute:
+ * @self: A #WebKitDOMTestObj
+ * @value: A #gchar
+ *
+ * Stability: Unstable
+**/
+WEBKIT_API void
+webkit_dom_test_obj_set_enabled_at_runtime_attribute(WebKitDOMTestObj* self, const gchar* value);
+
+/**
</ins><span class="cx"> * webkit_dom_test_obj_get_attr_with_getter_exception:
</span><span class="cx"> * @self: A #WebKitDOMTestObj
</span><span class="cx"> * @error: #GError
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (199187 => 199188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-04-07 21:55:26 UTC (rev 199187)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-04-07 21:56:57 UTC (rev 199188)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "JSTestSubObj.h"
</span><span class="cx"> #include "JSbool.h"
</span><span class="cx"> #include "LifecycleCallbackQueue.h"
</span><ins>+#include "RuntimeEnabledFeatures.h"
</ins><span class="cx"> #include "SVGDocument.h"
</span><span class="cx"> #include "SVGPoint.h"
</span><span class="cx"> #include "SVGStaticPropertyTearOff.h"
</span><span class="lines">@@ -91,6 +92,9 @@
</span><span class="cx">
</span><span class="cx"> // Functions
</span><span class="cx">
</span><ins>+#if ENABLE(TEST_FEATURE)
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionEnabledAtRuntimeOperation(JSC::ExecState*);
+#endif
</ins><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVoidMethod(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVoidMethodWithArgs(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionByteMethod(JSC::ExecState*);
</span><span class="lines">@@ -258,6 +262,10 @@
</span><span class="cx"> bool setJSTestObjReflectedCustomBooleanAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
</span><span class="cx"> JSC::EncodedJSValue jsTestObjReflectedCustomURLAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx"> bool setJSTestObjReflectedCustomURLAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
</span><ins>+#if ENABLE(TEST_FEATURE)
+JSC::EncodedJSValue jsTestObjEnabledAtRuntimeAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
+bool setJSTestObjEnabledAtRuntimeAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
+#endif
</ins><span class="cx"> JSC::EncodedJSValue jsTestObjTypedArrayAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx"> bool setJSTestObjTypedArrayAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
</span><span class="cx"> JSC::EncodedJSValue jsTestObjAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="lines">@@ -552,6 +560,11 @@
</span><span class="cx"> { "reflectedCustomIntegralAttr", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedCustomIntegralAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjReflectedCustomIntegralAttr) } },
</span><span class="cx"> { "reflectedCustomBooleanAttr", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedCustomBooleanAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjReflectedCustomBooleanAttr) } },
</span><span class="cx"> { "reflectedCustomURLAttr", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedCustomURLAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjReflectedCustomURLAttr) } },
</span><ins>+#if ENABLE(TEST_FEATURE)
+ { "enabledAtRuntimeAttribute", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjEnabledAtRuntimeAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjEnabledAtRuntimeAttribute) } },
+#else
+ { 0, 0, NoIntrinsic, { 0, 0 } },
+#endif
</ins><span class="cx"> { "typedArrayAttr", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjTypedArrayAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjTypedArrayAttr) } },
</span><span class="cx"> { "attrWithGetterException", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjAttrWithGetterException), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjAttrWithGetterException) } },
</span><span class="cx"> { "attrWithGetterExceptionWithMessage", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjAttrWithGetterExceptionWithMessage), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjAttrWithGetterExceptionWithMessage) } },
</span><span class="lines">@@ -619,6 +632,11 @@
</span><span class="cx"> { "attributeWithReservedEnumType", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjAttributeWithReservedEnumType), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjAttributeWithReservedEnumType) } },
</span><span class="cx"> { "putForwardsAttribute", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjPutForwardsAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjPutForwardsAttribute) } },
</span><span class="cx"> { "putForwardsNullableAttribute", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjPutForwardsNullableAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjPutForwardsNullableAttribute) } },
</span><ins>+#if ENABLE(TEST_FEATURE)
+ { "enabledAtRuntimeOperation", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionEnabledAtRuntimeOperation), (intptr_t) (1) } },
+#else
+ { 0, 0, NoIntrinsic, { 0, 0 } },
+#endif
</ins><span class="cx"> { "voidMethod", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionVoidMethod), (intptr_t) (0) } },
</span><span class="cx"> { "voidMethodWithArgs", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionVoidMethodWithArgs), (intptr_t) (3) } },
</span><span class="cx"> { "byteMethod", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionByteMethod), (intptr_t) (0) } },
</span><span class="lines">@@ -754,6 +772,18 @@
</span><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> reifyStaticProperties(vm, JSTestObjPrototypeTableValues, *this);
</span><ins>+#if ENABLE(TEST_FEATURE)
+ if (!RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled()) {
+ Identifier propertyName = Identifier::fromString(&vm, reinterpret_cast<const LChar*>("enabledAtRuntimeOperation"), strlen("enabledAtRuntimeOperation"));
+ removeDirect(vm, propertyName);
+ }
+#endif
+#if ENABLE(TEST_FEATURE)
+ if (!RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled()) {
+ Identifier propertyName = Identifier::fromString(&vm, reinterpret_cast<const LChar*>("enabledAtRuntimeAttribute"), strlen("enabledAtRuntimeAttribute"));
+ removeDirect(vm, propertyName);
+ }
+#endif
</ins><span class="cx"> JSVMClientData& clientData = *static_cast<JSVMClientData*>(vm.clientData);
</span><span class="cx"> putDirect(vm, clientData.builtinNames().privateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunctionPrivateMethod), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->iteratorSymbol, JSFunction::create(vm, globalObject(), 0, ASCIILiteral("[Symbol.Iterator]"), jsTestObjPrototypeFunctionSymbolIterator), ReadOnly | DontEnum);
</span><span class="lines">@@ -1288,6 +1318,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+#if ENABLE(TEST_FEATURE)
+EncodedJSValue jsTestObjEnabledAtRuntimeAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
+{
+ UNUSED_PARAM(state);
+ UNUSED_PARAM(thisValue);
+ JSValue decodedThisValue = JSValue::decode(thisValue);
+ auto* castedThis = jsDynamicCast<JSTestObj*>(decodedThisValue);
+ if (UNLIKELY(!castedThis)) {
+ return throwGetterTypeError(*state, "TestObj", "enabledAtRuntimeAttribute");
+ }
+ auto& impl = castedThis->wrapped();
+ JSValue result = jsStringWithCache(state, impl.enabledAtRuntimeAttribute());
+ return JSValue::encode(result);
+}
+
+#endif
+
</ins><span class="cx"> EncodedJSValue jsTestObjTypedArrayAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="lines">@@ -2482,6 +2529,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+#if ENABLE(TEST_FEATURE)
+bool setJSTestObjEnabledAtRuntimeAttribute(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
+{
+ JSValue value = JSValue::decode(encodedValue);
+ UNUSED_PARAM(thisValue);
+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThis)) {
+ return throwSetterTypeError(*state, "TestObj", "enabledAtRuntimeAttribute");
+ }
+ auto& impl = castedThis->wrapped();
+ String nativeValue = value.toString(state)->value(state);
+ if (UNLIKELY(state->hadException()))
+ return false;
+ impl.setEnabledAtRuntimeAttribute(nativeValue);
+ return true;
+}
+
+#endif
+
</ins><span class="cx"> bool setJSTestObjTypedArrayAttr(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
</span><span class="cx"> {
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="lines">@@ -3161,6 +3227,64 @@
</span><span class="cx"> return getDOMConstructor<JSTestObjConstructor>(vm, *jsCast<const JSDOMGlobalObject*>(globalObject));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TEST_FEATURE)
+static inline EncodedJSValue jsTestObjPrototypeFunctionEnabledAtRuntimeOperation1(ExecState* state)
+{
+ JSValue thisValue = state->thisValue();
+ auto castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (UNLIKELY(!castedThis))
+ return throwThisTypeError(*state, "TestObj", "enabledAtRuntimeOperation");
+ ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
+ auto& impl = castedThis->wrapped();
+ if (UNLIKELY(state->argumentCount() < 1))
+ return throwVMError(state, createNotEnoughArgumentsError(state));
+ String testParam = state->argument(0).toString(state)->value(state);
+ if (UNLIKELY(state->hadException()))
+ return JSValue::encode(jsUndefined());
+ impl.enabledAtRuntimeOperation(testParam);
+ return JSValue::encode(jsUndefined());
+}
+
+#endif
+
+#if ENABLE(TEST_FEATURE)
+static inline EncodedJSValue jsTestObjPrototypeFunctionEnabledAtRuntimeOperation2(ExecState* state)
+{
+ JSValue thisValue = state->thisValue();
+ auto castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (UNLIKELY(!castedThis))
+ return throwThisTypeError(*state, "TestObj", "enabledAtRuntimeOperation");
+ ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
+ auto& impl = castedThis->wrapped();
+ if (UNLIKELY(state->argumentCount() < 1))
+ return throwVMError(state, createNotEnoughArgumentsError(state));
+ int testParam = toInt32(state, state->argument(0), NormalConversion);
+ if (UNLIKELY(state->hadException()))
+ return JSValue::encode(jsUndefined());
+ impl.enabledAtRuntimeOperation(testParam);
+ return JSValue::encode(jsUndefined());
+}
+
+#endif
+
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionEnabledAtRuntimeOperation(ExecState* state)
+{
+ size_t argsCount = std::min<size_t>(1, state->argumentCount());
+#if ENABLE(TEST_FEATURE)
+ if (argsCount == 1)
+ return jsTestObjPrototypeFunctionEnabledAtRuntimeOperation1(state);
+#endif
+
+#if ENABLE(TEST_FEATURE)
+ if (argsCount == 1)
+ return jsTestObjPrototypeFunctionEnabledAtRuntimeOperation2(state);
+#endif
+
+ if (argsCount < 1)
+ return throwVMError(state, createNotEnoughArgumentsError(state));
+ return throwVMTypeError(state);
+}
+
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVoidMethod(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = state->thisValue();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h (199187 => 199188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h 2016-04-07 21:55:26 UTC (rev 199187)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h 2016-04-07 21:56:57 UTC (rev 199188)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> @property int reflectedCustomIntegralAttr;
</span><span class="cx"> @property BOOL reflectedCustomBooleanAttr;
</span><span class="cx"> @property (copy) NSString *reflectedCustomURLAttr;
</span><ins>+@property (copy) NSString *enabledAtRuntimeAttribute;
</ins><span class="cx"> @property int attrWithGetterException;
</span><span class="cx"> @property int attrWithGetterExceptionWithMessage;
</span><span class="cx"> @property int attrWithSetterException;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestObjmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm (199187 => 199188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2016-04-07 21:55:26 UTC (rev 199187)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2016-04-07 21:56:57 UTC (rev 199188)
</span><span class="lines">@@ -391,6 +391,20 @@
</span><span class="cx"> IMPL->setAttributeWithoutSynchronization(WebCore::HTMLNames::customContentURLAttrAttr, newReflectedCustomURLAttr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TEST_FEATURE)
+- (NSString *)enabledAtRuntimeAttribute
+{
+ WebCore::JSMainThreadNullState state;
+ return IMPL->enabledAtRuntimeAttribute();
+}
+
+- (void)setEnabledAtRuntimeAttribute:(NSString *)newEnabledAtRuntimeAttribute
+{
+ WebCore::JSMainThreadNullState state;
+ IMPL->setEnabledAtRuntimeAttribute(newEnabledAtRuntimeAttribute);
+}
+#endif
+
</ins><span class="cx"> - (int)attrWithGetterException
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -927,6 +941,26 @@
</span><span class="cx"> return kit(WTF::getPtr(IMPL->putForwardsNullableAttribute()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+#if ENABLE(TEST_FEATURE)
+- (void)enabledAtRuntimeOperation:(NSString *)testParam
+{
+ WebCore::JSMainThreadNullState state;
+ IMPL->enabledAtRuntimeOperation(testParam);
+}
+
+#endif
+
+
+#if ENABLE(TEST_FEATURE)
+- (void)enabledAtRuntimeOperation:(int)testParam
+{
+ WebCore::JSMainThreadNullState state;
+ IMPL->enabledAtRuntimeOperation(testParam);
+}
+
+#endif
+
</ins><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 (199187 => 199188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-04-07 21:55:26 UTC (rev 199187)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-04-07 21:56:57 UTC (rev 199188)
</span><span class="lines">@@ -80,6 +80,11 @@
</span><span class="cx"> [Reflect=customContentBooleanAttr] attribute boolean reflectedCustomBooleanAttr;
</span><span class="cx"> [Reflect=customContentURLAttr, URL] attribute DOMString reflectedCustomURLAttr;
</span><span class="cx">
</span><ins>+ // [EnabledAtRuntime] attributes and operations.
+ [Conditional=TEST_FEATURE, EnabledAtRuntime=TestFeature] attribute DOMString enabledAtRuntimeAttribute;
+ [Conditional=TEST_FEATURE, EnabledAtRuntime=TestFeature] void enabledAtRuntimeOperation(DOMString testParam);
+ [Conditional=TEST_FEATURE, EnabledAtRuntime=TestFeature] void enabledAtRuntimeOperation(long testParam);
+
</ins><span class="cx"> // TypedArray attribute
</span><span class="cx"> attribute Float32Array typedArrayAttr;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>