| 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 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( | 359 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( |
| 360 frame()->view(), HorizontalScrollbar); | 360 frame()->view(), HorizontalScrollbar); |
| 361 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( | 361 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( |
| 362 frame()->view(), VerticalScrollbar); | 362 frame()->view(), VerticalScrollbar); |
| 363 scrollingCoordinator->scrollableAreaScrollLayerDidChange(frame()->view()); | 363 scrollingCoordinator->scrollableAreaScrollLayerDidChange(frame()->view()); |
| 364 } | 364 } |
| 365 } | 365 } |
| 366 | 366 |
| 367 frame()->selection().updateSecureKeyboardEntryIfActive(); | 367 frame()->selection().updateSecureKeyboardEntryIfActive(); |
| 368 | 368 |
| 369 m_document->maybeRecordLoadReason(Created); | 369 if (frame()->isCrossOriginSubframe()) |
| 370 m_document->recordDeferredLoadReason(Created); |
| 370 | 371 |
| 371 return m_document; | 372 return m_document; |
| 372 } | 373 } |
| 373 | 374 |
| 374 EventQueue* LocalDOMWindow::getEventQueue() const { | 375 EventQueue* LocalDOMWindow::getEventQueue() const { |
| 375 return m_eventQueue.get(); | 376 return m_eventQueue.get(); |
| 376 } | 377 } |
| 377 | 378 |
| 378 void LocalDOMWindow::enqueueWindowEvent(Event* event) { | 379 void LocalDOMWindow::enqueueWindowEvent(Event* event) { |
| 379 if (!m_eventQueue) | 380 if (!m_eventQueue) |
| (...skipping 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1641 DOMWindow::trace(visitor); | 1642 DOMWindow::trace(visitor); |
| 1642 Supplementable<LocalDOMWindow>::trace(visitor); | 1643 Supplementable<LocalDOMWindow>::trace(visitor); |
| 1643 } | 1644 } |
| 1644 | 1645 |
| 1645 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { | 1646 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { |
| 1646 visitor->traceWrappers(m_customElements); | 1647 visitor->traceWrappers(m_customElements); |
| 1647 DOMWindow::traceWrappers(visitor); | 1648 DOMWindow::traceWrappers(visitor); |
| 1648 } | 1649 } |
| 1649 | 1650 |
| 1650 } // namespace blink | 1651 } // namespace blink |
| OLD | NEW |