diff options
Diffstat (limited to 'WebCore/page/DOMWindow.cpp')
| -rw-r--r-- | WebCore/page/DOMWindow.cpp | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp index 310ab25..afd6bc7 100644 --- a/WebCore/page/DOMWindow.cpp +++ b/WebCore/page/DOMWindow.cpp @@ -1053,15 +1053,11 @@ int DOMWindow::innerHeight() const if (!view) return 0; -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualHeight() / view->pageZoomFactor()); + return static_cast<int>(view->actualHeight() / m_frame->pageZoomFactor()); #else - return static_cast<int>(view->height() / view->pageZoomFactor()); -#endif -======= return static_cast<int>(view->height() / m_frame->pageZoomFactor()); ->>>>>>> webkit.org at r67908 +#endif } int DOMWindow::innerWidth() const @@ -1073,15 +1069,11 @@ int DOMWindow::innerWidth() const if (!view) return 0; -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualWidth() / view->pageZoomFactor()); + return static_cast<int>(view->actualWidth() / m_frame->pageZoomFactor()); #else - return static_cast<int>(view->width() / view->pageZoomFactor()); -#endif -======= return static_cast<int>(view->width() / m_frame->pageZoomFactor()); ->>>>>>> webkit.org at r67908 +#endif } int DOMWindow::screenX() const @@ -1119,15 +1111,11 @@ int DOMWindow::scrollX() const m_frame->document()->updateLayoutIgnorePendingStylesheets(); -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualScrollX() / view->pageZoomFactor()); + return static_cast<int>(view->actualScrollX() / m_frame->pageZoomFactor()); #else - return static_cast<int>(view->scrollX() / view->pageZoomFactor()); -#endif -======= return static_cast<int>(view->scrollX() / m_frame->pageZoomFactor()); ->>>>>>> webkit.org at r67908 +#endif } int DOMWindow::scrollY() const @@ -1141,15 +1129,11 @@ int DOMWindow::scrollY() const m_frame->document()->updateLayoutIgnorePendingStylesheets(); -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualScrollY() / view->pageZoomFactor()); + return static_cast<int>(view->actualScrollY() / m_frame->pageZoomFactor()); #else - return static_cast<int>(view->scrollY() / view->pageZoomFactor()); -#endif -======= return static_cast<int>(view->scrollY() / m_frame->pageZoomFactor()); ->>>>>>> webkit.org at r67908 +#endif } bool DOMWindow::closed() const |