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

Side by Side Diff: Source/core/dom/ExecutionContext.cpp

Issue 811773002: Mixed Content: Implement strict mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Tests. Created 6 years 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/dom/ExecutionContext.h ('k') | Source/core/frame/csp/CSPDirectiveList.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) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2012 Google Inc. All Rights Reserved. 3 * Copyright (C) 2012 Google Inc. All Rights Reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 RefPtrWillBeMember<ScriptCallStack> m_callStack; 66 RefPtrWillBeMember<ScriptCallStack> m_callStack;
67 }; 67 };
68 68
69 ExecutionContext::ExecutionContext() 69 ExecutionContext::ExecutionContext()
70 : m_sandboxFlags(SandboxNone) 70 : m_sandboxFlags(SandboxNone)
71 , m_circularSequentialID(0) 71 , m_circularSequentialID(0)
72 , m_timerNestingLevel(0) 72 , m_timerNestingLevel(0)
73 , m_inDispatchErrorEvent(false) 73 , m_inDispatchErrorEvent(false)
74 , m_activeDOMObjectsAreSuspended(false) 74 , m_activeDOMObjectsAreSuspended(false)
75 , m_activeDOMObjectsAreStopped(false) 75 , m_activeDOMObjectsAreStopped(false)
76 , m_strictMixedContentCheckingEnforced(false)
76 { 77 {
77 } 78 }
78 79
79 ExecutionContext::~ExecutionContext() 80 ExecutionContext::~ExecutionContext()
80 { 81 {
81 } 82 }
82 83
83 bool ExecutionContext::hasPendingActivity() 84 bool ExecutionContext::hasPendingActivity()
84 { 85 {
85 return lifecycleNotifier().hasPendingActivity(); 86 return lifecycleNotifier().hasPendingActivity();
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 #if ENABLE(OILPAN) 277 #if ENABLE(OILPAN)
277 visitor->trace(m_pendingExceptions); 278 visitor->trace(m_pendingExceptions);
278 visitor->trace(m_publicURLManager); 279 visitor->trace(m_publicURLManager);
279 visitor->trace(m_timeouts); 280 visitor->trace(m_timeouts);
280 HeapSupplementable<ExecutionContext>::trace(visitor); 281 HeapSupplementable<ExecutionContext>::trace(visitor);
281 #endif 282 #endif
282 LifecycleContext<ExecutionContext>::trace(visitor); 283 LifecycleContext<ExecutionContext>::trace(visitor);
283 } 284 }
284 285
285 } // namespace blink 286 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/ExecutionContext.h ('k') | Source/core/frame/csp/CSPDirectiveList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698