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