2 files changed, 0 insertions, 21 deletions
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
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index a79910b..f332074 100644
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -1738,11 +1738,6 @@ void FrameView::scheduleRelayout()
     if (!m_frame->document()->shouldScheduleLayout())
         return;
 
-#ifdef ANDROID_FLATTEN_FRAMESET
-    if (m_frame->ownerRenderer())
-        m_frame->ownerRenderer()->setNeedsLayoutAndPrefWidthsRecalc();
-#endif
-
     // When frame flattening is enabled, the contents of the frame affects layout of the parent frames.
     // Also invalidate parent frame starting from the owner element of this frame.
     if (m_frame->settings() && m_frame->settings()->frameFlatteningEnabled() && m_frame->ownerRenderer()) {