| Index: third_party/WebKit/Source/core/dom/ContextFeatures.h
|
| diff --git a/third_party/WebKit/Source/core/dom/ContextFeatures.h b/third_party/WebKit/Source/core/dom/ContextFeatures.h
|
| index 78766a60811612a09566ba38d393c13ed47c3cc5..16ea1954269a215f3d1f73255bf14fc401c19585 100644
|
| --- a/third_party/WebKit/Source/core/dom/ContextFeatures.h
|
| +++ b/third_party/WebKit/Source/core/dom/ContextFeatures.h
|
| @@ -30,6 +30,7 @@
|
| #include "core/CoreExport.h"
|
| #include "core/page/Page.h"
|
| #include "platform/heap/Handle.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -48,7 +49,7 @@ public:
|
|
|
| static const char* supplementName();
|
| static ContextFeatures& defaultSwitch();
|
| - static ContextFeatures* create(PassOwnPtr<ContextFeaturesClient>);
|
| + static ContextFeatures* create(std::unique_ptr<ContextFeaturesClient>);
|
|
|
| static bool pagePopupEnabled(Document*);
|
| static bool mutationEventsEnabled(Document*);
|
| @@ -57,27 +58,27 @@ public:
|
| void urlDidChange(Document*);
|
|
|
| private:
|
| - explicit ContextFeatures(PassOwnPtr<ContextFeaturesClient> client)
|
| + explicit ContextFeatures(std::unique_ptr<ContextFeaturesClient> client)
|
| : m_client(std::move(client))
|
| { }
|
|
|
| - OwnPtr<ContextFeaturesClient> m_client;
|
| + std::unique_ptr<ContextFeaturesClient> m_client;
|
| };
|
|
|
| class ContextFeaturesClient {
|
| USING_FAST_MALLOC(ContextFeaturesClient);
|
| public:
|
| - static PassOwnPtr<ContextFeaturesClient> empty();
|
| + static std::unique_ptr<ContextFeaturesClient> empty();
|
|
|
| virtual ~ContextFeaturesClient() { }
|
| virtual bool isEnabled(Document*, ContextFeatures::FeatureType, bool defaultValue) { return defaultValue; }
|
| virtual void urlDidChange(Document*) { }
|
| };
|
|
|
| -CORE_EXPORT void provideContextFeaturesTo(Page&, PassOwnPtr<ContextFeaturesClient>);
|
| +CORE_EXPORT void provideContextFeaturesTo(Page&, std::unique_ptr<ContextFeaturesClient>);
|
| void provideContextFeaturesToDocumentFrom(Document&, Page&);
|
|
|
| -inline ContextFeatures* ContextFeatures::create(PassOwnPtr<ContextFeaturesClient> client)
|
| +inline ContextFeatures* ContextFeatures::create(std::unique_ptr<ContextFeaturesClient> client)
|
| {
|
| return new ContextFeatures(std::move(client));
|
| }
|
|
|