| 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 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 498 | 498 |
| 499 // This can be called from the LocalFrame's destructor, in which case we sho
uldn't protect ourselves | 499 // This can be called from the LocalFrame's destructor, in which case we sho
uldn't protect ourselves |
| 500 // because doing so will cause us to re-enter the destructor when protector
goes out of scope. | 500 // because doing so will cause us to re-enter the destructor when protector
goes out of scope. |
| 501 // Null-checking the FrameView indicates whether or not we're in the destruc
tor. | 501 // Null-checking the FrameView indicates whether or not we're in the destruc
tor. |
| 502 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame->view() ? m_frame.get() : nul
lptr); | 502 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame->view() ? m_frame.get() : nul
lptr); |
| 503 | 503 |
| 504 m_progressTracker->finishedParsing(); | 504 m_progressTracker->finishedParsing(); |
| 505 | 505 |
| 506 if (client()) { | 506 if (client()) { |
| 507 ScriptForbiddenScope forbidScripts; | 507 ScriptForbiddenScope forbidScripts; |
| 508 client()->dispatchDidFinishDocumentLoad(m_documentLoader ? m_documentLoa
der->isCommittedButEmpty() : true); | 508 client()->dispatchDidFinishDocumentLoad(); |
| 509 } | 509 } |
| 510 | 510 |
| 511 if (client()) | 511 if (client()) |
| 512 client()->runScriptsAtDocumentReady(); | 512 client()->runScriptsAtDocumentReady(m_documentLoader ? m_documentLoader-
>isCommittedButEmpty() : true); |
| 513 | 513 |
| 514 checkCompleted(); | 514 checkCompleted(); |
| 515 | 515 |
| 516 if (!m_frame->view()) | 516 if (!m_frame->view()) |
| 517 return; // We are being destroyed by something checkCompleted called. | 517 return; // We are being destroyed by something checkCompleted called. |
| 518 | 518 |
| 519 // Check if the scrollbars are really needed for the content. | 519 // Check if the scrollbars are really needed for the content. |
| 520 // If not, remove them, relayout, and repaint. | 520 // If not, remove them, relayout, and repaint. |
| 521 m_frame->view()->restoreScrollbar(); | 521 m_frame->view()->restoreScrollbar(); |
| 522 processFragment(m_frame->document()->url(), NavigationToDifferentDocument); | 522 processFragment(m_frame->document()->url(), NavigationToDifferentDocument); |
| (...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1585 // FIXME: We need a way to propagate insecure requests policy flags to | 1585 // FIXME: We need a way to propagate insecure requests policy flags to |
| 1586 // out-of-process frames. For now, we'll always use default behavior. | 1586 // out-of-process frames. For now, we'll always use default behavior. |
| 1587 if (!parentFrame->isLocalFrame()) | 1587 if (!parentFrame->isLocalFrame()) |
| 1588 return nullptr; | 1588 return nullptr; |
| 1589 | 1589 |
| 1590 ASSERT(toLocalFrame(parentFrame)->document()); | 1590 ASSERT(toLocalFrame(parentFrame)->document()); |
| 1591 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; | 1591 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; |
| 1592 } | 1592 } |
| 1593 | 1593 |
| 1594 } // namespace blink | 1594 } // namespace blink |
| OLD | NEW |