Merge branch 'master' into root-cleanup

Conflicts:
	server/src/com/vaadin/terminal/DeploymentConfiguration.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java

1 files changed, 0 insertions, 26 deletions

diff --git a/src/com/google/gwt/dom/client/VaadinDOMImplSafari.java b/src/com/google/gwt/dom/client/VaadinDOMImplSafari.java
deleted file mode 100644
index 6e9cc81f43..0000000000
--- a/src/com/google/gwt/dom/client/VaadinDOMImplSafari.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-@VaadinApache2LicenseForJavaFiles@
- */
-package com.google.gwt.dom.client;
-
-/**
- * Overridden to workaround GWT issue #6194. Remove this when updating to a
- * newer GWT that fixes the problem (2.3.0 possibly). Must be in this package as
- * the whole DOMImpl hierarchy is package private and I really did not want to
- * copy all the parent classes into this one...
- */
-class VaadinDOMImplSafari extends DOMImplSafari {
-    @Override
-    public int getAbsoluteLeft(Element elem) {
-        // Chrome returns a float in certain cases (at least when zoom != 100%).
-        // The |0 ensures it is converted to an int.
-        return super.getAbsoluteLeft(elem) | 0;
-    }
-
-    @Override
-    public int getAbsoluteTop(Element elem) {
-        // Chrome returns a float in certain cases (at least when zoom != 100%).
-        // The |0 ensures it is converted to an int.
-        return super.getAbsoluteTop(elem) | 0;
-    }
-}