From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 22 May 2012 13:07:32 +0000 (+0000)
Subject: Remove clientHeight/Width from WebBrowser (#5655)
X-Git-Tag: 7.0.0.alpha3~144^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e7f31596e7a13c297988ec5c687e1b681420b243;p=vaadin-framework.git

Remove clientHeight/Width from WebBrowser (#5655)

svn changeset:23792/svn branch:6.8
---

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
index 2ac574c2de..0a8e9530f0 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
@@ -578,8 +578,6 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
             browser.updateClientSideDetails(
                     getHTTPRequestParameter(request, "sw"),
                     getHTTPRequestParameter(request, "sh"),
-                    getHTTPRequestParameter(request, "cw"),
-                    getHTTPRequestParameter(request, "ch"),
                     getHTTPRequestParameter(request, "tzo"),
                     getHTTPRequestParameter(request, "rtzo"),
                     getHTTPRequestParameter(request, "dstd"),
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 68089e18e0..54ea4a94ed 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -603,8 +603,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                 request.getHeader("user-agent"));
         if (request.getParameter("repaintAll") != null) {
             browser.updateClientSideDetails(request.getParameter("sw"),
-                    request.getParameter("sh"), request.getParameter("cw"),
-                    request.getParameter("ch"), request.getParameter("tzo"),
+                    request.getParameter("sh"), request.getParameter("tzo"),
                     request.getParameter("rtzo"), request.getParameter("dstd"),
                     request.getParameter("dston"),
                     request.getParameter("curdate"),
diff --git a/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
index a57a4c65d2..9182ebdc03 100644
--- a/src/com/vaadin/terminal/gwt/server/WebBrowser.java
+++ b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
@@ -22,8 +22,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;
@@ -64,30 +62,6 @@ public class WebBrowser implements Terminal {
         return screenWidth;
     }
 
-    /**
-     * 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.
      * 
@@ -338,10 +312,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
@@ -354,9 +324,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);
@@ -365,14 +335,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
diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java b/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java
index eacf2a0e53..a3f11f2cd3 100644
--- a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java
+++ b/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java
@@ -21,8 +21,10 @@ public class WebBrowserSizeTest extends TestBase {
             public void buttonClick(ClickEvent event) {
                 screenSizeLabel.setValue(getBrowser().getScreenWidth() + " x "
                         + getBrowser().getScreenHeight());
-                browserSizeLabel.setValue(getBrowser().getClientWidth() + " x "
-                        + getBrowser().getClientHeight());
+                browserSizeLabel.setValue(getMainWindow()
+                        .getBrowserWindowWidth()
+                        + " x "
+                        + getMainWindow().getBrowserWindowHeight());
             }
         });