Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(871)

Unified Diff: third_party/WebKit/Source/web/InspectorOverlay.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/InspectorOverlay.h
diff --git a/third_party/WebKit/Source/web/InspectorOverlay.h b/third_party/WebKit/Source/web/InspectorOverlay.h
index c9daa2bf45269017d160bb1ec4b47993910d8fe9..3975ed16876636023752907eee22060a6df0c59b 100644
--- a/third_party/WebKit/Source/web/InspectorOverlay.h
+++ b/third_party/WebKit/Source/web/InspectorOverlay.h
@@ -38,9 +38,10 @@
#include "platform/heap/Handle.h"
#include "platform/inspector_protocol/Values.h"
#include "public/web/WebInputEvent.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
#include "wtf/RefPtr.h"
#include "wtf/text/WTFString.h"
-#include <memory>
namespace blink {
@@ -109,8 +110,8 @@ private:
// InspectorDOMAgent::Client implementation.
void hideHighlight() override;
void highlightNode(Node*, const InspectorHighlightConfig&, bool omitTooltip) override;
- void highlightQuad(std::unique_ptr<FloatQuad>, const InspectorHighlightConfig&) override;
- void setInspectMode(InspectorDOMAgent::SearchMode, std::unique_ptr<InspectorHighlightConfig>) override;
+ void highlightQuad(PassOwnPtr<FloatQuad>, const InspectorHighlightConfig&) override;
+ void setInspectMode(InspectorDOMAgent::SearchMode, PassOwnPtr<InspectorHighlightConfig>) override;
void setInspectedNode(Node*) override;
void highlightNode(Node*, Node* eventTarget, const InspectorHighlightConfig&, bool omitTooltip);
@@ -144,7 +145,7 @@ private:
Member<Node> m_highlightNode;
Member<Node> m_eventTargetNode;
InspectorHighlightConfig m_nodeHighlightConfig;
- std::unique_ptr<FloatQuad> m_highlightQuad;
+ OwnPtr<FloatQuad> m_highlightQuad;
Member<Page> m_overlayPage;
Member<InspectorOverlayChromeClient> m_overlayChromeClient;
Member<InspectorOverlayHost> m_overlayHost;
@@ -160,10 +161,10 @@ private:
Member<InspectorDOMAgent> m_domAgent;
Member<InspectorCSSAgent> m_cssAgent;
Member<LayoutEditor> m_layoutEditor;
- std::unique_ptr<PageOverlay> m_pageOverlay;
+ OwnPtr<PageOverlay> m_pageOverlay;
Member<Node> m_hoveredNodeForInspectMode;
InspectorDOMAgent::SearchMode m_inspectMode;
- std::unique_ptr<InspectorHighlightConfig> m_inspectModeHighlightConfig;
+ OwnPtr<InspectorHighlightConfig> m_inspectModeHighlightConfig;
};
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/web/FullscreenController.h ('k') | third_party/WebKit/Source/web/InspectorOverlay.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698