# HG changeset patch
# User ilya.dergalin@oracle.com
# Date 1444088324 -10800
#      Tue Oct 06 02:38:44 2015 +0300
# Node ID b19cbeb53a700386643a34a16f3e5c1098ce722d
# Parent  440c0ceb7197f753073995428096326f07bd06ff
Fix for JDK-8134470

diff -r 440c0ceb7197 -r b19cbeb53a70 modules/web/src/main/native/Source/WebCore/mapfile-macosx
--- a/modules/web/src/main/native/Source/WebCore/mapfile-macosx	Wed Sep 02 23:36:50 2015 +0300
+++ b/modules/web/src/main/native/Source/WebCore/mapfile-macosx	Tue Oct 06 02:38:44 2015 +0300
@@ -611,6 +611,7 @@
                _Java_com_sun_webkit_dom_ElementImpl_getElementsByTagNameImpl
                _Java_com_sun_webkit_dom_ElementImpl_getElementsByTagNameNSImpl
                _Java_com_sun_webkit_dom_ElementImpl_getFirstElementChildImpl
+               _Java_com_sun_webkit_dom_ElementImpl_getIdImpl
                _Java_com_sun_webkit_dom_ElementImpl_getLastElementChildImpl
                _Java_com_sun_webkit_dom_ElementImpl_getNextElementSiblingImpl
                _Java_com_sun_webkit_dom_ElementImpl_getOffsetHeightImpl
@@ -688,6 +689,7 @@
                _Java_com_sun_webkit_dom_ElementImpl_setAttributeNodeImpl
                _Java_com_sun_webkit_dom_ElementImpl_setAttributeNodeNSImpl
                _Java_com_sun_webkit_dom_ElementImpl_setClassNameImpl
+               _Java_com_sun_webkit_dom_ElementImpl_setIdImpl
                _Java_com_sun_webkit_dom_ElementImpl_setOnabortImpl
                _Java_com_sun_webkit_dom_ElementImpl_setOnbeforecopyImpl
                _Java_com_sun_webkit_dom_ElementImpl_setOnbeforecutImpl
diff -r 440c0ceb7197 -r b19cbeb53a70 modules/web/src/main/native/Source/WebCore/mapfile-vers
--- a/modules/web/src/main/native/Source/WebCore/mapfile-vers	Wed Sep 02 23:36:50 2015 +0300
+++ b/modules/web/src/main/native/Source/WebCore/mapfile-vers	Tue Oct 06 02:38:44 2015 +0300
@@ -6,7 +6,7 @@
                WTFReportAssertionFailure;
                _ZN3WTF10fastMallocEj;
                _ZN3WTF10fastMallocEm;
-               _ZN3WTF8fastFreeEPv;	       
+               _ZN3WTF8fastFreeEPv;
                _ZN3WTF11currentTimeEv;
                JSCheckScriptSyntax;
                JSClassCreate;
@@ -613,6 +613,7 @@
                Java_com_sun_webkit_dom_ElementImpl_getElementsByTagNameImpl;
                Java_com_sun_webkit_dom_ElementImpl_getElementsByTagNameNSImpl;
                Java_com_sun_webkit_dom_ElementImpl_getFirstElementChildImpl;
+               Java_com_sun_webkit_dom_ElementImpl_getIdImpl;
                Java_com_sun_webkit_dom_ElementImpl_getLastElementChildImpl;
                Java_com_sun_webkit_dom_ElementImpl_getNextElementSiblingImpl;
                Java_com_sun_webkit_dom_ElementImpl_getOffsetHeightImpl;
@@ -690,6 +691,7 @@
                Java_com_sun_webkit_dom_ElementImpl_setAttributeNodeImpl;
                Java_com_sun_webkit_dom_ElementImpl_setAttributeNodeNSImpl;
                Java_com_sun_webkit_dom_ElementImpl_setClassNameImpl;
+               Java_com_sun_webkit_dom_ElementImpl_setIdImpl;
                Java_com_sun_webkit_dom_ElementImpl_setOnabortImpl;
                Java_com_sun_webkit_dom_ElementImpl_setOnbeforecopyImpl;
                Java_com_sun_webkit_dom_ElementImpl_setOnbeforecutImpl;
diff -r 440c0ceb7197 -r b19cbeb53a70 modules/web/src/test/java/javafx/scene/web/DOMTest.java
--- a/modules/web/src/test/java/javafx/scene/web/DOMTest.java	Wed Sep 02 23:36:50 2015 +0300
+++ b/modules/web/src/test/java/javafx/scene/web/DOMTest.java	Tue Oct 06 02:38:44 2015 +0300
@@ -49,6 +49,25 @@
  */
 public class DOMTest extends TestBase {
 
+        @Test public void testGetSetId() {
+        final Document doc = getDocumentFor("src/test/resources/html/dom.html");
+        submit(() -> {
+            NodeList ee = doc.getElementsByTagName("p");
+
+            int numProcessed = 0;
+                for (int i = 0 ; i < ee.getLength() ; i++) {
+                    Node n = ee.item(i);
+                    String s = ((ElementImpl)n).getId();
+                    String newId = "new" + s;
+                    ((ElementImpl)n).setId(newId);
+                    assertEquals("New element id", newId, ((ElementImpl)n).getId());
+                    numProcessed++;
+                }
+
+            assertTrue("Number of processed Elements is equal to 0", numProcessed > 0);
+        });
+    }
+
     @Test public void testEmptyTextContent() {
         final Document doc = getDocumentFor("src/test/resources/html/dom.html");
         submit(() -> {