commit fd7f862f95369af57c73fcf19b52d128b0f88973
author gwt.team.jlabanca <gwt.team.jlabanca@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Feb 08 19:09:42 2008 +0000
committer gwt.team.jlabanca <gwt.team.jlabanca@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Feb 08 19:09:42 2008 +0000
tree b0555095b6bc94cc6dec93a3cb8635308783628e
parent e5fbf1c1adf3509f792030f54090187e94ed75c4

With the latest documentRoot patch, Window.getClientHeight returns the wrong value in Safari 2.  This patch figures our the current version of Safari and returns the correct value for the clientHeight.

Issue: 1400
Patch by: jlabanca, fredsa
Review by: ecc



git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@1806 8db76d5a-ed1c-0410-87a9-c151d255dfc7

user/src/com/google/gwt/user/client/impl/WindowImplSafari.java

diff --git a/user/src/com/google/gwt/user/client/impl/WindowImplSafari.java b/user/src/com/google/gwt/user/client/impl/WindowImplSafari.java
index b98d53d..75b9130 100644
--- a/user/src/com/google/gwt/user/client/impl/WindowImplSafari.java
+++ b/user/src/com/google/gwt/user/client/impl/WindowImplSafari.java
@@ -20,6 +20,17 @@
  */
 public class WindowImplSafari extends WindowImpl {
   @Override
+  public native int getClientHeight() /*-{
+    // Safari 2 and Safari 3 disagree on the clientHeight value.
+    // $wnd.devicePixelRatio is only defined in Safari 3.
+    // documentRoot.clientWidth works in both Safari 2 and 3, so we do not need
+    // an override for the width.
+    return $wnd.devicePixelRatio ?
+        @com.google.gwt.user.client.impl.DocumentRootImpl::documentRoot.clientHeight :
+        $wnd.innerHeight;
+  }-*/;
+
+  @Override
   public native int getScrollLeft() /*-{
     return $doc.body.scrollLeft;
   }-*/;