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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
472 void FrameLoader::finishedParsing() | 472 void FrameLoader::finishedParsing() |
473 { | 473 { |
474 if (m_stateMachine.creatingInitialEmptyDocument()) | 474 if (m_stateMachine.creatingInitialEmptyDocument()) |
475 return; | 475 return; |
476 | 476 |
477 // This can be called from the LocalFrame's destructor, in which case we sho uldn't protect ourselves | 477 // This can be called from the LocalFrame's destructor, in which case we sho uldn't protect ourselves |
478 // because doing so will cause us to re-enter the destructor when protector goes out of scope. | 478 // because doing so will cause us to re-enter the destructor when protector goes out of scope. |
479 // Null-checking the FrameView indicates whether or not we're in the destruc tor. | 479 // Null-checking the FrameView indicates whether or not we're in the destruc tor. |
480 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame->view() ? m_frame.get() : nul lptr); | 480 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame->view() ? m_frame.get() : nul lptr); |
481 | 481 |
482 m_progressTracker->finishedParsing(); | 482 if (m_progressTracker) |
Nate Chapin
2015/08/17 17:01:58
Is there any work that needs to be done in the fra
sof
2015/08/18 05:24:13
It won't do any work before the detach check just
| |
483 m_progressTracker->finishedParsing(); | |
483 | 484 |
484 if (client()) | 485 if (client()) |
485 client()->dispatchDidFinishDocumentLoad(m_documentLoader->isCommittedBut Empty()); | 486 client()->dispatchDidFinishDocumentLoad(m_documentLoader->isCommittedBut Empty()); |
486 | 487 |
487 checkCompleted(); | 488 checkCompleted(); |
488 | 489 |
489 if (!m_frame->view()) | 490 if (!m_frame->view()) |
490 return; // We are being destroyed by something checkCompleted called. | 491 return; // We are being destroyed by something checkCompleted called. |
491 | 492 |
492 // Check if the scrollbars are really needed for the content. | 493 // Check if the scrollbars are really needed for the content. |
(...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1514 // FIXME: We need a way to propagate insecure requests policy flags to | 1515 // FIXME: We need a way to propagate insecure requests policy flags to |
1515 // out-of-process frames. For now, we'll always use default behavior. | 1516 // out-of-process frames. For now, we'll always use default behavior. |
1516 if (!parentFrame->isLocalFrame()) | 1517 if (!parentFrame->isLocalFrame()) |
1517 return nullptr; | 1518 return nullptr; |
1518 | 1519 |
1519 ASSERT(toLocalFrame(parentFrame)->document()); | 1520 ASSERT(toLocalFrame(parentFrame)->document()); |
1520 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; | 1521 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; |
1521 } | 1522 } |
1522 | 1523 |
1523 } // namespace blink | 1524 } // namespace blink |
OLD | NEW |