diff options
| author | John Reck <jreck@google.com> | 2012-02-28 18:42:02 -0800 |
|---|---|---|
| committer | Nicolas Roard <nicolasroard@google.com> | 2012-03-01 16:38:55 -0800 |
| commit | 9a8423b643a8ce99e5642f2548600f9125382e89 (patch) | |
| tree | 1121fb39001bead0e89edd593b40a16a0397d710 /Source/WebCore/page/DOMWindow.cpp | |
| parent | bd4ee4debb53cea094c09b198f7ba4e8307a2998 (diff) | |
| download | external_webkit-9a8423b643a8ce99e5642f2548600f9125382e89.zip external_webkit-9a8423b643a8ce99e5642f2548600f9125382e89.tar.gz external_webkit-9a8423b643a8ce99e5642f2548600f9125382e89.tar.bz2 | |
Fix iframe, for reals!
Change-Id: I588aa5709e7a3c2ced9479c3cf9c1827bf6f7733
Diffstat (limited to 'Source/WebCore/page/DOMWindow.cpp')
| -rw-r--r-- | Source/WebCore/page/DOMWindow.cpp | 16 |
1 files changed, 0 insertions, 16 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 |