| 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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 if (ScrollingCoordinator* scrollingCoordinator = m_frame->page()->scroll
ingCoordinator()) { | 409 if (ScrollingCoordinator* scrollingCoordinator = m_frame->page()->scroll
ingCoordinator()) { |
| 410 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame-
>view(), HorizontalScrollbar); | 410 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame-
>view(), HorizontalScrollbar); |
| 411 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame-
>view(), VerticalScrollbar); | 411 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame-
>view(), VerticalScrollbar); |
| 412 scrollingCoordinator->scrollableAreaScrollLayerDidChange(m_frame->vi
ew()); | 412 scrollingCoordinator->scrollableAreaScrollLayerDidChange(m_frame->vi
ew()); |
| 413 } | 413 } |
| 414 } | 414 } |
| 415 | 415 |
| 416 m_frame->selection().updateSecureKeyboardEntryIfActive(); | 416 m_frame->selection().updateSecureKeyboardEntryIfActive(); |
| 417 | 417 |
| 418 if (m_frame->isMainFrame()) { | 418 if (m_frame->isMainFrame()) { |
| 419 m_frame->notifyChromeClientWheelEventHandlerCountChanged(); | |
| 420 if (m_document->hasTouchEventHandlers()) | 419 if (m_document->hasTouchEventHandlers()) |
| 421 m_frame->host()->chrome().client().needTouchEvents(true); | 420 m_frame->host()->chrome().client().needTouchEvents(true); |
| 422 } | 421 } |
| 423 | 422 |
| 424 // FIXME: Oilpan: Remove .get() when m_document becomes Member<>. | 423 // FIXME: Oilpan: Remove .get() when m_document becomes Member<>. |
| 425 return m_document.get(); | 424 return m_document.get(); |
| 426 } | 425 } |
| 427 | 426 |
| 428 EventQueue* DOMWindow::eventQueue() const | 427 EventQueue* DOMWindow::eventQueue() const |
| 429 { | 428 { |
| (...skipping 1483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1913 visitor->trace(m_sessionStorage); | 1912 visitor->trace(m_sessionStorage); |
| 1914 visitor->trace(m_localStorage); | 1913 visitor->trace(m_localStorage); |
| 1915 visitor->trace(m_applicationCache); | 1914 visitor->trace(m_applicationCache); |
| 1916 visitor->trace(m_performance); | 1915 visitor->trace(m_performance); |
| 1917 visitor->trace(m_css); | 1916 visitor->trace(m_css); |
| 1918 WillBeHeapSupplementable<DOMWindow>::trace(visitor); | 1917 WillBeHeapSupplementable<DOMWindow>::trace(visitor); |
| 1919 EventTargetWithInlineData::trace(visitor); | 1918 EventTargetWithInlineData::trace(visitor); |
| 1920 } | 1919 } |
| 1921 | 1920 |
| 1922 } // namespace WebCore | 1921 } // namespace WebCore |
| OLD | NEW |