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 1645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1656 { | 1656 { |
1657 setProvisionalDocumentLoader(0); | 1657 setProvisionalDocumentLoader(0); |
1658 m_progressTracker->progressCompleted(); | 1658 m_progressTracker->progressCompleted(); |
1659 setState(FrameStateComplete); | 1659 setState(FrameStateComplete); |
1660 } | 1660 } |
1661 | 1661 |
1662 void FrameLoader::commitProvisionalLoad() | 1662 void FrameLoader::commitProvisionalLoad() |
1663 { | 1663 { |
1664 RefPtr<CachedPage> cachedPage = m_loadingFromCachedPage ? pageCache()->get(h
istory()->provisionalItem()) : 0; | 1664 RefPtr<CachedPage> cachedPage = m_loadingFromCachedPage ? pageCache()->get(h
istory()->provisionalItem()) : 0; |
1665 RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader; | 1665 RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader; |
| 1666 RefPtr<Frame> protect(m_frame); |
1666 | 1667 |
1667 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(), | 1668 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(), |
1668 m_frame->document() ? m_frame->document()->url().string().utf8().data()
: "", | 1669 m_frame->document() ? m_frame->document()->url().string().utf8().data()
: "", |
1669 pdl ? pdl->url().string().utf8().data() : "<no provisional DocumentLoade
r>"); | 1670 pdl ? pdl->url().string().utf8().data() : "<no provisional DocumentLoade
r>"); |
1670 | 1671 |
1671 // Check to see if we need to cache the page we are navigating away from int
o the back/forward cache. | 1672 // Check to see if we need to cache the page we are navigating away from int
o the back/forward cache. |
1672 // We are doing this here because we know for sure that a new page is about
to be loaded. | 1673 // We are doing this here because we know for sure that a new page is about
to be loaded. |
1673 HistoryItem* item = history()->currentItem(); | 1674 HistoryItem* item = history()->currentItem(); |
1674 if (!m_frame->tree()->parent() && pageCache()->canCache(m_frame->page()) &&
!item->isInPageCache()) | 1675 if (!m_frame->tree()->parent() && pageCache()->canCache(m_frame->page()) &&
!item->isInPageCache()) |
1675 pageCache()->add(item, m_frame->page()); | 1676 pageCache()->add(item, m_frame->page()); |
(...skipping 1650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3326 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h
eight())); | 3327 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h
eight())); |
3327 page->chrome()->setWindowRect(windowRect); | 3328 page->chrome()->setWindowRect(windowRect); |
3328 | 3329 |
3329 page->chrome()->show(); | 3330 page->chrome()->show(); |
3330 | 3331 |
3331 created = true; | 3332 created = true; |
3332 return frame; | 3333 return frame; |
3333 } | 3334 } |
3334 | 3335 |
3335 } // namespace WebCore | 3336 } // namespace WebCore |
OLD | NEW |