Basic experimental suborigin CSP directive and SecurityOrigin mods

Source/core/dom/ExecutionContext.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2012 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 19 matching lines @@
 
 #include "core/dom/ExecutionContextTask.h"
 #include "core/events/ErrorEvent.h"
 #include "core/events/EventTarget.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/html/PublicURLManager.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThread.h"
+#include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/MainThread.h"
 
 namespace blink {
 
 class ExecutionContext::PendingException : public NoBaseWillBeGarbageCollectedFinalized<ExecutionContext::PendingException> {
     WTF_MAKE_NONCOPYABLE(PendingException);
 public:
     PendingException(const String& errorMessage, int lineNumber, int columnNumber, int scriptId, const String& sourceURL, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
         : m_errorMessage(errorMessage)
         , m_lineNumber(lineNumber)
@@ skipping 196 matching lines @@
 bool ExecutionContext::isWindowInteractionAllowed() const
 {
     return m_windowInteractionTokens > 0;
 }
 
 void ExecutionContext::removeURLFromMemoryCache(const KURL& url)
 {
     memoryCache()->removeURLFromCache(url);
 }
 
+// |name| should be non-empty, and this should be enforced by parsing.
+void ExecutionContext::enforceSuborigin(const String& name)
+{
+    if (name.isNull())
+        return;
+    ASSERT(!name.isEmpty());
+    ASSERT(RuntimeEnabledFeatures::suboriginsEnabled());

[jochen (gone - plz use gerrit), 2015/04/27 19:35:10]

maybe just return if it's not enabled?

[jww, 2015/05/30 01:11:07]

If Suborigins aren't enabled, then the CSP directive will just fail silently,
but it should never reach here, so I'd rather leave this as an ASSERT if that's
OK.

+    SecurityOrigin* origin = securityContext().securityOrigin();
+    ASSERT(origin);
+    ASSERT(!origin->hasSuborigin() || origin->suboriginName() == name);
+    origin->addSuborigin(name);
+    securityContext().didUpdateSecurityOrigin();
+}
+
 DEFINE_TRACE(ExecutionContext)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_pendingExceptions);
     visitor->trace(m_publicURLManager);
     HeapSupplementable<ExecutionContext>::trace(visitor);
 #endif
     ContextLifecycleNotifier::trace(visitor);
 }
 
 } // namespace blink