changeset 9209:294680ec2cbc 9-b76

Merge
author kcr
date Fri, 31 Jul 2015 09:59:48 -0700
parents 5a62e9d70fa0 0c0af0c28b43
children dd058ccb4ab2 410a2ea780c6
files
diffstat 16 files changed, 174 insertions(+), 148 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/java/com/sun/javafx/geom/BoxBounds.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/geom/BoxBounds.java	Fri Jul 31 09:59:48 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package com.sun.javafx.geom;
 
+import com.sun.javafx.geom.transform.Affine3D;
+
 /**
  *
  */
@@ -76,7 +78,7 @@
     }
 
     public boolean is2D() {
-        return false;
+        return (Affine3D.almostZero(minZ) && Affine3D.almostZero(maxZ));
     }
 
     /**
--- a/modules/graphics/src/main/java/com/sun/javafx/geom/transform/AffineBase.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/geom/transform/AffineBase.java	Fri Jul 31 09:59:48 2015 -0700
@@ -960,7 +960,8 @@
 
     public BaseBounds transform(BaseBounds src, BaseBounds dst) {
         // assert(APPLY_3D was dealt with at a higher level)
-        if (!src.is2D() || !dst.is2D()) {
+        if (src.getBoundsType() != BaseBounds.BoundsType.RECTANGLE ||
+                dst.getBoundsType() != BaseBounds.BoundsType.RECTANGLE) {
             return transform3DBounds(src, dst);
         }
         return transform2DBounds((RectBounds)src, (RectBounds)dst);
@@ -1899,7 +1900,8 @@
         throws NoninvertibleTransformException
     {
         // assert(APPLY_3D was dealt with at a higher level)
-        if (!src.is2D() || !dst.is2D()) {
+        if (src.getBoundsType() != BaseBounds.BoundsType.RECTANGLE ||
+                dst.getBoundsType() != BaseBounds.BoundsType.RECTANGLE) {
             return inversTransform3DBounds(src, dst);
         }
         return inversTransform2DBounds((RectBounds)src, (RectBounds)dst);
--- a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGNode.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGNode.java	Fri Jul 31 09:59:48 2015 -0700
@@ -586,9 +586,7 @@
      * RectBounds or its Z dimension is almost zero.
      */
     public boolean isContentBounds2D() {
-        return (contentBounds.is2D()
-                || (Affine3D.almostZero(contentBounds.getMaxZ())
-                && Affine3D.almostZero(contentBounds.getMinZ())));
+        return contentBounds.is2D();
     }
 
     /***************************************************************************
--- a/modules/graphics/src/test/java/com/sun/javafx/geom/BaseBoundsTest.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/graphics/src/test/java/com/sun/javafx/geom/BaseBoundsTest.java	Fri Jul 31 09:59:48 2015 -0700
@@ -75,8 +75,12 @@
         assertFalse(rectBounds.isEmpty());
 
         BoxBounds boxBounds = new BoxBounds(10, 20, 0, 20, 30, 0);
+        assertTrue(boxBounds.is2D());
+        assertTrue(boxBounds.intersects(rectBounds));
+
+        boxBounds = new BoxBounds(10, 20, 2, 20, 30, 2);
         assertFalse(boxBounds.is2D());
-        assertTrue(boxBounds.intersects(rectBounds));
+        assertFalse(boxBounds.intersects(rectBounds));
     }
 
     public @Test
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/CharacterDataImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/CharacterDataImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -4,14 +4,15 @@
 
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
 
 public class CharacterDataImpl extends NodeImpl implements CharacterData {
     CharacterDataImpl(long peer) {
         super(peer);
     }
 
-    static CharacterData getImpl(long peer) {
-        return (CharacterData)create(peer);
+    static Node getImpl(long peer) {
+        return (Node)create(peer);
     }
 
 
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/DOMWindowImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/DOMWindowImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -10,7 +10,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.css.CSSStyleDeclaration;
 import org.w3c.dom.events.Event;
-import org.w3c.dom.events.EventException;
 import org.w3c.dom.events.EventListener;
 import org.w3c.dom.events.EventTarget;
 import org.w3c.dom.views.AbstractView;
@@ -914,6 +913,16 @@
     }
     native static void setOnwaitingImpl(long peer, long value);
 
+    public EventListener getOnwheel() {
+        return EventListenerImpl.getImpl(getOnwheelImpl(getPeer()));
+    }
+    native static long getOnwheelImpl(long peer);
+
+    public void setOnwheel(EventListener value) {
+        setOnwheelImpl(getPeer(), EventListenerImpl.getPeer(value));
+    }
+    native static void setOnwheelImpl(long peer, long value);
+
     public EventListener getOnreset() {
         return EventListenerImpl.getImpl(getOnresetImpl(getPeer()));
     }
@@ -1181,42 +1190,6 @@
         , String pseudoElement);
 
 
-    public void clearTimeout(int handle)
-    {
-        clearTimeoutImpl(getPeer()
-            , handle);
-    }
-    native static void clearTimeoutImpl(long peer
-        , int handle);
-
-
-    public void clearInterval(int handle)
-    {
-        clearIntervalImpl(getPeer()
-            , handle);
-    }
-    native static void clearIntervalImpl(long peer
-        , int handle);
-
-
-    public String atob(String string) throws DOMException
-    {
-        return atobImpl(getPeer()
-            , string);
-    }
-    native static String atobImpl(long peer
-        , String string);
-
-
-    public String btoa(String string) throws DOMException
-    {
-        return btoaImpl(getPeer()
-            , string);
-    }
-    native static String btoaImpl(long peer
-        , String string);
-
-
     public void addEventListener(String type
         , EventListener listener
         , boolean useCapture)
@@ -1247,7 +1220,7 @@
         , boolean useCapture);
 
 
-    public boolean dispatchEvent(Event evt) throws EventException
+    public boolean dispatchEvent(Event evt) throws DOMException
     {
         return dispatchEventImpl(getPeer()
             , EventImpl.getPeer(evt));
@@ -1270,6 +1243,42 @@
     native static void releaseEventsImpl(long peer);
 
 
+    public String atob(String string) throws DOMException
+    {
+        return atobImpl(getPeer()
+            , string);
+    }
+    native static String atobImpl(long peer
+        , String string);
+
+
+    public String btoa(String string) throws DOMException
+    {
+        return btoaImpl(getPeer()
+            , string);
+    }
+    native static String btoaImpl(long peer
+        , String string);
+
+
+    public void clearTimeout(int handle)
+    {
+        clearTimeoutImpl(getPeer()
+            , handle);
+    }
+    native static void clearTimeoutImpl(long peer
+        , int handle);
+
+
+    public void clearInterval(int handle)
+    {
+        clearIntervalImpl(getPeer()
+            , handle);
+    }
+    native static void clearIntervalImpl(long peer
+        , int handle);
+
+
 
 //stubs
     public DocumentView getDocument() {
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/DocumentImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/DocumentImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -24,6 +24,7 @@
 import org.w3c.dom.html.HTMLCollection;
 import org.w3c.dom.html.HTMLElement;
 import org.w3c.dom.html.HTMLHeadElement;
+import org.w3c.dom.html.HTMLScriptElement;
 import org.w3c.dom.ranges.Range;
 import org.w3c.dom.stylesheets.StyleSheetList;
 import org.w3c.dom.traversal.NodeFilter;
@@ -593,6 +594,16 @@
     }
     native static void setOnsubmitImpl(long peer, long value);
 
+    public EventListener getOnwheel() {
+        return EventListenerImpl.getImpl(getOnwheelImpl(getPeer()));
+    }
+    native static long getOnwheelImpl(long peer);
+
+    public void setOnwheel(EventListener value) {
+        setOnwheelImpl(getPeer(), EventListenerImpl.getPeer(value));
+    }
+    native static void setOnwheelImpl(long peer, long value);
+
     public EventListener getOnbeforecut() {
         return EventListenerImpl.getImpl(getOnbeforecutImpl(getPeer()));
     }
@@ -723,6 +734,16 @@
     }
     native static boolean getHiddenImpl(long peer);
 
+    public HTMLScriptElement getCurrentScript() {
+        return HTMLScriptElementImpl.getImpl(getCurrentScriptImpl(getPeer()));
+    }
+    native static long getCurrentScriptImpl(long peer);
+
+    public String getOrigin() {
+        return getOriginImpl(getPeer());
+    }
+    native static String getOriginImpl(long peer);
+
 
 //functions
     public Element createElement(String tagName) throws DOMException
@@ -771,7 +792,7 @@
     public ProcessingInstruction createProcessingInstruction(String target
         , String data) throws DOMException
     {
-        return ProcessingInstructionImpl.getImpl(createProcessingInstructionImpl(getPeer()
+        return (ProcessingInstruction)ProcessingInstructionImpl.getImpl(createProcessingInstructionImpl(getPeer()
             , target
             , data));
     }
@@ -1048,15 +1069,6 @@
         , String elementName);
 
 
-    public NodeList getItems(String typeNames)
-    {
-        return NodeListImpl.getImpl(getItemsImpl(getPeer()
-            , typeNames));
-    }
-    native static long getItemsImpl(long peer
-        , String typeNames);
-
-
     public Element elementFromPoint(int x
         , int y)
     {
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/ElementImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/ElementImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -42,6 +42,16 @@
     }
     native static long getStyleImpl(long peer);
 
+    public String getId() {
+        return getIdImpl(getPeer());
+    }
+    native static String getIdImpl(long peer);
+
+    public void setId(String value) {
+        setIdImpl(getPeer(), value);
+    }
+    native static void setIdImpl(long peer, String value);
+
     public int getOffsetLeft() {
         return getOffsetLeftImpl(getPeer());
     }
@@ -477,6 +487,16 @@
     }
     native static void setOnsubmitImpl(long peer, long value);
 
+    public EventListener getOnwheel() {
+        return EventListenerImpl.getImpl(getOnwheelImpl(getPeer()));
+    }
+    native static long getOnwheelImpl(long peer);
+
+    public void setOnwheel(EventListener value) {
+        setOnwheelImpl(getPeer(), EventListenerImpl.getPeer(value));
+    }
+    native static void setOnwheelImpl(long peer, long value);
+
     public EventListener getOnbeforecut() {
         return EventListenerImpl.getImpl(getOnbeforecutImpl(getPeer()));
     }
@@ -841,13 +861,6 @@
         , String selectors);
 
 
-    public void remove() throws DOMException
-    {
-        removeImpl(getPeer());
-    }
-    native static void removeImpl(long peer);
-
-
     public void webkitRequestFullScreen(short flags)
     {
         webkitRequestFullScreenImpl(getPeer()
@@ -864,6 +877,13 @@
     native static void webkitRequestFullscreenImpl(long peer);
 
 
+    public void remove() throws DOMException
+    {
+        removeImpl(getPeer());
+    }
+    native static void removeImpl(long peer);
+
+
 
 //stubs
     public void setIdAttribute(String name, boolean isId) throws DOMException {
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/HTMLElementImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/HTMLElementImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -18,16 +18,6 @@
 
 
 //attributes
-    public String getId() {
-        return getIdImpl(getPeer());
-    }
-    native static String getIdImpl(long peer);
-
-    public void setId(String value) {
-        setIdImpl(getPeer(), value);
-    }
-    native static void setIdImpl(long peer, String value);
-
     public String getTitle() {
         return getTitleImpl(getPeer());
     }
@@ -188,26 +178,6 @@
     }
     native static void setSpellcheckImpl(long peer, boolean value);
 
-    public boolean getItemScope() {
-        return getItemScopeImpl(getPeer());
-    }
-    native static boolean getItemScopeImpl(long peer);
-
-    public void setItemScope(boolean value) {
-        setItemScopeImpl(getPeer(), value);
-    }
-    native static void setItemScopeImpl(long peer, boolean value);
-
-    public String getItemId() {
-        return getItemIdImpl(getPeer());
-    }
-    native static String getItemIdImpl(long peer);
-
-    public void setItemId(String value) {
-        setItemIdImpl(getPeer(), value);
-    }
-    native static void setItemIdImpl(long peer, String value);
-
 
 //functions
     public Element insertAdjacentElement(String where
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/HTMLIFrameElementImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/HTMLIFrameElementImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -97,16 +97,6 @@
     }
     native static void setSandboxImpl(long peer, String value);
 
-    public boolean getSeamless() {
-        return getSeamlessImpl(getPeer());
-    }
-    native static boolean getSeamlessImpl(long peer);
-
-    public void setSeamless(boolean value) {
-        setSeamlessImpl(getPeer(), value);
-    }
-    native static void setSeamlessImpl(long peer, boolean value);
-
     public String getScrolling() {
         return getScrollingImpl(getPeer());
     }
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/HTMLImageElementImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/HTMLImageElementImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -115,6 +115,16 @@
     }
     native static void setSrcImpl(long peer, String value);
 
+    public String getSrcset() {
+        return getSrcsetImpl(getPeer());
+    }
+    native static String getSrcsetImpl(long peer);
+
+    public void setSrcset(String value) {
+        setSrcsetImpl(getPeer(), value);
+    }
+    native static void setSrcsetImpl(long peer, String value);
+
     public String getUseMap() {
         return getUseMapImpl(getPeer());
     }
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/KeyboardEventImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/KeyboardEventImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -26,6 +26,11 @@
     }
     native static String getKeyIdentifierImpl(long peer);
 
+    public int getLocation() {
+        return getLocationImpl(getPeer());
+    }
+    native static int getLocationImpl(long peer);
+
     public int getKeyLocation() {
         return getKeyLocationImpl(getPeer());
     }
@@ -82,7 +87,7 @@
         , boolean cancelable
         , AbstractView view
         , String keyIdentifier
-        , int keyLocation
+        , int location
         , boolean ctrlKey
         , boolean altKey
         , boolean shiftKey
@@ -95,7 +100,7 @@
             , cancelable
             , DOMWindowImpl.getPeer(view)
             , keyIdentifier
-            , keyLocation
+            , location
             , ctrlKey
             , altKey
             , shiftKey
@@ -108,7 +113,7 @@
         , boolean cancelable
         , long view
         , String keyIdentifier
-        , int keyLocation
+        , int location
         , boolean ctrlKey
         , boolean altKey
         , boolean shiftKey
@@ -121,7 +126,7 @@
         , boolean cancelable
         , AbstractView view
         , String keyIdentifier
-        , int keyLocation
+        , int location
         , boolean ctrlKey
         , boolean altKey
         , boolean shiftKey
@@ -133,7 +138,7 @@
             , cancelable
             , DOMWindowImpl.getPeer(view)
             , keyIdentifier
-            , keyLocation
+            , location
             , ctrlKey
             , altKey
             , shiftKey
@@ -145,7 +150,7 @@
         , boolean cancelable
         , long view
         , String keyIdentifier
-        , int keyLocation
+        , int location
         , boolean ctrlKey
         , boolean altKey
         , boolean shiftKey
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/NodeImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/NodeImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -13,7 +13,6 @@
 import org.w3c.dom.NodeList;
 import org.w3c.dom.UserDataHandler;
 import org.w3c.dom.events.Event;
-import org.w3c.dom.events.EventException;
 import org.w3c.dom.events.EventListener;
 import org.w3c.dom.events.EventTarget;
 
@@ -507,7 +506,7 @@
         , boolean useCapture);
 
 
-    public boolean dispatchEvent(Event event) throws EventException
+    public boolean dispatchEvent(Event event) throws DOMException
     {
         return dispatchEventImpl(getPeer()
             , EventImpl.getPeer(event));
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/ProcessingInstructionImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/ProcessingInstructionImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -2,17 +2,17 @@
 
 package com.sun.webkit.dom;
 
-import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
 import org.w3c.dom.ProcessingInstruction;
 import org.w3c.dom.stylesheets.StyleSheet;
 
-public class ProcessingInstructionImpl extends NodeImpl implements ProcessingInstruction {
+public class ProcessingInstructionImpl extends CharacterDataImpl implements ProcessingInstruction {
     ProcessingInstructionImpl(long peer) {
         super(peer);
     }
 
-    static ProcessingInstruction getImpl(long peer) {
-        return (ProcessingInstruction)create(peer);
+    static Node getImpl(long peer) {
+        return (Node)create(peer);
     }
 
 
@@ -22,16 +22,6 @@
     }
     native static String getTargetImpl(long peer);
 
-    public String getData() {
-        return getDataImpl(getPeer());
-    }
-    native static String getDataImpl(long peer);
-
-    public void setData(String value) throws DOMException {
-        setDataImpl(getPeer(), value);
-    }
-    native static void setDataImpl(long peer, String value);
-
     public StyleSheet getSheet() {
         return StyleSheetImpl.getImpl(getSheetImpl(getPeer()));
     }
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/RangeImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/RangeImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -8,7 +8,6 @@
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Node;
 import org.w3c.dom.ranges.Range;
-import org.w3c.dom.ranges.RangeException;
 
 public class RangeImpl implements Range {
     private static class SelfDisposer implements DisposerRecord {
@@ -106,7 +105,7 @@
 
 //functions
     public void setStart(Node refNode
-        , int offset) throws RangeException, DOMException
+        , int offset) throws DOMException
     {
         setStartImpl(getPeer()
             , NodeImpl.getPeer(refNode)
@@ -118,7 +117,7 @@
 
 
     public void setEnd(Node refNode
-        , int offset) throws RangeException, DOMException
+        , int offset) throws DOMException
     {
         setEndImpl(getPeer()
             , NodeImpl.getPeer(refNode)
@@ -129,7 +128,7 @@
         , int offset);
 
 
-    public void setStartBefore(Node refNode) throws RangeException, DOMException
+    public void setStartBefore(Node refNode) throws DOMException
     {
         setStartBeforeImpl(getPeer()
             , NodeImpl.getPeer(refNode));
@@ -138,7 +137,7 @@
         , long refNode);
 
 
-    public void setStartAfter(Node refNode) throws RangeException, DOMException
+    public void setStartAfter(Node refNode) throws DOMException
     {
         setStartAfterImpl(getPeer()
             , NodeImpl.getPeer(refNode));
@@ -147,7 +146,7 @@
         , long refNode);
 
 
-    public void setEndBefore(Node refNode) throws RangeException, DOMException
+    public void setEndBefore(Node refNode) throws DOMException
     {
         setEndBeforeImpl(getPeer()
             , NodeImpl.getPeer(refNode));
@@ -156,7 +155,7 @@
         , long refNode);
 
 
-    public void setEndAfter(Node refNode) throws RangeException, DOMException
+    public void setEndAfter(Node refNode) throws DOMException
     {
         setEndAfterImpl(getPeer()
             , NodeImpl.getPeer(refNode));
@@ -174,7 +173,7 @@
         , boolean toStart);
 
 
-    public void selectNode(Node refNode) throws RangeException, DOMException
+    public void selectNode(Node refNode) throws DOMException
     {
         selectNodeImpl(getPeer()
             , NodeImpl.getPeer(refNode));
@@ -183,7 +182,7 @@
         , long refNode);
 
 
-    public void selectNodeContents(Node refNode) throws RangeException, DOMException
+    public void selectNodeContents(Node refNode) throws DOMException
     {
         selectNodeContentsImpl(getPeer()
             , NodeImpl.getPeer(refNode));
@@ -225,7 +224,7 @@
     native static long cloneContentsImpl(long peer);
 
 
-    public void insertNode(Node newNode) throws DOMException, RangeException
+    public void insertNode(Node newNode) throws DOMException
     {
         insertNodeImpl(getPeer()
             , NodeImpl.getPeer(newNode));
@@ -234,7 +233,7 @@
         , long newNode);
 
 
-    public void surroundContents(Node newParent) throws DOMException, RangeException
+    public void surroundContents(Node newParent) throws DOMException
     {
         surroundContentsImpl(getPeer()
             , NodeImpl.getPeer(newParent));
@@ -273,7 +272,7 @@
         , String html);
 
 
-    public boolean intersectsNode(Node refNode) throws RangeException, DOMException
+    public boolean intersectsNode(Node refNode) throws DOMException
     {
         return intersectsNodeImpl(getPeer()
             , NodeImpl.getPeer(refNode));
@@ -282,7 +281,7 @@
         , long refNode);
 
 
-    public short compareNode(Node refNode) throws RangeException, DOMException
+    public short compareNode(Node refNode) throws DOMException
     {
         return compareNodeImpl(getPeer()
             , NodeImpl.getPeer(refNode));
@@ -292,7 +291,7 @@
 
 
     public short comparePoint(Node refNode
-        , int offset) throws RangeException, DOMException
+        , int offset) throws DOMException
     {
         return comparePointImpl(getPeer()
             , NodeImpl.getPeer(refNode)
@@ -304,7 +303,7 @@
 
 
     public boolean isPointInRange(Node refNode
-        , int offset) throws RangeException, DOMException
+        , int offset) throws DOMException
     {
         return isPointInRangeImpl(getPeer()
             , NodeImpl.getPeer(refNode)
@@ -315,7 +314,7 @@
         , int offset);
 
 
-    public void expand(String unit) throws RangeException, DOMException
+    public void expand(String unit) throws DOMException
     {
         expandImpl(getPeer()
             , unit);
--- a/modules/web/src/main/java-wrappers/com/sun/webkit/dom/WheelEventImpl.java	Thu Jul 30 02:07:52 2015 -0700
+++ b/modules/web/src/main/java-wrappers/com/sun/webkit/dom/WheelEventImpl.java	Fri Jul 31 09:59:48 2015 -0700
@@ -20,6 +20,26 @@
     public static final int DOM_DELTA_PAGE = 0x02;
 
 //attributes
+    public double getDeltaX() {
+        return getDeltaXImpl(getPeer());
+    }
+    native static double getDeltaXImpl(long peer);
+
+    public double getDeltaY() {
+        return getDeltaYImpl(getPeer());
+    }
+    native static double getDeltaYImpl(long peer);
+
+    public double getDeltaZ() {
+        return getDeltaZImpl(getPeer());
+    }
+    native static double getDeltaZImpl(long peer);
+
+    public int getDeltaMode() {
+        return getDeltaModeImpl(getPeer());
+    }
+    native static int getDeltaModeImpl(long peer);
+
     public int getWheelDeltaX() {
         return getWheelDeltaXImpl(getPeer());
     }
@@ -30,11 +50,6 @@
     }
     native static int getWheelDeltaYImpl(long peer);
 
-    public int getDeltaMode() {
-        return getDeltaModeImpl(getPeer());
-    }
-    native static int getDeltaModeImpl(long peer);
-
     public int getWheelDelta() {
         return getWheelDeltaImpl(getPeer());
     }