Make canNavigate() OOPI-friendly

Source/core/dom/ExecutionContext.h

 /*
  * 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 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef ExecutionContext_h
 #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"
 #include "core/frame/DOMTimer.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "platform/LifecycleContext.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/Functional.h"
@@ skipping 18 matching lines @@
     virtual void trace(Visitor*) override;
 
     virtual bool isDocument() const { return false; }
     virtual bool isWorkerGlobalScope() const { return false; }
     virtual bool isDedicatedWorkerGlobalScope() const { return false; }
     virtual bool isSharedWorkerGlobalScope() const { return false; }
     virtual bool isServiceWorkerGlobalScope() const { return false; }
     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;
     virtual LocalDOMWindow* executingWindow() { return 0; }
     virtual String userAgent(const KURL&) const = 0;
     virtual void postTask(PassOwnPtr<ExecutionContextTask>) = 0; // Executes the task on context's thread asynchronously.
     virtual double timerAlignmentInterval() const = 0;
 
     virtual void reportBlockedScriptExecutionToInspector(const String& directiveText) = 0;
 
@@ skipping 35 matching lines @@
 #endif
 
     // Gets the next id in a circular sequence from 1 to 2^31-1.
     int circularSequentialID();
 
     void didChangeTimerAlignmentInterval();
 
     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;
     virtual EventQueue* eventQueue() const = 0;
 
     void allowWindowFocus();
     void consumeWindowFocus();
     bool isWindowFocusAllowed() const;
 
 protected:
@@ skipping 13 matching lines @@
 #if !ENABLE(OILPAN)
     virtual void refExecutionContext() = 0;
     virtual void derefExecutionContext() = 0;
 #endif
     // LifecycleContext implementation.
 
     // Implementation details for DOMTimer. No other classes should call these functions.
     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;
     int m_timerNestingLevel;
 
     bool m_inDispatchErrorEvent;
     class PendingException;
     OwnPtrWillBeMember<WillBeHeapVector<OwnPtrWillBeMember<PendingException> > > m_pendingExceptions;
 
     bool m_activeDOMObjectsAreSuspended;
     bool m_activeDOMObjectsAreStopped;
 
     OwnPtrWillBeMember<PublicURLManager> m_publicURLManager;
 
     // The location of this member is important; to make sure contextDestroyed() notification on
     // ExecutionContext's members (notably m_timeouts) is called before they are destructed,
     // m_lifecycleNotifer should be placed *after* such members.
     OwnPtr<ContextLifecycleNotifier> m_lifecycleNotifier;
 
     // Counter that keeps track of how many window focus calls are allowed for
     // this ExecutionContext. Callers are expected to call |allowWindowFocus()|
     // and |consumeWindowFocus()| in order to increment and decrement the
     // counter.
     int m_windowFocusTokens;
 };
 
 } // namespace blink
 
 #endif // ExecutionContext_h