| 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 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 | 473 |
| 474 int LocalDOMWindow::innerHeight() const | 474 int LocalDOMWindow::innerHeight() const |
| 475 { | 475 { |
| 476 if (!m_frame) | 476 if (!m_frame) |
| 477 return 0; | 477 return 0; |
| 478 | 478 |
| 479 FrameView* view = m_frame->view(); | 479 FrameView* view = m_frame->view(); |
| 480 if (!view) | 480 if (!view) |
| 481 return 0; | 481 return 0; |
| 482 | 482 |
| 483 return view->visibleContentRect(IncludeScrollbars).height(); | 483 return view->visibleContentRect().height(); |
| 484 } | 484 } |
| 485 | 485 |
| 486 int LocalDOMWindow::innerWidth() const | 486 int LocalDOMWindow::innerWidth() const |
| 487 { | 487 { |
| 488 if (!m_frame) | 488 if (!m_frame) |
| 489 return 0; | 489 return 0; |
| 490 | 490 |
| 491 FrameView* view = m_frame->view(); | 491 FrameView* view = m_frame->view(); |
| 492 if (!view) | 492 if (!view) |
| 493 return 0; | 493 return 0; |
| 494 | 494 |
| 495 return view->visibleContentRect(IncludeScrollbars).width(); | 495 return view->visibleContentRect().width(); |
| 496 } | 496 } |
| 497 | 497 |
| 498 int LocalDOMWindow::screenX() const | 498 int LocalDOMWindow::screenX() const |
| 499 { | 499 { |
| 500 if (!m_frame) | 500 if (!m_frame) |
| 501 return 0; | 501 return 0; |
| 502 | 502 |
| 503 FrameHost* host = m_frame->host(); | 503 FrameHost* host = m_frame->host(); |
| 504 if (!host) | 504 if (!host) |
| 505 return 0; | 505 return 0; |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 722 { | 722 { |
| 723 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<LocalDOMWin
dow>::lifecycleNotifier()); | 723 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<LocalDOMWin
dow>::lifecycleNotifier()); |
| 724 } | 724 } |
| 725 | 725 |
| 726 PassOwnPtr<LifecycleNotifier<LocalDOMWindow> > LocalDOMWindow::createLifecycleNo
tifier() | 726 PassOwnPtr<LifecycleNotifier<LocalDOMWindow> > LocalDOMWindow::createLifecycleNo
tifier() |
| 727 { | 727 { |
| 728 return DOMWindowLifecycleNotifier::create(this); | 728 return DOMWindowLifecycleNotifier::create(this); |
| 729 } | 729 } |
| 730 | 730 |
| 731 } // namespace blink | 731 } // namespace blink |
| OLD | NEW |