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

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

Issue 598533003: Revert "Mixed Content: Make MixedContentChecker completely static." (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/core/loader/MixedContentChecker.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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "core/inspector/ConsoleMessage.h" 61 #include "core/inspector/ConsoleMessage.h"
62 #include "core/inspector/InspectorController.h" 62 #include "core/inspector/InspectorController.h"
63 #include "core/inspector/InspectorInstrumentation.h" 63 #include "core/inspector/InspectorInstrumentation.h"
64 #include "core/loader/DocumentLoadTiming.h" 64 #include "core/loader/DocumentLoadTiming.h"
65 #include "core/loader/DocumentLoader.h" 65 #include "core/loader/DocumentLoader.h"
66 #include "core/loader/FormState.h" 66 #include "core/loader/FormState.h"
67 #include "core/loader/FormSubmission.h" 67 #include "core/loader/FormSubmission.h"
68 #include "core/loader/FrameFetchContext.h" 68 #include "core/loader/FrameFetchContext.h"
69 #include "core/loader/FrameLoadRequest.h" 69 #include "core/loader/FrameLoadRequest.h"
70 #include "core/loader/FrameLoaderClient.h" 70 #include "core/loader/FrameLoaderClient.h"
71 #include "core/loader/MixedContentChecker.h"
72 #include "core/loader/ProgressTracker.h" 71 #include "core/loader/ProgressTracker.h"
73 #include "core/loader/UniqueIdentifier.h" 72 #include "core/loader/UniqueIdentifier.h"
74 #include "core/loader/appcache/ApplicationCacheHost.h" 73 #include "core/loader/appcache/ApplicationCacheHost.h"
75 #include "core/page/BackForwardClient.h" 74 #include "core/page/BackForwardClient.h"
76 #include "core/page/Chrome.h" 75 #include "core/page/Chrome.h"
77 #include "core/page/ChromeClient.h" 76 #include "core/page/ChromeClient.h"
78 #include "core/page/CreateWindow.h" 77 #include "core/page/CreateWindow.h"
79 #include "core/page/EventHandler.h" 78 #include "core/page/EventHandler.h"
80 #include "core/page/FrameTree.h" 79 #include "core/page/FrameTree.h"
81 #include "core/page/Page.h" 80 #include "core/page/Page.h"
(...skipping 24 matching lines...) Expand all
106 return type == FrameLoadTypeBackForward; 105 return type == FrameLoadTypeBackForward;
107 } 106 }
108 107
109 static bool needsHistoryItemRestore(FrameLoadType type) 108 static bool needsHistoryItemRestore(FrameLoadType type)
110 { 109 {
111 return type == FrameLoadTypeBackForward || type == FrameLoadTypeReload || ty pe == FrameLoadTypeReloadFromOrigin; 110 return type == FrameLoadTypeBackForward || type == FrameLoadTypeReload || ty pe == FrameLoadTypeReloadFromOrigin;
112 } 111 }
113 112
114 FrameLoader::FrameLoader(LocalFrame* frame) 113 FrameLoader::FrameLoader(LocalFrame* frame)
115 : m_frame(frame) 114 : m_frame(frame)
115 , m_mixedContentChecker(frame)
116 , m_progressTracker(ProgressTracker::create(frame)) 116 , m_progressTracker(ProgressTracker::create(frame))
117 , m_state(FrameStateProvisional) 117 , m_state(FrameStateProvisional)
118 , m_loadType(FrameLoadTypeStandard) 118 , m_loadType(FrameLoadTypeStandard)
119 , m_fetchContext(FrameFetchContext::create(frame)) 119 , m_fetchContext(FrameFetchContext::create(frame))
120 , m_inStopAllLoaders(false) 120 , m_inStopAllLoaders(false)
121 , m_checkTimer(this, &FrameLoader::checkTimerFired) 121 , m_checkTimer(this, &FrameLoader::checkTimerFired)
122 , m_didAccessInitialDocument(false) 122 , m_didAccessInitialDocument(false)
123 , m_didAccessInitialDocumentTimer(this, &FrameLoader::didAccessInitialDocume ntTimerFired) 123 , m_didAccessInitialDocumentTimer(this, &FrameLoader::didAccessInitialDocume ntTimerFired)
124 , m_forcedSandboxFlags(SandboxNone) 124 , m_forcedSandboxFlags(SandboxNone)
125 { 125 {
(...skipping 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1480 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1480 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1481 Frame* parentFrame = m_frame->tree().parent(); 1481 Frame* parentFrame = m_frame->tree().parent();
1482 if (parentFrame && parentFrame->isLocalFrame()) 1482 if (parentFrame && parentFrame->isLocalFrame())
1483 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1483 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1484 if (FrameOwner* frameOwner = m_frame->owner()) 1484 if (FrameOwner* frameOwner = m_frame->owner())
1485 flags |= frameOwner->sandboxFlags(); 1485 flags |= frameOwner->sandboxFlags();
1486 return flags; 1486 return flags;
1487 } 1487 }
1488 1488
1489 } // namespace blink 1489 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/core/loader/MixedContentChecker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698