| 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 1389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1400 documentLoader->fetcher()->countPreloads()) | 1400 documentLoader->fetcher()->countPreloads()) |
| 1401 m_unusedPreloadsTimer.startOneShot(unusedPreloadTimeoutInSeconds, | 1401 m_unusedPreloadsTimer.startOneShot(unusedPreloadTimeoutInSeconds, |
| 1402 BLINK_FROM_HERE); | 1402 BLINK_FROM_HERE); |
| 1403 } else { | 1403 } else { |
| 1404 dispatchEvent(loadEvent, document()); | 1404 dispatchEvent(loadEvent, document()); |
| 1405 } | 1405 } |
| 1406 | 1406 |
| 1407 if (frame()) { | 1407 if (frame()) { |
| 1408 Performance* performance = DOMWindowPerformance::performance(*this); | 1408 Performance* performance = DOMWindowPerformance::performance(*this); |
| 1409 DCHECK(performance); | 1409 DCHECK(performance); |
| 1410 performance->addNavigationTiming(frame()); | 1410 performance->addNavigationTiming(m_frame); |
| 1411 } | 1411 } |
| 1412 | 1412 |
| 1413 // For load events, send a separate load event to the enclosing frame only. | 1413 // For load events, send a separate load event to the enclosing frame only. |
| 1414 // This is a DOM extension and is independent of bubbling/capturing rules of | 1414 // This is a DOM extension and is independent of bubbling/capturing rules of |
| 1415 // the DOM. | 1415 // the DOM. |
| 1416 FrameOwner* owner = frame() ? frame()->owner() : nullptr; | 1416 FrameOwner* owner = frame() ? frame()->owner() : nullptr; |
| 1417 if (owner) | 1417 if (owner) |
| 1418 owner->dispatchLoad(); | 1418 owner->dispatchLoad(); |
| 1419 | 1419 |
| 1420 TRACE_EVENT_INSTANT1("devtools.timeline", "MarkLoad", | 1420 TRACE_EVENT_INSTANT1("devtools.timeline", "MarkLoad", |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1560 | 1560 |
| 1561 LocalFrame* LocalDOMWindow::frame() const { | 1561 LocalFrame* LocalDOMWindow::frame() const { |
| 1562 // If the LocalDOMWindow still has a frame reference, that frame must point | 1562 // If the LocalDOMWindow still has a frame reference, that frame must point |
| 1563 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation | 1563 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation |
| 1564 // where script execution leaks between different LocalDOMWindows. | 1564 // where script execution leaks between different LocalDOMWindows. |
| 1565 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); | 1565 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); |
| 1566 return m_frame; | 1566 return m_frame; |
| 1567 } | 1567 } |
| 1568 | 1568 |
| 1569 } // namespace blink | 1569 } // namespace blink |
| OLD | NEW |