| Index: Source/core/dom/ExecutionContext.h
|
| diff --git a/Source/core/dom/ExecutionContext.h b/Source/core/dom/ExecutionContext.h
|
| index 00e4bb4154047454c5dde7314fee58ab6783e0e2..8c883f81e7832874f3165d0cc2210589d7ea5a14 100644
|
| --- a/Source/core/dom/ExecutionContext.h
|
| +++ b/Source/core/dom/ExecutionContext.h
|
| @@ -29,7 +29,6 @@
|
| #define ExecutionContext_h
|
|
|
| #include "core/dom/ActiveDOMObject.h"
|
| -#include "core/dom/SandboxFlags.h"
|
| #include "core/dom/SecurityContext.h"
|
| #include "core/fetch/CrossOriginAccessControl.h"
|
| #include "core/frame/ConsoleTypes.h"
|
| @@ -68,7 +67,6 @@ public:
|
| virtual bool isJSExecutionForbidden() const { return false; }
|
| SecurityOrigin* securityOrigin();
|
| ContentSecurityPolicy* contentSecurityPolicy();
|
| - virtual void didUpdateSecurityOrigin() = 0;
|
| const KURL& url() const;
|
| KURL completeURL(const String& url) const;
|
| virtual void disableEval(const String& errorMessage) = 0;
|
| @@ -124,10 +122,6 @@ public:
|
| int timerNestingLevel() { return m_timerNestingLevel; }
|
| void setTimerNestingLevel(int level) { m_timerNestingLevel = level; }
|
|
|
| - SandboxFlags sandboxFlags() const { return m_sandboxFlags; }
|
| - bool isSandboxed(SandboxFlags mask) const { return m_sandboxFlags & mask; }
|
| - void enforceSandboxFlags(SandboxFlags mask);
|
| -
|
| PassOwnPtr<LifecycleNotifier<ExecutionContext> > createLifecycleNotifier();
|
|
|
| virtual EventTarget* errorEventTarget() = 0;
|
| @@ -164,8 +158,6 @@ private:
|
| int installNewTimeout(PassOwnPtr<ScheduledAction>, int timeout, bool singleShot);
|
| void removeTimeoutByID(int timeoutID); // This makes underlying DOMTimer instance destructed.
|
|
|
| - SandboxFlags m_sandboxFlags;
|
| -
|
| int m_circularSequentialID;
|
| typedef WillBeHeapHashMap<int, RefPtrWillBeMember<DOMTimer> > TimeoutMap;
|
| TimeoutMap m_timeouts;
|
|
|