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 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
632 // See https://bugs.webkit.org/show_bug.cgi?id=31838 | 632 // See https://bugs.webkit.org/show_bug.cgi?id=31838 |
633 if (m_frame->document()->loadEventFinished()) | 633 if (m_frame->document()->loadEventFinished()) |
634 m_client->postProgressStartedNotification(); | 634 m_client->postProgressStartedNotification(); |
635 | 635 |
636 m_documentLoader->clearRedirectChain(); | 636 m_documentLoader->clearRedirectChain(); |
637 if (m_documentLoader->isClientRedirect()) | 637 if (m_documentLoader->isClientRedirect()) |
638 m_documentLoader->appendRedirect(oldURL); | 638 m_documentLoader->appendRedirect(oldURL); |
639 m_documentLoader->appendRedirect(newURL); | 639 m_documentLoader->appendRedirect(newURL); |
640 | 640 |
641 m_client->dispatchDidNavigateWithinPage(); | 641 m_client->dispatchDidNavigateWithinPage(); |
642 m_client->dispatchDidReceiveTitle(m_frame->document()->titleWithDirection())
; | 642 m_client->dispatchDidReceiveTitle(m_frame->document()->title()); |
643 | 643 |
644 if (m_frame->document()->loadEventFinished()) | 644 if (m_frame->document()->loadEventFinished()) |
645 m_client->postProgressFinishedNotification(); | 645 m_client->postProgressFinishedNotification(); |
646 } | 646 } |
647 | 647 |
648 void FrameLoader::loadInSameDocument(const KURL& url, PassRefPtr<SerializedScrip
tValue> stateObject, bool isNewNavigation) | 648 void FrameLoader::loadInSameDocument(const KURL& url, PassRefPtr<SerializedScrip
tValue> stateObject, bool isNewNavigation) |
649 { | 649 { |
650 // If we have a state object, we cannot also be a new navigation. | 650 // If we have a state object, we cannot also be a new navigation. |
651 ASSERT(!stateObject || (stateObject && !isNewNavigation)); | 651 ASSERT(!stateObject || (stateObject && !isNewNavigation)); |
652 | 652 |
(...skipping 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1766 { | 1766 { |
1767 SandboxFlags flags = m_forcedSandboxFlags; | 1767 SandboxFlags flags = m_forcedSandboxFlags; |
1768 if (Frame* parentFrame = m_frame->tree()->parent()) | 1768 if (Frame* parentFrame = m_frame->tree()->parent()) |
1769 flags |= parentFrame->document()->sandboxFlags(); | 1769 flags |= parentFrame->document()->sandboxFlags(); |
1770 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) | 1770 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) |
1771 flags |= ownerElement->sandboxFlags(); | 1771 flags |= ownerElement->sandboxFlags(); |
1772 return flags; | 1772 return flags; |
1773 } | 1773 } |
1774 | 1774 |
1775 } // namespace WebCore | 1775 } // namespace WebCore |
OLD | NEW |