Title: [134254] trunk/Source/WebCore
Revision
134254
Author
[email protected]
Date
2012-11-12 10:19:51 -0800 (Mon, 12 Nov 2012)

Log Message

Unreviewed, rolling out r134225.
http://trac.webkit.org/changeset/134225
https://bugs.webkit.org/show_bug.cgi?id=101948

Appears to have broken the EFL and GTK builds (Requested by
abarth on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-11-12

* bindings/js/JSHTMLElementCustom.cpp:
(WebCore):
(WebCore::JSHTMLElement::itemValue):
(WebCore::JSHTMLElement::setItemValue):
* bindings/v8/custom/V8HTMLElementCustom.cpp:
(WebCore):
(WebCore::V8HTMLElement::itemValueAccessorGetter):
(WebCore::V8HTMLElement::itemValueAccessorSetter):
* html/HTMLElement.idl:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (134253 => 134254)


--- trunk/Source/WebCore/ChangeLog	2012-11-12 18:13:09 UTC (rev 134253)
+++ trunk/Source/WebCore/ChangeLog	2012-11-12 18:19:51 UTC (rev 134254)
@@ -1,3 +1,22 @@
+2012-11-12  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r134225.
+        http://trac.webkit.org/changeset/134225
+        https://bugs.webkit.org/show_bug.cgi?id=101948
+
+        Appears to have broken the EFL and GTK builds (Requested by
+        abarth on #webkit).
+
+        * bindings/js/JSHTMLElementCustom.cpp:
+        (WebCore):
+        (WebCore::JSHTMLElement::itemValue):
+        (WebCore::JSHTMLElement::setItemValue):
+        * bindings/v8/custom/V8HTMLElementCustom.cpp:
+        (WebCore):
+        (WebCore::V8HTMLElement::itemValueAccessorGetter):
+        (WebCore::V8HTMLElement::itemValueAccessorSetter):
+        * html/HTMLElement.idl:
+
 2012-11-12  Allan Sandfeld Jensen  <[email protected]>
 
         hitTestResultAtPoint does two hit-tests if called on non main frame

Modified: trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp (134253 => 134254)


--- trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp	2012-11-12 18:13:09 UTC (rev 134253)
+++ trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp	2012-11-12 18:19:51 UTC (rev 134254)
@@ -53,4 +53,20 @@
     return JSWithScope::create(exec, asObject(toJS(exec, globalObject(), element)), scope);
 }
 
+#if ENABLE(MICRODATA)
+JSValue JSHTMLElement::itemValue(ExecState* exec) const
+{
+    HTMLElement* element = impl();
+    return toJS(exec, globalObject(), WTF::getPtr(element->itemValue()));
+}
+
+void JSHTMLElement::setItemValue(ExecState* exec, JSValue value)
+{
+    HTMLElement* imp = impl();
+    ExceptionCode ec = 0;
+    imp->setItemValue(valueToStringWithNullCheck(exec, value), ec);
+    setDOMException(exec, ec);
+}
+#endif
+
 } // namespace WebCore

Modified: trunk/Source/WebCore/bindings/v8/custom/V8HTMLElementCustom.cpp (134253 => 134254)


--- trunk/Source/WebCore/bindings/v8/custom/V8HTMLElementCustom.cpp	2012-11-12 18:13:09 UTC (rev 134253)
+++ trunk/Source/WebCore/bindings/v8/custom/V8HTMLElementCustom.cpp	2012-11-12 18:19:51 UTC (rev 134254)
@@ -47,4 +47,21 @@
     return createV8HTMLWrapper(impl, creationContext, isolate);
 }
 
+#if ENABLE(MICRODATA)
+v8::Handle<v8::Value> V8HTMLElement::itemValueAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
+{
+    HTMLElement* impl = V8HTMLElement::toNative(info.Holder());
+    return toV8(impl->itemValue().get(), info.Holder(), info.GetIsolate());
+}
+
+void V8HTMLElement::itemValueAccessorSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
+{
+    HTMLElement* impl = V8HTMLElement::toNative(info.Holder());
+    ExceptionCode ec = 0;
+    impl->setItemValue(toWebCoreString(value), ec);
+    if (ec)
+        setDOMException(ec, info.GetIsolate());
+}
+#endif
+
 } // namespace WebCore

Modified: trunk/Source/WebCore/html/HTMLElement.idl (134253 => 134254)


--- trunk/Source/WebCore/html/HTMLElement.idl	2012-11-12 18:13:09 UTC (rev 134253)
+++ trunk/Source/WebCore/html/HTMLElement.idl	2012-11-12 18:19:51 UTC (rev 134254)
@@ -78,10 +78,12 @@
 #endif
 #endif
 
-#if defined(LANGUAGE_JAVASCRIPT) || LANGUAGE_JAVASCRIPT
-    [Conditional=MICRODATA] attribute DOMObject itemValue
-        setter raises(DOMException);
+#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
+#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
+             [Conditional=MICRODATA, Custom] attribute DOMObject itemValue
+                 setter raises(DOMException);
 #endif
+#endif
 
 #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
     readonly attribute DOMString titleDisplayString;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to