| 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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( | 345 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( |
| 346 frame()->view(), HorizontalScrollbar); | 346 frame()->view(), HorizontalScrollbar); |
| 347 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( | 347 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( |
| 348 frame()->view(), VerticalScrollbar); | 348 frame()->view(), VerticalScrollbar); |
| 349 scrollingCoordinator->scrollableAreaScrollLayerDidChange(frame()->view()); | 349 scrollingCoordinator->scrollableAreaScrollLayerDidChange(frame()->view()); |
| 350 } | 350 } |
| 351 } | 351 } |
| 352 | 352 |
| 353 frame()->selection().updateSecureKeyboardEntryIfActive(); | 353 frame()->selection().updateSecureKeyboardEntryIfActive(); |
| 354 | 354 |
| 355 m_document->maybeRecordLoadReason(Created); | 355 if (frame()->isCrossOriginSubframe()) |
| 356 m_document->recordDeferredLoadReason(Created); |
| 356 | 357 |
| 357 return m_document; | 358 return m_document; |
| 358 } | 359 } |
| 359 | 360 |
| 360 EventQueue* LocalDOMWindow::getEventQueue() const { | 361 EventQueue* LocalDOMWindow::getEventQueue() const { |
| 361 return m_eventQueue.get(); | 362 return m_eventQueue.get(); |
| 362 } | 363 } |
| 363 | 364 |
| 364 void LocalDOMWindow::enqueueWindowEvent(Event* event) { | 365 void LocalDOMWindow::enqueueWindowEvent(Event* event) { |
| 365 if (!m_eventQueue) | 366 if (!m_eventQueue) |
| (...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1554 | 1555 |
| 1555 LocalFrame* LocalDOMWindow::frame() const { | 1556 LocalFrame* LocalDOMWindow::frame() const { |
| 1556 // If the LocalDOMWindow still has a frame reference, that frame must point | 1557 // If the LocalDOMWindow still has a frame reference, that frame must point |
| 1557 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation | 1558 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation |
| 1558 // where script execution leaks between different LocalDOMWindows. | 1559 // where script execution leaks between different LocalDOMWindows. |
| 1559 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); | 1560 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); |
| 1560 return m_frame; | 1561 return m_frame; |
| 1561 } | 1562 } |
| 1562 | 1563 |
| 1563 } // namespace blink | 1564 } // namespace blink |
| OLD | NEW |