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

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

Issue 9371035: Merge 107023 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 10 months 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/http/tests/appcache/resources/deferred-events-delete-while-raising-timer-2.html ('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 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 743
744 m_frame->navigationScheduler()->startTimer(); 744 m_frame->navigationScheduler()->startTimer();
745 745
746 completed(); 746 completed();
747 if (m_frame->page()) 747 if (m_frame->page())
748 checkLoadComplete(); 748 checkLoadComplete();
749 } 749 }
750 750
751 void FrameLoader::checkTimerFired(Timer<FrameLoader>*) 751 void FrameLoader::checkTimerFired(Timer<FrameLoader>*)
752 { 752 {
753 RefPtr<Frame> protect(m_frame);
754
753 if (Page* page = m_frame->page()) { 755 if (Page* page = m_frame->page()) {
754 if (page->defersLoading()) 756 if (page->defersLoading())
755 return; 757 return;
756 } 758 }
757 if (m_shouldCallCheckCompleted) 759 if (m_shouldCallCheckCompleted)
758 checkCompleted(); 760 checkCompleted();
759 if (m_shouldCallCheckLoadComplete) 761 if (m_shouldCallCheckLoadComplete)
760 checkLoadComplete(); 762 checkLoadComplete();
761 } 763 }
762 764
(...skipping 2598 matching lines...) Expand 10 before | Expand all | Expand 10 after
3361 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h eight())); 3363 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h eight()));
3362 page->chrome()->setWindowRect(windowRect); 3364 page->chrome()->setWindowRect(windowRect);
3363 3365
3364 page->chrome()->show(); 3366 page->chrome()->show();
3365 3367
3366 created = true; 3368 created = true;
3367 return frame; 3369 return frame;
3368 } 3370 }
3369 3371
3370 } // namespace WebCore 3372 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/appcache/resources/deferred-events-delete-while-raising-timer-2.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698