| 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 813 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 824 } | 824 } |
| 825 } | 825 } |
| 826 | 826 |
| 827 void FrameLoader::didAccessInitialDocumentTimerFired(Timer<FrameLoader>*) | 827 void FrameLoader::didAccessInitialDocumentTimerFired(Timer<FrameLoader>*) |
| 828 { | 828 { |
| 829 m_client->didAccessInitialDocument(); | 829 m_client->didAccessInitialDocument(); |
| 830 } | 830 } |
| 831 | 831 |
| 832 void FrameLoader::notifyIfInitialDocumentAccessed() | 832 void FrameLoader::notifyIfInitialDocumentAccessed() |
| 833 { | 833 { |
| 834 if (m_didAccessInitialDocumentTimer.isActive() | 834 if (m_didAccessInitialDocumentTimer.isActive()) { |
| 835 && m_stateMachine.isDisplayingInitialEmptyDocument()) { | |
| 836 m_didAccessInitialDocumentTimer.stop(); | 835 m_didAccessInitialDocumentTimer.stop(); |
| 837 didAccessInitialDocumentTimerFired(0); | 836 didAccessInitialDocumentTimerFired(0); |
| 838 } | 837 } |
| 839 } | 838 } |
| 840 | 839 |
| 841 bool FrameLoader::isLoading() const | 840 bool FrameLoader::isLoading() const |
| 842 { | 841 { |
| 843 DocumentLoader* docLoader = activeDocumentLoader(); | 842 DocumentLoader* docLoader = activeDocumentLoader(); |
| 844 if (!docLoader) | 843 if (!docLoader) |
| 845 return false; | 844 return false; |
| (...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1535 { | 1534 { |
| 1536 SandboxFlags flags = m_forcedSandboxFlags; | 1535 SandboxFlags flags = m_forcedSandboxFlags; |
| 1537 if (Frame* parentFrame = m_frame->tree().parent()) | 1536 if (Frame* parentFrame = m_frame->tree().parent()) |
| 1538 flags |= parentFrame->document()->sandboxFlags(); | 1537 flags |= parentFrame->document()->sandboxFlags(); |
| 1539 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) | 1538 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) |
| 1540 flags |= ownerElement->sandboxFlags(); | 1539 flags |= ownerElement->sandboxFlags(); |
| 1541 return flags; | 1540 return flags; |
| 1542 } | 1541 } |
| 1543 | 1542 |
| 1544 } // namespace WebCore | 1543 } // namespace WebCore |
| OLD | NEW |