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

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

Issue 1743623002: [Experimental Framework] Make the OriginTrialContext a member of ExecutionContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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) 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 18 matching lines...) Expand all
29 29
30 #include "bindings/core/v8/ScriptCallStack.h" 30 #include "bindings/core/v8/ScriptCallStack.h"
31 #include "core/dom/ActiveDOMObject.h" 31 #include "core/dom/ActiveDOMObject.h"
32 #include "core/dom/ExecutionContextTask.h" 32 #include "core/dom/ExecutionContextTask.h"
33 #include "core/events/ErrorEvent.h" 33 #include "core/events/ErrorEvent.h"
34 #include "core/events/EventTarget.h" 34 #include "core/events/EventTarget.h"
35 #include "core/fetch/MemoryCache.h" 35 #include "core/fetch/MemoryCache.h"
36 #include "core/frame/UseCounter.h" 36 #include "core/frame/UseCounter.h"
37 #include "core/html/PublicURLManager.h" 37 #include "core/html/PublicURLManager.h"
38 #include "core/inspector/InspectorInstrumentation.h" 38 #include "core/inspector/InspectorInstrumentation.h"
39 #include "core/origin_trials/OriginTrialContext.h"
39 #include "core/workers/WorkerGlobalScope.h" 40 #include "core/workers/WorkerGlobalScope.h"
40 #include "core/workers/WorkerThread.h" 41 #include "core/workers/WorkerThread.h"
41 #include "wtf/MainThread.h" 42 #include "wtf/MainThread.h"
42 43
43 namespace blink { 44 namespace blink {
44 45
45 class ExecutionContext::PendingException { 46 class ExecutionContext::PendingException {
46 WTF_MAKE_NONCOPYABLE(PendingException); 47 WTF_MAKE_NONCOPYABLE(PendingException);
47 public: 48 public:
48 PendingException(const String& errorMessage, int lineNumber, int columnNumbe r, int scriptId, const String& sourceURL, PassRefPtr<ScriptCallStack> callStack) 49 PendingException(const String& errorMessage, int lineNumber, int columnNumbe r, int scriptId, const String& sourceURL, PassRefPtr<ScriptCallStack> callStack)
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 void ExecutionContext::setReferrerPolicy(ReferrerPolicy referrerPolicy) 259 void ExecutionContext::setReferrerPolicy(ReferrerPolicy referrerPolicy)
259 { 260 {
260 // When a referrer policy has already been set, the latest value takes prece dence. 261 // When a referrer policy has already been set, the latest value takes prece dence.
261 UseCounter::count(this, UseCounter::SetReferrerPolicy); 262 UseCounter::count(this, UseCounter::SetReferrerPolicy);
262 if (m_referrerPolicy != ReferrerPolicyDefault) 263 if (m_referrerPolicy != ReferrerPolicyDefault)
263 UseCounter::count(this, UseCounter::ResetReferrerPolicy); 264 UseCounter::count(this, UseCounter::ResetReferrerPolicy);
264 265
265 m_referrerPolicy = referrerPolicy; 266 m_referrerPolicy = referrerPolicy;
266 } 267 }
267 268
269 PassOwnPtrWillBeRawPtr<OriginTrialContext> ExecutionContext::createOriginTrialCo ntext()
270 {
271 return nullptr;
272 }
273
268 void ExecutionContext::removeURLFromMemoryCache(const KURL& url) 274 void ExecutionContext::removeURLFromMemoryCache(const KURL& url)
269 { 275 {
270 memoryCache()->removeURLFromCache(url); 276 memoryCache()->removeURLFromCache(url);
271 } 277 }
272 278
273 DEFINE_TRACE(ExecutionContext) 279 DEFINE_TRACE(ExecutionContext)
274 { 280 {
275 #if ENABLE(OILPAN) 281 #if ENABLE(OILPAN)
276 visitor->trace(m_publicURLManager); 282 visitor->trace(m_publicURLManager);
277 HeapSupplementable<ExecutionContext>::trace(visitor); 283 HeapSupplementable<ExecutionContext>::trace(visitor);
278 #endif 284 #endif
279 ContextLifecycleNotifier::trace(visitor); 285 ContextLifecycleNotifier::trace(visitor);
280 } 286 }
281 287
282 } // namespace blink 288 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698