Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: Source/core/loader/FrameLoader.cpp

Issue 514603004: Make WebFrame::isLoading() local-only and map it to load event completion (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/web/WebLocalFrameImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 884 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 } 895 }
896 896
897 void FrameLoader::notifyIfInitialDocumentAccessed() 897 void FrameLoader::notifyIfInitialDocumentAccessed()
898 { 898 {
899 if (m_didAccessInitialDocumentTimer.isActive()) { 899 if (m_didAccessInitialDocumentTimer.isActive()) {
900 m_didAccessInitialDocumentTimer.stop(); 900 m_didAccessInitialDocumentTimer.stop();
901 didAccessInitialDocumentTimerFired(0); 901 didAccessInitialDocumentTimerFired(0);
902 } 902 }
903 } 903 }
904 904
905 bool FrameLoader::isLoading() const
906 {
907 if (m_provisionalDocumentLoader)
908 return true;
909 return m_documentLoader && m_documentLoader->isLoading();
910 }
911
912 void FrameLoader::commitProvisionalLoad() 905 void FrameLoader::commitProvisionalLoad()
913 { 906 {
914 ASSERT(client()->hasWebView()); 907 ASSERT(client()->hasWebView());
915 ASSERT(m_state == FrameStateProvisional); 908 ASSERT(m_state == FrameStateProvisional);
916 RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader; 909 RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader;
917 RefPtr<LocalFrame> protect(m_frame); 910 RefPtr<LocalFrame> protect(m_frame);
918 911
919 // Check if the destination page is allowed to access the previous page's ti ming information. 912 // Check if the destination page is allowed to access the previous page's ti ming information.
920 if (m_frame->document()) { 913 if (m_frame->document()) {
921 RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(pdl->requ est().url()); 914 RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(pdl->requ est().url());
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
1494 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1487 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1495 Frame* parentFrame = m_frame->tree().parent(); 1488 Frame* parentFrame = m_frame->tree().parent();
1496 if (parentFrame && parentFrame->isLocalFrame()) 1489 if (parentFrame && parentFrame->isLocalFrame())
1497 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1490 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1498 if (FrameOwner* frameOwner = m_frame->owner()) 1491 if (FrameOwner* frameOwner = m_frame->owner())
1499 flags |= frameOwner->sandboxFlags(); 1492 flags |= frameOwner->sandboxFlags();
1500 return flags; 1493 return flags;
1501 } 1494 }
1502 1495
1503 } // namespace blink 1496 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/web/WebLocalFrameImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698