third_party/WebKit/Source/core/dom/Document.cpp - Issue 1743623002: [Experimental Framework] Make the OriginTrialContext a member of ExecutionContext

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/dom/Document.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: Fix nullptr crash, test that an error message was set Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/dom/Document.h ('K') | « third_party/WebKit/Source/core/dom/Document.h ('k') | third_party/WebKit/Source/core/dom/ExecutionContext.h » ('j') | third_party/WebKit/Source/core/origin_trials/DocumentOriginTrialContext.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/Document.cpp

diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp

index 64f72e837e40d3a5cb3d7d72c4b4a0cc95adb60d..e5735532a41f89873684438b4a60cb8239321092 100644

--- a/third_party/WebKit/Source/core/dom/Document.cpp

+++ b/third_party/WebKit/Source/core/dom/Document.cpp

@@ -183,6 +183,7 @@

#include "core/loader/ImageLoader.h"

#include "core/loader/NavigationScheduler.h"

#include "core/loader/appcache/ApplicationCacheHost.h"

+#include "core/origin_trials/DocumentOriginTrialContext.h"

#include "core/page/ChromeClient.h"

#include "core/page/EventWithHitTestResults.h"

#include "core/page/FocusController.h"

@@ -5921,6 +5922,14 @@ void Document::enforceStrictMixedContentChecking()

frame()->loader().client()->didEnforceStrictMixedContentChecking();

}

+OriginTrialContext* Document::originTrialContext()

+ if (!m_originTrialContext) {

+ m_originTrialContext = adoptPtr(new DocumentOriginTrialContext(this));

+ }

+ return m_originTrialContext.get();

DEFINE_TRACE(Document)

{

#if ENABLE(OILPAN)