Index: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h |
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h |
index 68468d6d5e1a2df4def93bca633d493f8396d2ad..84dc60e2f2534001f59c5d931d2ff438c61b8a6a 100644 |
--- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h |
+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h |
@@ -39,14 +39,12 @@ |
#include "platform/geometry/FloatQuad.h" |
#include "platform/inspector_protocol/Values.h" |
#include "platform/v8_inspector/public/V8InspectorSession.h" |
- |
#include "wtf/HashMap.h" |
#include "wtf/HashSet.h" |
-#include "wtf/OwnPtr.h" |
-#include "wtf/PassOwnPtr.h" |
#include "wtf/RefPtr.h" |
#include "wtf/Vector.h" |
#include "wtf/text/AtomicString.h" |
+#include <memory> |
namespace blink { |
@@ -89,8 +87,8 @@ public: |
virtual ~Client() { } |
virtual void hideHighlight() { } |
virtual void highlightNode(Node*, const InspectorHighlightConfig&, bool omitTooltip) { } |
- virtual void highlightQuad(PassOwnPtr<FloatQuad>, const InspectorHighlightConfig&) { } |
- virtual void setInspectMode(SearchMode searchMode, PassOwnPtr<InspectorHighlightConfig>) { } |
+ virtual void highlightQuad(std::unique_ptr<FloatQuad>, const InspectorHighlightConfig&) { } |
+ virtual void setInspectMode(SearchMode searchMode, std::unique_ptr<InspectorHighlightConfig>) { } |
virtual void setInspectedNode(Node*) { } |
}; |
@@ -200,7 +198,7 @@ private: |
void innerEnable(); |
void setSearchingForNode(ErrorString*, SearchMode, const Maybe<protocol::DOM::HighlightConfig>&); |
- PassOwnPtr<InspectorHighlightConfig> highlightConfigFromInspectorObject(ErrorString*, const Maybe<protocol::DOM::HighlightConfig>& highlightInspectorObject); |
+ std::unique_ptr<InspectorHighlightConfig> highlightConfigFromInspectorObject(ErrorString*, const Maybe<protocol::DOM::HighlightConfig>& highlightInspectorObject); |
// Node-related methods. |
typedef HeapHashMap<Member<Node>, int> NodeToIdMap; |
@@ -228,7 +226,7 @@ private: |
void discardFrontendBindings(); |
- void innerHighlightQuad(PassOwnPtr<FloatQuad>, const Maybe<protocol::DOM::RGBA>& color, const Maybe<protocol::DOM::RGBA>& outlineColor); |
+ void innerHighlightQuad(std::unique_ptr<FloatQuad>, const Maybe<protocol::DOM::RGBA>& color, const Maybe<protocol::DOM::RGBA>& outlineColor); |
bool pushDocumentUponHandlelessOperation(ErrorString*); |