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

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

Issue 23620020: Don't wait to notify client of spoof attempt if a modal dialog is created. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use PageGroupLoadDeferrer instead Created 7 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
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/core/page/PageGroupLoadDeferrer.cpp » ('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 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 // Notify asynchronously, since this is called within a JavaScript secur ity check. 932 // Notify asynchronously, since this is called within a JavaScript secur ity check.
933 m_didAccessInitialDocumentTimer.startOneShot(0); 933 m_didAccessInitialDocumentTimer.startOneShot(0);
934 } 934 }
935 } 935 }
936 936
937 void FrameLoader::didAccessInitialDocumentTimerFired(Timer<FrameLoader>*) 937 void FrameLoader::didAccessInitialDocumentTimerFired(Timer<FrameLoader>*)
938 { 938 {
939 m_client->didAccessInitialDocument(); 939 m_client->didAccessInitialDocument();
940 } 940 }
941 941
942 void FrameLoader::notifyIfInitialDocumentAccessed()
943 {
944 if (m_didAccessInitialDocumentTimer.isActive()
945 && m_stateMachine.isDisplayingInitialEmptyDocument()) {
946 m_didAccessInitialDocumentTimer.stop();
947 didAccessInitialDocumentTimerFired(0);
948 }
949 }
950
942 bool FrameLoader::isLoading() const 951 bool FrameLoader::isLoading() const
943 { 952 {
944 DocumentLoader* docLoader = activeDocumentLoader(); 953 DocumentLoader* docLoader = activeDocumentLoader();
945 if (!docLoader) 954 if (!docLoader)
946 return false; 955 return false;
947 return docLoader->isLoading(); 956 return docLoader->isLoading();
948 } 957 }
949 958
950 void FrameLoader::commitProvisionalLoad() 959 void FrameLoader::commitProvisionalLoad()
951 { 960 {
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
1766 { 1775 {
1767 SandboxFlags flags = m_forcedSandboxFlags; 1776 SandboxFlags flags = m_forcedSandboxFlags;
1768 if (Frame* parentFrame = m_frame->tree()->parent()) 1777 if (Frame* parentFrame = m_frame->tree()->parent())
1769 flags |= parentFrame->document()->sandboxFlags(); 1778 flags |= parentFrame->document()->sandboxFlags();
1770 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) 1779 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement())
1771 flags |= ownerElement->sandboxFlags(); 1780 flags |= ownerElement->sandboxFlags();
1772 return flags; 1781 return flags;
1773 } 1782 }
1774 1783
1775 } // namespace WebCore 1784 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/core/page/PageGroupLoadDeferrer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698