| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 | 525 |
| 526 int LocalDOMWindow::innerHeight() const | 526 int LocalDOMWindow::innerHeight() const |
| 527 { | 527 { |
| 528 if (!m_frame) | 528 if (!m_frame) |
| 529 return 0; | 529 return 0; |
| 530 | 530 |
| 531 FrameView* view = m_frame->view(); | 531 FrameView* view = m_frame->view(); |
| 532 if (!view) | 532 if (!view) |
| 533 return 0; | 533 return 0; |
| 534 | 534 |
| 535 return adjustForAbsoluteZoom(view->visibleContentRect(IncludeScrollbars).hei
ght(), m_frame->pageZoomFactor()); | 535 return view->visibleContentRect(IncludeScrollbars).height(); |
| 536 } | 536 } |
| 537 | 537 |
| 538 int LocalDOMWindow::innerWidth() const | 538 int LocalDOMWindow::innerWidth() const |
| 539 { | 539 { |
| 540 if (!m_frame) | 540 if (!m_frame) |
| 541 return 0; | 541 return 0; |
| 542 | 542 |
| 543 FrameView* view = m_frame->view(); | 543 FrameView* view = m_frame->view(); |
| 544 if (!view) | 544 if (!view) |
| 545 return 0; | 545 return 0; |
| 546 | 546 |
| 547 return adjustForAbsoluteZoom(view->visibleContentRect(IncludeScrollbars).wid
th(), m_frame->pageZoomFactor()); | 547 return view->visibleContentRect(IncludeScrollbars).width(); |
| 548 } | 548 } |
| 549 | 549 |
| 550 int LocalDOMWindow::screenX() const | 550 int LocalDOMWindow::screenX() const |
| 551 { | 551 { |
| 552 if (!m_frame) | 552 if (!m_frame) |
| 553 return 0; | 553 return 0; |
| 554 | 554 |
| 555 FrameHost* host = m_frame->host(); | 555 FrameHost* host = m_frame->host(); |
| 556 if (!host) | 556 if (!host) |
| 557 return 0; | 557 return 0; |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 809 { | 809 { |
| 810 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<LocalDOMWin
dow>::lifecycleNotifier()); | 810 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<LocalDOMWin
dow>::lifecycleNotifier()); |
| 811 } | 811 } |
| 812 | 812 |
| 813 PassOwnPtr<LifecycleNotifier<LocalDOMWindow> > LocalDOMWindow::createLifecycleNo
tifier() | 813 PassOwnPtr<LifecycleNotifier<LocalDOMWindow> > LocalDOMWindow::createLifecycleNo
tifier() |
| 814 { | 814 { |
| 815 return DOMWindowLifecycleNotifier::create(this); | 815 return DOMWindowLifecycleNotifier::create(this); |
| 816 } | 816 } |
| 817 | 817 |
| 818 } // namespace blink | 818 } // namespace blink |
| OLD | NEW |