Merge commit 'e7f31'

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

1 files changed, 3 insertions, 41 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
index 358f6f38fb..8e07ff4fe5 100644
--- a/src/com/vaadin/terminal/gwt/server/WebBrowser.java
+++ b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
@@ -23,8 +23,6 @@ public class WebBrowser implements Terminal {
 
     private int screenHeight = 0;
     private int screenWidth = 0;
-    private int clientHeight = 0;
-    private int clientWidth = 0;
     private String browserApplication = null;
     private Locale locale;
     private String address;
@@ -66,30 +64,6 @@ public class WebBrowser implements Terminal {
     }
 
     /**
-     * Gets the height of the client (browser window).
-     * <p>
-     * Note that the client size is only updated on a full repaint, not when the
-     * browser window size changes
-     * 
-     * @return The height of the client or 0 if unknown.
-     */
-    public int getClientHeight() {
-        return clientHeight;
-    }
-
-    /**
-     * Gets the width of the client (browser window)
-     * <p>
-     * Note that the client size is only updated on a full repaint, not when the
-     * browser window size changes
-     * 
-     * @return The width of the client or 0 if unknown.
-     */
-    public int getClientWidth() {
-        return clientWidth;
-    }
-
-    /**
      * Get the browser user-agent string.
      * 
      * @return The raw browser userAgent string
@@ -367,10 +341,6 @@ public class WebBrowser implements Terminal {
      *            Screen width
      * @param sh
      *            Screen height
-     * @param cw
-     *            Client width
-     * @param ch
-     *            Client height
      * @param tzo
      *            TimeZone offset in minutes from GMT
      * @param rtzo
@@ -383,9 +353,9 @@ public class WebBrowser implements Terminal {
      *            the current date in milliseconds since the epoch
      * @param touchDevice
      */
-    void updateClientSideDetails(String sw, String sh, String cw, String ch,
-            String tzo, String rtzo, String dstSavings, String dstInEffect,
-            String curDate, boolean touchDevice) {
+    void updateClientSideDetails(String sw, String sh, String tzo, String rtzo,
+            String dstSavings, String dstInEffect, String curDate,
+            boolean touchDevice) {
         if (sw != null) {
             try {
                 screenHeight = Integer.parseInt(sh);
@@ -394,14 +364,6 @@ public class WebBrowser implements Terminal {
                 screenHeight = screenWidth = 0;
             }
         }
-        if (cw != null) {
-            try {
-                clientHeight = Integer.parseInt(ch);
-                clientWidth = Integer.parseInt(cw);
-            } catch (final NumberFormatException e) {
-                clientHeight = clientWidth = 0;
-            }
-        }
         if (tzo != null) {
             try {
                 // browser->java conversion: min->ms, reverse sign