| 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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 if (m_shouldCallCheckCompleted) | 523 if (m_shouldCallCheckCompleted) |
| 524 checkCompleted(); | 524 checkCompleted(); |
| 525 } | 525 } |
| 526 | 526 |
| 527 void FrameLoader::startCheckCompleteTimer() | 527 void FrameLoader::startCheckCompleteTimer() |
| 528 { | 528 { |
| 529 if (!m_shouldCallCheckCompleted) | 529 if (!m_shouldCallCheckCompleted) |
| 530 return; | 530 return; |
| 531 if (m_checkTimer.isActive()) | 531 if (m_checkTimer.isActive()) |
| 532 return; | 532 return; |
| 533 m_checkTimer.startOneShot(0); | 533 m_checkTimer.startOneShot(0, FROM_HERE); |
| 534 } | 534 } |
| 535 | 535 |
| 536 void FrameLoader::scheduleCheckCompleted() | 536 void FrameLoader::scheduleCheckCompleted() |
| 537 { | 537 { |
| 538 m_shouldCallCheckCompleted = true; | 538 m_shouldCallCheckCompleted = true; |
| 539 startCheckCompleteTimer(); | 539 startCheckCompleteTimer(); |
| 540 } | 540 } |
| 541 | 541 |
| 542 LocalFrame* FrameLoader::opener() | 542 LocalFrame* FrameLoader::opener() |
| 543 { | 543 { |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 if (m_client) | 856 if (m_client) |
| 857 m_client->didStopAllLoaders(); | 857 m_client->didStopAllLoaders(); |
| 858 } | 858 } |
| 859 | 859 |
| 860 void FrameLoader::didAccessInitialDocument() | 860 void FrameLoader::didAccessInitialDocument() |
| 861 { | 861 { |
| 862 // We only need to notify the client once, and only for the main frame. | 862 // We only need to notify the client once, and only for the main frame. |
| 863 if (isLoadingMainFrame() && !m_didAccessInitialDocument) { | 863 if (isLoadingMainFrame() && !m_didAccessInitialDocument) { |
| 864 m_didAccessInitialDocument = true; | 864 m_didAccessInitialDocument = true; |
| 865 // Notify asynchronously, since this is called within a JavaScript secur
ity check. | 865 // Notify asynchronously, since this is called within a JavaScript secur
ity check. |
| 866 m_didAccessInitialDocumentTimer.startOneShot(0); | 866 m_didAccessInitialDocumentTimer.startOneShot(0, FROM_HERE); |
| 867 } | 867 } |
| 868 } | 868 } |
| 869 | 869 |
| 870 void FrameLoader::didAccessInitialDocumentTimerFired(Timer<FrameLoader>*) | 870 void FrameLoader::didAccessInitialDocumentTimerFired(Timer<FrameLoader>*) |
| 871 { | 871 { |
| 872 m_client->didAccessInitialDocument(); | 872 m_client->didAccessInitialDocument(); |
| 873 } | 873 } |
| 874 | 874 |
| 875 void FrameLoader::notifyIfInitialDocumentAccessed() | 875 void FrameLoader::notifyIfInitialDocumentAccessed() |
| 876 { | 876 { |
| (...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1461 { | 1461 { |
| 1462 SandboxFlags flags = m_forcedSandboxFlags; | 1462 SandboxFlags flags = m_forcedSandboxFlags; |
| 1463 if (LocalFrame* parentFrame = m_frame->tree().parent()) | 1463 if (LocalFrame* parentFrame = m_frame->tree().parent()) |
| 1464 flags |= parentFrame->document()->sandboxFlags(); | 1464 flags |= parentFrame->document()->sandboxFlags(); |
| 1465 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) | 1465 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) |
| 1466 flags |= ownerElement->sandboxFlags(); | 1466 flags |= ownerElement->sandboxFlags(); |
| 1467 return flags; | 1467 return flags; |
| 1468 } | 1468 } |
| 1469 | 1469 |
| 1470 } // namespace WebCore | 1470 } // namespace WebCore |
| OLD | NEW |