| Index: third_party/WebKit/Source/web/InspectorOverlay.cpp
|
| diff --git a/third_party/WebKit/Source/web/InspectorOverlay.cpp b/third_party/WebKit/Source/web/InspectorOverlay.cpp
|
| index 80d894ccaa2b2582ea1d985920735caaa559b144..f88ab50db708e304dce64fbf1084590997741fad 100644
|
| --- a/third_party/WebKit/Source/web/InspectorOverlay.cpp
|
| +++ b/third_party/WebKit/Source/web/InspectorOverlay.cpp
|
| @@ -58,7 +58,6 @@
|
| #include "web/WebInputEventConversion.h"
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/WebViewImpl.h"
|
| -#include <memory>
|
| #include <v8.h>
|
|
|
| namespace blink {
|
| @@ -321,7 +320,7 @@ void InspectorOverlay::highlightNode(Node* node, Node* eventTarget, const Inspec
|
| scheduleUpdate();
|
| }
|
|
|
| -void InspectorOverlay::setInspectMode(InspectorDOMAgent::SearchMode searchMode, std::unique_ptr<InspectorHighlightConfig> highlightConfig)
|
| +void InspectorOverlay::setInspectMode(InspectorDOMAgent::SearchMode searchMode, PassOwnPtr<InspectorHighlightConfig> highlightConfig)
|
| {
|
| if (m_layoutEditor)
|
| overlayClearSelection(true);
|
| @@ -349,7 +348,7 @@ void InspectorOverlay::setInspectedNode(Node* node)
|
| initializeLayoutEditorIfNeeded(node);
|
| }
|
|
|
| -void InspectorOverlay::highlightQuad(std::unique_ptr<FloatQuad> quad, const InspectorHighlightConfig& highlightConfig)
|
| +void InspectorOverlay::highlightQuad(PassOwnPtr<FloatQuad> quad, const InspectorHighlightConfig& highlightConfig)
|
| {
|
| m_quadHighlightConfig = highlightConfig;
|
| m_highlightQuad = std::move(quad);
|
|
|