[Experimental Framework] Make the OriginTrialContext a member of ExecutionContext

third_party/WebKit/Source/core/dom/Document.h

Index: third_party/WebKit/Source/core/dom/Document.h
diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
index c28883b6e1d4dfc0a840bf953fbed139ce409d9d..dddfc582d9eafcb41a49fbdc0845b7401264cdff 100644
--- a/third_party/WebKit/Source/core/dom/Document.h
+++ b/third_party/WebKit/Source/core/dom/Document.h
@@ -90,6 +90,7 @@ class DocumentFragment;
 class DocumentLoader;
 class DocumentMarkerController;
 class DocumentNameCollection;
+class DocumentOriginTrialContext;
 class DocumentParser;
 class DocumentState;
 class DocumentType;
@@ -140,6 +141,7 @@ class NodeIntersectionObserverData;
 class NodeIterator;
 class NthIndexCache;
 class OriginAccessEntry;
+class OriginTrialContext;
 class Page;
 class PlatformMouseEvent;
 class ProcessingInstruction;
@@ -1080,6 +1082,7 @@ protected:
     ParserSynchronizationPolicy getParserSynchronizationPolicy() const { return m_parserSyncPolicy; }
 
 private:
+    friend class DocumentOriginTrialContextTest;
     friend class IgnoreDestructiveWriteCountIncrementer;
     friend class NthIndexCache;
 
@@ -1162,6 +1165,8 @@ private:
 
     const OriginAccessEntry& accessEntryFromURL();
 
+    OriginTrialContext* originTrialContext() override;
+
     DocumentLifecycle m_lifecycle;
 
     bool m_hasNodesWithPlaceholderStyle;
@@ -1402,6 +1407,7 @@ private:
     PersistentWillBeMember<IntersectionObserverController> m_intersectionObserverController;
     PersistentWillBeMember<NodeIntersectionObserverData> m_intersectionObserverData;
 
+    OwnPtr<DocumentOriginTrialContext> m_originTrialContext;

[jbroman, 2016/03/01 23:29:21]

Why do we need a separate member here, when we only use it to create
originTrialContext? It seems wasteful to have a field that is only ever read
once.

If Document and DocumentOriginTrialContext are going to be separate objects
anyhow, how about having the method be something like:

PassOwnPtrWillBeRawPtr<OriginTrialContext> createOriginTrialContext() override;

And then the owning pointer would be held by the OriginTrials object, and no
field would be needed here.

[iclelland, 2016/03/03 21:47:00]

Done.

     int m_nodeCount;
 };