Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(546)

Side by Side Diff: Source/WebCore/loader/FrameLoader.cpp

Issue 11418268: Merge 135303 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/frames/frame-unload-crash2-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after
1685 { 1685 {
1686 setProvisionalDocumentLoader(0); 1686 setProvisionalDocumentLoader(0);
1687 m_progressTracker->progressCompleted(); 1687 m_progressTracker->progressCompleted();
1688 setState(FrameStateComplete); 1688 setState(FrameStateComplete);
1689 } 1689 }
1690 1690
1691 void FrameLoader::commitProvisionalLoad() 1691 void FrameLoader::commitProvisionalLoad()
1692 { 1692 {
1693 RefPtr<CachedPage> cachedPage = m_loadingFromCachedPage ? pageCache()->get(h istory()->provisionalItem()) : 0; 1693 RefPtr<CachedPage> cachedPage = m_loadingFromCachedPage ? pageCache()->get(h istory()->provisionalItem()) : 0;
1694 RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader; 1694 RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader;
1695 RefPtr<Frame> protect(m_frame);
1695 1696
1696 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(), 1697 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(),
1697 m_frame->document() ? m_frame->document()->url().string().utf8().data() : "", 1698 m_frame->document() ? m_frame->document()->url().string().utf8().data() : "",
1698 pdl ? pdl->url().string().utf8().data() : "<no provisional DocumentLoade r>"); 1699 pdl ? pdl->url().string().utf8().data() : "<no provisional DocumentLoade r>");
1699 1700
1700 // Check to see if we need to cache the page we are navigating away from int o the back/forward cache. 1701 // Check to see if we need to cache the page we are navigating away from int o the back/forward cache.
1701 // We are doing this here because we know for sure that a new page is about to be loaded. 1702 // We are doing this here because we know for sure that a new page is about to be loaded.
1702 HistoryItem* item = history()->currentItem(); 1703 HistoryItem* item = history()->currentItem();
1703 if (!m_frame->tree()->parent() && pageCache()->canCache(m_frame->page()) && !item->isInPageCache()) 1704 if (!m_frame->tree()->parent() && pageCache()->canCache(m_frame->page()) && !item->isInPageCache())
1704 pageCache()->add(item, m_frame->page()); 1705 pageCache()->add(item, m_frame->page());
(...skipping 1646 matching lines...) Expand 10 before | Expand all | Expand 10 after
3351 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h eight())); 3352 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h eight()));
3352 page->chrome()->setWindowRect(windowRect); 3353 page->chrome()->setWindowRect(windowRect);
3353 3354
3354 page->chrome()->show(); 3355 page->chrome()->show();
3355 3356
3356 created = true; 3357 created = true;
3357 return frame; 3358 return frame;
3358 } 3359 }
3359 3360
3360 } // namespace WebCore 3361 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/frames/frame-unload-crash2-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698