| 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 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1578 setProvisionalDocumentLoader(0); | 1578 setProvisionalDocumentLoader(0); |
| 1579 m_progressTracker->progressCompleted(); | 1579 m_progressTracker->progressCompleted(); |
| 1580 setState(FrameStateComplete); | 1580 setState(FrameStateComplete); |
| 1581 } | 1581 } |
| 1582 | 1582 |
| 1583 void FrameLoader::commitProvisionalLoad() | 1583 void FrameLoader::commitProvisionalLoad() |
| 1584 { | 1584 { |
| 1585 RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader; | 1585 RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader; |
| 1586 RefPtr<Frame> protect(m_frame); | 1586 RefPtr<Frame> protect(m_frame); |
| 1587 | 1587 |
| 1588 LOG(PageCache, "WebCoreLoading %s: About to commit provisional load from pre
vious URL '%s' to new URL '%s'", m_frame->tree()->uniqueName().string().utf8().d
ata(), | 1588 LOG(Loading, "WebCoreLoading %s: About to commit provisional load from previ
ous URL '%s' to new URL '%s'", m_frame->tree()->uniqueName().string().utf8().dat
a(), |
| 1589 m_frame->document() ? m_frame->document()->url().elidedString().utf8().d
ata() : "", | 1589 m_frame->document() ? m_frame->document()->url().elidedString().utf8().d
ata() : "", |
| 1590 pdl ? pdl->url().elidedString().utf8().data() : "<no provisional Documen
tLoader>"); | 1590 pdl ? pdl->url().elidedString().utf8().data() : "<no provisional Documen
tLoader>"); |
| 1591 | 1591 |
| 1592 if (m_loadType != FrameLoadTypeReplace) | 1592 if (m_loadType != FrameLoadTypeReplace) |
| 1593 closeOldDataSources(); | 1593 closeOldDataSources(); |
| 1594 | 1594 |
| 1595 transitionToCommitted(); | 1595 transitionToCommitted(); |
| 1596 | 1596 |
| 1597 if (pdl && m_documentLoader) { | 1597 if (pdl && m_documentLoader) { |
| 1598 // Check if the destination page is allowed to access the previous page'
s timing information. | 1598 // Check if the destination page is allowed to access the previous page'
s timing information. |
| (...skipping 1447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3046 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); | 3046 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); |
| 3047 | 3047 |
| 3048 page->chrome()->setWindowRect(newWindowRect); | 3048 page->chrome()->setWindowRect(newWindowRect); |
| 3049 page->chrome()->show(); | 3049 page->chrome()->show(); |
| 3050 | 3050 |
| 3051 created = true; | 3051 created = true; |
| 3052 return frame; | 3052 return frame; |
| 3053 } | 3053 } |
| 3054 | 3054 |
| 3055 } // namespace WebCore | 3055 } // namespace WebCore |
| OLD | NEW |