diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 15:40:26 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 12:24:52 +0100 |
| commit | 4661b323d4bfa799928ba102f29ce8be00fb5dfa (patch) | |
| tree | a30650314eeb17a20dcd827ebf5a7516330e7395 /WebCore/page/DOMWindow.cpp | |
| parent | 5af96e2c7b73ebc627c6894727826a7576d31758 (diff) | |
| download | external_webkit-4661b323d4bfa799928ba102f29ce8be00fb5dfa.zip external_webkit-4661b323d4bfa799928ba102f29ce8be00fb5dfa.tar.gz external_webkit-4661b323d4bfa799928ba102f29ce8be00fb5dfa.tar.bz2 | |
Merge webkit.org at r60469 : Fix conflicts.
The changes to DomWindow.cpp are needed by @60104 moving things from the frame to the FrameView
http://trac.webkit.org/changeset/60104
Change-Id: I8a7aa0478c2f0239bc52bb5078c446e5c8c84972
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 7f3151d..9532ec9 100644 --- a/WebCore/page/DOMWindow.cpp +++ b/WebCore/page/DOMWindow.cpp @@ -954,15 +954,11 @@ int DOMWindow::innerHeight() const if (!view) return 0; -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualHeight() / m_frame->pageZoomFactor()); + return static_cast<int>(view->actualHeight() / view->pageZoomFactor()); #else - return static_cast<int>(view->height() / m_frame->pageZoomFactor()); -#endif -======= return static_cast<int>(view->height() / view->pageZoomFactor()); ->>>>>>> webkit.org at r60469 +#endif } int DOMWindow::innerWidth() const @@ -974,15 +970,11 @@ int DOMWindow::innerWidth() const if (!view) return 0; -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualWidth() / m_frame->pageZoomFactor()); + return static_cast<int>(view->actualWidth() / view->pageZoomFactor()); #else - return static_cast<int>(view->width() / m_frame->pageZoomFactor()); -#endif -======= return static_cast<int>(view->width() / view->pageZoomFactor()); ->>>>>>> webkit.org at r60469 +#endif } int DOMWindow::screenX() const @@ -1020,15 +1012,11 @@ int DOMWindow::scrollX() const m_frame->document()->updateLayoutIgnorePendingStylesheets(); -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualScrollX() / m_frame->pageZoomFactor()); + return static_cast<int>(view->actualScrollX() / view->pageZoomFactor()); #else - return static_cast<int>(view->scrollX() / m_frame->pageZoomFactor()); -#endif -======= return static_cast<int>(view->scrollX() / view->pageZoomFactor()); ->>>>>>> webkit.org at r60469 +#endif } int DOMWindow::scrollY() const @@ -1042,15 +1030,11 @@ int DOMWindow::scrollY() const m_frame->document()->updateLayoutIgnorePendingStylesheets(); -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualScrollY() / m_frame->pageZoomFactor()); + return static_cast<int>(view->actualScrollY() / view->pageZoomFactor()); #else - return static_cast<int>(view->scrollY() / m_frame->pageZoomFactor()); -#endif -======= return static_cast<int>(view->scrollY() / view->pageZoomFactor()); ->>>>>>> webkit.org at r60469 +#endif } bool DOMWindow::closed() const |