| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 8 * Copyright (C) 2011 Google Inc. All rights reserved. | 8 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 9 * | 9 * |
| 10 * Redistribution and use in source and binary forms, with or without | 10 * Redistribution and use in source and binary forms, with or without |
| (...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 603 if (Page* page = m_frame->page()) { | 603 if (Page* page = m_frame->page()) { |
| 604 if (page->defersLoading()) | 604 if (page->defersLoading()) |
| 605 return; | 605 return; |
| 606 } | 606 } |
| 607 checkCompleted(); | 607 checkCompleted(); |
| 608 } | 608 } |
| 609 | 609 |
| 610 void FrameLoader::scheduleCheckCompleted() | 610 void FrameLoader::scheduleCheckCompleted() |
| 611 { | 611 { |
| 612 if (!m_checkTimer.isActive()) | 612 if (!m_checkTimer.isActive()) |
| 613 m_checkTimer.startOneShot(0, FROM_HERE); | 613 m_checkTimer.startOneShot(0, BLINK_FROM_HERE); |
| 614 } | 614 } |
| 615 | 615 |
| 616 Frame* FrameLoader::opener() | 616 Frame* FrameLoader::opener() |
| 617 { | 617 { |
| 618 return client() ? client()->opener() : 0; | 618 return client() ? client()->opener() : 0; |
| 619 } | 619 } |
| 620 | 620 |
| 621 void FrameLoader::setOpener(LocalFrame* opener) | 621 void FrameLoader::setOpener(LocalFrame* opener) |
| 622 { | 622 { |
| 623 // If the frame is already detached, the opener has already been cleared. | 623 // If the frame is already detached, the opener has already been cleared. |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1004 if (client()) | 1004 if (client()) |
| 1005 client()->didStopAllLoaders(); | 1005 client()->didStopAllLoaders(); |
| 1006 } | 1006 } |
| 1007 | 1007 |
| 1008 void FrameLoader::didAccessInitialDocument() | 1008 void FrameLoader::didAccessInitialDocument() |
| 1009 { | 1009 { |
| 1010 // We only need to notify the client once, and only for the main frame. | 1010 // We only need to notify the client once, and only for the main frame. |
| 1011 if (isLoadingMainFrame() && !m_didAccessInitialDocument) { | 1011 if (isLoadingMainFrame() && !m_didAccessInitialDocument) { |
| 1012 m_didAccessInitialDocument = true; | 1012 m_didAccessInitialDocument = true; |
| 1013 // Notify asynchronously, since this is called within a JavaScript secur
ity check. | 1013 // Notify asynchronously, since this is called within a JavaScript secur
ity check. |
| 1014 m_didAccessInitialDocumentTimer.startOneShot(0, FROM_HERE); | 1014 m_didAccessInitialDocumentTimer.startOneShot(0, BLINK_FROM_HERE); |
| 1015 } | 1015 } |
| 1016 } | 1016 } |
| 1017 | 1017 |
| 1018 void FrameLoader::didAccessInitialDocumentTimerFired(Timer<FrameLoader>*) | 1018 void FrameLoader::didAccessInitialDocumentTimerFired(Timer<FrameLoader>*) |
| 1019 { | 1019 { |
| 1020 if (client()) | 1020 if (client()) |
| 1021 client()->didAccessInitialDocument(); | 1021 client()->didAccessInitialDocument(); |
| 1022 } | 1022 } |
| 1023 | 1023 |
| 1024 void FrameLoader::notifyIfInitialDocumentAccessed() | 1024 void FrameLoader::notifyIfInitialDocumentAccessed() |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1523 // FIXME: We need a way to propagate insecure requests policy flags to | 1523 // FIXME: We need a way to propagate insecure requests policy flags to |
| 1524 // out-of-process frames. For now, we'll always use default behavior. | 1524 // out-of-process frames. For now, we'll always use default behavior. |
| 1525 if (!parentFrame->isLocalFrame()) | 1525 if (!parentFrame->isLocalFrame()) |
| 1526 return nullptr; | 1526 return nullptr; |
| 1527 | 1527 |
| 1528 ASSERT(toLocalFrame(parentFrame)->document()); | 1528 ASSERT(toLocalFrame(parentFrame)->document()); |
| 1529 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; | 1529 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; |
| 1530 } | 1530 } |
| 1531 | 1531 |
| 1532 } // namespace blink | 1532 } // namespace blink |
| OLD | NEW |