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 732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 2605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3368 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h
eight())); | 3370 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h
eight())); |
3369 page->chrome()->setWindowRect(windowRect); | 3371 page->chrome()->setWindowRect(windowRect); |
3370 | 3372 |
3371 page->chrome()->show(); | 3373 page->chrome()->show(); |
3372 | 3374 |
3373 created = true; | 3375 created = true; |
3374 return frame; | 3376 return frame; |
3375 } | 3377 } |
3376 | 3378 |
3377 } // namespace WebCore | 3379 } // namespace WebCore |
OLD | NEW |