| Index: third_party/WebKit/Source/core/dom/ExecutionContext.h
|
| diff --git a/third_party/WebKit/Source/core/dom/ExecutionContext.h b/third_party/WebKit/Source/core/dom/ExecutionContext.h
|
| index 45331c779893f52a608b26fd7ab3df5a38ef62a0..deebd4457581110d89b93f42845de8dbb68e16bb 100644
|
| --- a/third_party/WebKit/Source/core/dom/ExecutionContext.h
|
| +++ b/third_party/WebKit/Source/core/dom/ExecutionContext.h
|
| @@ -58,7 +58,7 @@ class SecurityOrigin;
|
| class ScriptCallStack;
|
|
|
| class CORE_EXPORT ExecutionContext
|
| - : public ContextLifecycleNotifier, public WillBeHeapSupplementable<ExecutionContext> {
|
| + : public ContextLifecycleNotifier, public HeapSupplementable<ExecutionContext> {
|
| WTF_MAKE_NONCOPYABLE(ExecutionContext);
|
| public:
|
| DECLARE_VIRTUAL_TRACE();
|
| @@ -104,9 +104,9 @@ public:
|
| KURL contextCompleteURL(const String& url) const { return virtualCompleteURL(url); }
|
|
|
| bool shouldSanitizeScriptError(const String& sourceURL, AccessControlStatus);
|
| - void reportException(PassRefPtrWillBeRawPtr<ErrorEvent>, int scriptId, PassRefPtr<ScriptCallStack>, AccessControlStatus);
|
| + void reportException(RawPtr<ErrorEvent>, int scriptId, PassRefPtr<ScriptCallStack>, AccessControlStatus);
|
|
|
| - virtual void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) = 0;
|
| + virtual void addConsoleMessage(RawPtr<ConsoleMessage>) = 0;
|
| virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) = 0;
|
|
|
| PublicURLManager& publicURLManager();
|
| @@ -167,7 +167,7 @@ protected:
|
| virtual KURL virtualCompleteURL(const String&) const = 0;
|
|
|
| private:
|
| - bool dispatchErrorEvent(PassRefPtrWillBeRawPtr<ErrorEvent>, AccessControlStatus);
|
| + bool dispatchErrorEvent(RawPtr<ErrorEvent>, AccessControlStatus);
|
| void runSuspendableTasks();
|
|
|
| #if !ENABLE(OILPAN)
|
| @@ -185,7 +185,7 @@ private:
|
| bool m_activeDOMObjectsAreSuspended;
|
| bool m_activeDOMObjectsAreStopped;
|
|
|
| - OwnPtrWillBeMember<PublicURLManager> m_publicURLManager;
|
| + Member<PublicURLManager> m_publicURLManager;
|
|
|
| // Counter that keeps track of how many window interaction calls are allowed
|
| // for this ExecutionContext. Callers are expected to call
|
|
|