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 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1051 // Notify asynchronously, since this is called within a JavaScript secur
ity check. | 1051 // Notify asynchronously, since this is called within a JavaScript secur
ity check. |
1052 m_didAccessInitialDocumentTimer.startOneShot(0); | 1052 m_didAccessInitialDocumentTimer.startOneShot(0); |
1053 } | 1053 } |
1054 } | 1054 } |
1055 | 1055 |
1056 void FrameLoader::didAccessInitialDocumentTimerFired(Timer<FrameLoader>*) | 1056 void FrameLoader::didAccessInitialDocumentTimerFired(Timer<FrameLoader>*) |
1057 { | 1057 { |
1058 m_client->didAccessInitialDocument(); | 1058 m_client->didAccessInitialDocument(); |
1059 } | 1059 } |
1060 | 1060 |
| 1061 void FrameLoader::notifyIfInitialDocumentAccessed() |
| 1062 { |
| 1063 if (m_didAccessInitialDocumentTimer.isActive() |
| 1064 && m_stateMachine.isDisplayingInitialEmptyDocument()) { |
| 1065 m_didAccessInitialDocumentTimer.stop(); |
| 1066 didAccessInitialDocumentTimerFired(0); |
| 1067 } |
| 1068 } |
| 1069 |
1061 bool FrameLoader::isLoading() const | 1070 bool FrameLoader::isLoading() const |
1062 { | 1071 { |
1063 DocumentLoader* docLoader = activeDocumentLoader(); | 1072 DocumentLoader* docLoader = activeDocumentLoader(); |
1064 if (!docLoader) | 1073 if (!docLoader) |
1065 return false; | 1074 return false; |
1066 return docLoader->isLoading(); | 1075 return docLoader->isLoading(); |
1067 } | 1076 } |
1068 | 1077 |
1069 void FrameLoader::commitProvisionalLoad() | 1078 void FrameLoader::commitProvisionalLoad() |
1070 { | 1079 { |
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1985 InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get()); | 1994 InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get()); |
1986 | 1995 |
1987 m_frame->page()->didCommitLoad(m_frame); | 1996 m_frame->page()->didCommitLoad(m_frame); |
1988 | 1997 |
1989 if (m_frame->page()->mainFrame() == m_frame) | 1998 if (m_frame->page()->mainFrame() == m_frame) |
1990 m_frame->page()->useCounter()->didCommitLoad(); | 1999 m_frame->page()->useCounter()->didCommitLoad(); |
1991 | 2000 |
1992 } | 2001 } |
1993 | 2002 |
1994 } // namespace WebCore | 2003 } // namespace WebCore |
OLD | NEW |