| Index: third_party/WebKit/Source/core/dom/Document.h
|
| diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
|
| index 15dbe5a785f64644026c1faee0e4e9dc66d9f9d3..36ae42752e9ef9de17cad8adf7a6b32250902c9b 100644
|
| --- a/third_party/WebKit/Source/core/dom/Document.h
|
| +++ b/third_party/WebKit/Source/core/dom/Document.h
|
| @@ -55,9 +55,8 @@
|
| #include "public/platform/WebFocusType.h"
|
| #include "public/platform/WebInsecureRequestPolicy.h"
|
| #include "wtf/HashSet.h"
|
| -#include "wtf/OwnPtr.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| #include "wtf/PassRefPtr.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -670,7 +669,7 @@ public:
|
| void setWindowAttributeEventListener(const AtomicString& eventType, EventListener*);
|
| EventListener* getWindowAttributeEventListener(const AtomicString& eventType);
|
|
|
| - static void registerEventFactory(PassOwnPtr<EventFactoryBase>);
|
| + static void registerEventFactory(std::unique_ptr<EventFactoryBase>);
|
| static Event* createEvent(ExecutionContext*, const String& eventType, ExceptionState&);
|
|
|
| // keep track of what types of event listeners are registered, so we don't
|
| @@ -811,7 +810,7 @@ public:
|
| void pushCurrentScript(Element*);
|
| void popCurrentScript();
|
|
|
| - void setTransformSource(PassOwnPtr<TransformSource>);
|
| + void setTransformSource(std::unique_ptr<TransformSource>);
|
| TransformSource* transformSource() const { return m_transformSource.get(); }
|
|
|
| void incDOMTreeVersion() { DCHECK(m_lifecycle.stateAllowsTreeMutations()); m_domTreeVersion = ++s_globalTreeVersion; }
|
| @@ -948,7 +947,7 @@ public:
|
| void cancelIdleCallback(int id);
|
|
|
| EventTarget* errorEventTarget() final;
|
| - void logExceptionToConsole(const String& errorMessage, PassOwnPtr<SourceLocation>) final;
|
| + void logExceptionToConsole(const String& errorMessage, std::unique_ptr<SourceLocation>) final;
|
|
|
| void initDNSPrefetch();
|
|
|
| @@ -1176,7 +1175,7 @@ private:
|
|
|
| void setHoverNode(Node*);
|
|
|
| - using EventFactorySet = HashSet<OwnPtr<EventFactoryBase>>;
|
| + using EventFactorySet = HashSet<std::unique_ptr<EventFactoryBase>>;
|
| static EventFactorySet& eventFactories();
|
|
|
| void setNthIndexCache(NthIndexCache* nthIndexCache) { DCHECK(!m_nthIndexCache || !nthIndexCache); m_nthIndexCache = nthIndexCache; }
|
| @@ -1209,7 +1208,7 @@ private:
|
| KURL m_baseURLOverride; // An alternative base URL that takes precedence over m_baseURL (but not m_baseElementURL).
|
| KURL m_baseElementURL; // The URL set by the <base> element.
|
| KURL m_cookieURL; // The URL to use for cookie access.
|
| - OwnPtr<OriginAccessEntry> m_accessEntryFromURL;
|
| + std::unique_ptr<OriginAccessEntry> m_accessEntryFromURL;
|
|
|
| AtomicString m_baseTarget;
|
|
|
| @@ -1228,7 +1227,7 @@ private:
|
| CompatibilityMode m_compatibilityMode;
|
| bool m_compatibilityModeLocked; // This is cheaper than making setCompatibilityMode virtual.
|
|
|
| - OwnPtr<CancellableTaskFactory> m_executeScriptsWaitingForResourcesTask;
|
| + std::unique_ptr<CancellableTaskFactory> m_executeScriptsWaitingForResourcesTask;
|
|
|
| bool m_hasAutofocused;
|
| Timer<Document> m_clearFocusedElementTimer;
|
| @@ -1295,7 +1294,7 @@ private:
|
|
|
| HeapVector<Member<Element>> m_currentScriptStack;
|
|
|
| - OwnPtr<TransformSource> m_transformSource;
|
| + std::unique_ptr<TransformSource> m_transformSource;
|
|
|
| String m_xmlEncoding;
|
| String m_xmlVersion;
|
| @@ -1321,7 +1320,7 @@ private:
|
| bool m_hasAnnotatedRegions;
|
| bool m_annotatedRegionsDirty;
|
|
|
| - OwnPtr<SelectorQueryCache> m_selectorQueryCache;
|
| + std::unique_ptr<SelectorQueryCache> m_selectorQueryCache;
|
|
|
| // It is safe to keep a raw, untraced pointer to this stack-allocated
|
| // cache object: it is set upon the cache object being allocated on
|
| @@ -1365,7 +1364,7 @@ private:
|
|
|
| Member<ScriptedAnimationController> m_scriptedAnimationController;
|
| Member<ScriptedIdleTaskController> m_scriptedIdleTaskController;
|
| - OwnPtr<MainThreadTaskRunner> m_taskRunner;
|
| + std::unique_ptr<MainThreadTaskRunner> m_taskRunner;
|
| Member<TextAutosizer> m_textAutosizer;
|
|
|
| Member<V0CustomElementRegistrationContext> m_registrationContext;
|
| @@ -1376,7 +1375,7 @@ private:
|
|
|
| Member<ElementDataCache> m_elementDataCache;
|
|
|
| - using LocaleIdentifierToLocaleMap = HashMap<AtomicString, OwnPtr<Locale>>;
|
| + using LocaleIdentifierToLocaleMap = HashMap<AtomicString, std::unique_ptr<Locale>>;
|
| LocaleIdentifierToLocaleMap m_localeCache;
|
|
|
| Member<AnimationTimeline> m_timeline;
|
|
|