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

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

Issue 1402933002: Revert "Post loading tasks on the appropriate WebFrameScheduler's queue." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 years, 2 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
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 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 // trigger event listeners for 'abort'. These event listeners might detach 1065 // trigger event listeners for 'abort'. These event listeners might detach
1066 // the frame. 1066 // the frame.
1067 // TODO(dcheng): Investigate if this can be moved above the check that 1067 // TODO(dcheng): Investigate if this can be moved above the check that
1068 // m_provisionalDocumentLoader hasn't changed. 1068 // m_provisionalDocumentLoader hasn't changed.
1069 if (!m_frame->client()) 1069 if (!m_frame->client())
1070 return false; 1070 return false;
1071 // No more events will be dispatched so detach the Document. 1071 // No more events will be dispatched so detach the Document.
1072 if (m_frame->document()) 1072 if (m_frame->document())
1073 m_frame->document()->detach(); 1073 m_frame->document()->detach();
1074 m_documentLoader = m_provisionalDocumentLoader.release(); 1074 m_documentLoader = m_provisionalDocumentLoader.release();
1075 m_frame->updateFrameSecurityOrigin();
1076 1075
1077 return true; 1076 return true;
1078 } 1077 }
1079 1078
1080 void FrameLoader::commitProvisionalLoad() 1079 void FrameLoader::commitProvisionalLoad()
1081 { 1080 {
1082 ASSERT(client()->hasWebView()); 1081 ASSERT(client()->hasWebView());
1083 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); 1082 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get());
1084 1083
1085 // Check if the destination page is allowed to access the previous page's ti ming information. 1084 // Check if the destination page is allowed to access the previous page's ti ming information.
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
1523 // FIXME: We need a way to propagate insecure requests policy flags to 1522 // FIXME: We need a way to propagate insecure requests policy flags to
1524 // out-of-process frames. For now, we'll always use default behavior. 1523 // out-of-process frames. For now, we'll always use default behavior.
1525 if (!parentFrame->isLocalFrame()) 1524 if (!parentFrame->isLocalFrame())
1526 return nullptr; 1525 return nullptr;
1527 1526
1528 ASSERT(toLocalFrame(parentFrame)->document()); 1527 ASSERT(toLocalFrame(parentFrame)->document());
1529 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1528 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1530 } 1529 }
1531 1530
1532 } // namespace blink 1531 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | third_party/WebKit/Source/platform/TimerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698