From 9a8423b643a8ce99e5642f2548600f9125382e89 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 28 Feb 2012 18:42:02 -0800
Subject: Fix iframe, for reals!

Change-Id: I588aa5709e7a3c2ced9479c3cf9c1827bf6f7733
---
 Source/WebCore/page/DOMWindow.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'Source/WebCore/page/DOMWindow.cpp')

diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
index c7f162a..ee2206b 100644
--- a/Source/WebCore/page/DOMWindow.cpp
+++ b/Source/WebCore/page/DOMWindow.cpp
@@ -1095,11 +1095,7 @@ int DOMWindow::innerHeight() const
     if (!view)
         return 0;
     
-#if PLATFORM(ANDROID)
-    return static_cast<int>(view->actualHeight() / m_frame->pageZoomFactor());
-#else
     return static_cast<int>(view->height() / m_frame->pageZoomFactor());
-#endif
 }
 
 int DOMWindow::innerWidth() const
@@ -1111,11 +1107,7 @@ int DOMWindow::innerWidth() const
     if (!view)
         return 0;
 
-#if PLATFORM(ANDROID)
-    return static_cast<int>(view->actualWidth() / m_frame->pageZoomFactor());
-#else
     return static_cast<int>(view->width() / m_frame->pageZoomFactor());
-#endif
 }
 
 int DOMWindow::screenX() const
@@ -1153,11 +1145,7 @@ int DOMWindow::scrollX() const
 
     m_frame->document()->updateLayoutIgnorePendingStylesheets();
 
-#if PLATFORM(ANDROID)
-    return static_cast<int>(view->actualScrollX() / m_frame->pageZoomFactor());
-#else
     return static_cast<int>(view->scrollX() / m_frame->pageZoomFactor());
-#endif
 }
 
 int DOMWindow::scrollY() const
@@ -1171,11 +1159,7 @@ int DOMWindow::scrollY() const
 
     m_frame->document()->updateLayoutIgnorePendingStylesheets();
 
-#if PLATFORM(ANDROID)
-    return static_cast<int>(view->actualScrollY() / m_frame->pageZoomFactor());
-#else
     return static_cast<int>(view->scrollY() / m_frame->pageZoomFactor());
-#endif
 }
 
 bool DOMWindow::closed() const
-- 
cgit v1.1