| Index: Source/core/dom/ExecutionContext.h
|
| diff --git a/Source/core/dom/ExecutionContext.h b/Source/core/dom/ExecutionContext.h
|
| index a77fafca67e6b2dfea922fa08727a444b702ae9d..dc8834e2989d06ce5c5d67cf48698fd2ba642b9f 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;
|
| @@ -161,8 +155,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, OwnPtrWillBeMember<DOMTimer> > TimeoutMap;
|
| TimeoutMap m_timeouts;
|
|
|