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

Side by Side Diff: third_party/WebKit/Source/web/InspectorOverlay.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 20 matching lines...) Expand all
31 31
32 #include "core/inspector/InspectorDOMAgent.h" 32 #include "core/inspector/InspectorDOMAgent.h"
33 #include "core/inspector/InspectorOverlayHost.h" 33 #include "core/inspector/InspectorOverlayHost.h"
34 #include "platform/Timer.h" 34 #include "platform/Timer.h"
35 #include "platform/geometry/FloatQuad.h" 35 #include "platform/geometry/FloatQuad.h"
36 #include "platform/geometry/LayoutRect.h" 36 #include "platform/geometry/LayoutRect.h"
37 #include "platform/graphics/Color.h" 37 #include "platform/graphics/Color.h"
38 #include "platform/heap/Handle.h" 38 #include "platform/heap/Handle.h"
39 #include "platform/inspector_protocol/Values.h" 39 #include "platform/inspector_protocol/Values.h"
40 #include "public/web/WebInputEvent.h" 40 #include "public/web/WebInputEvent.h"
41 #include "wtf/OwnPtr.h"
42 #include "wtf/PassOwnPtr.h"
43 #include "wtf/RefPtr.h" 41 #include "wtf/RefPtr.h"
44 #include "wtf/text/WTFString.h" 42 #include "wtf/text/WTFString.h"
43 #include <memory>
45 44
46 namespace blink { 45 namespace blink {
47 46
48 class Color; 47 class Color;
49 class EmptyChromeClient; 48 class EmptyChromeClient;
50 class LocalFrame; 49 class LocalFrame;
51 class GraphicsContext; 50 class GraphicsContext;
52 class GraphicsLayer; 51 class GraphicsLayer;
53 class InspectorCSSAgent; 52 class InspectorCSSAgent;
54 class LayoutEditor; 53 class LayoutEditor;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 void overlayStartedPropertyChange(const String&) override; 102 void overlayStartedPropertyChange(const String&) override;
104 void overlayPropertyChanged(float) override; 103 void overlayPropertyChanged(float) override;
105 void overlayEndedPropertyChange() override; 104 void overlayEndedPropertyChange() override;
106 void overlayClearSelection(bool) override; 105 void overlayClearSelection(bool) override;
107 void overlayNextSelector() override; 106 void overlayNextSelector() override;
108 void overlayPreviousSelector() override; 107 void overlayPreviousSelector() override;
109 108
110 // InspectorDOMAgent::Client implementation. 109 // InspectorDOMAgent::Client implementation.
111 void hideHighlight() override; 110 void hideHighlight() override;
112 void highlightNode(Node*, const InspectorHighlightConfig&, bool omitTooltip) override; 111 void highlightNode(Node*, const InspectorHighlightConfig&, bool omitTooltip) override;
113 void highlightQuad(PassOwnPtr<FloatQuad>, const InspectorHighlightConfig&) o verride; 112 void highlightQuad(std::unique_ptr<FloatQuad>, const InspectorHighlightConfi g&) override;
114 void setInspectMode(InspectorDOMAgent::SearchMode, PassOwnPtr<InspectorHighl ightConfig>) override; 113 void setInspectMode(InspectorDOMAgent::SearchMode, std::unique_ptr<Inspector HighlightConfig>) override;
115 void setInspectedNode(Node*) override; 114 void setInspectedNode(Node*) override;
116 115
117 void highlightNode(Node*, Node* eventTarget, const InspectorHighlightConfig& , bool omitTooltip); 116 void highlightNode(Node*, Node* eventTarget, const InspectorHighlightConfig& , bool omitTooltip);
118 bool isEmpty(); 117 bool isEmpty();
119 void drawNodeHighlight(); 118 void drawNodeHighlight();
120 void drawQuadHighlight(); 119 void drawQuadHighlight();
121 void drawPausedInDebuggerMessage(); 120 void drawPausedInDebuggerMessage();
122 void drawViewSize(); 121 void drawViewSize();
123 122
124 Page* overlayPage(); 123 Page* overlayPage();
(...skipping 13 matching lines...) Expand all
138 bool handleMouseMove(const PlatformMouseEvent&); 137 bool handleMouseMove(const PlatformMouseEvent&);
139 bool shouldSearchForNode(); 138 bool shouldSearchForNode();
140 void inspect(Node*); 139 void inspect(Node*);
141 void initializeLayoutEditorIfNeeded(Node*); 140 void initializeLayoutEditorIfNeeded(Node*);
142 141
143 WebViewImpl* m_webViewImpl; 142 WebViewImpl* m_webViewImpl;
144 String m_pausedInDebuggerMessage; 143 String m_pausedInDebuggerMessage;
145 Member<Node> m_highlightNode; 144 Member<Node> m_highlightNode;
146 Member<Node> m_eventTargetNode; 145 Member<Node> m_eventTargetNode;
147 InspectorHighlightConfig m_nodeHighlightConfig; 146 InspectorHighlightConfig m_nodeHighlightConfig;
148 OwnPtr<FloatQuad> m_highlightQuad; 147 std::unique_ptr<FloatQuad> m_highlightQuad;
149 Member<Page> m_overlayPage; 148 Member<Page> m_overlayPage;
150 Member<InspectorOverlayChromeClient> m_overlayChromeClient; 149 Member<InspectorOverlayChromeClient> m_overlayChromeClient;
151 Member<InspectorOverlayHost> m_overlayHost; 150 Member<InspectorOverlayHost> m_overlayHost;
152 InspectorHighlightConfig m_quadHighlightConfig; 151 InspectorHighlightConfig m_quadHighlightConfig;
153 bool m_drawViewSize; 152 bool m_drawViewSize;
154 bool m_resizeTimerActive; 153 bool m_resizeTimerActive;
155 bool m_omitTooltip; 154 bool m_omitTooltip;
156 Timer<InspectorOverlay> m_timer; 155 Timer<InspectorOverlay> m_timer;
157 int m_suspendCount; 156 int m_suspendCount;
158 bool m_inLayout; 157 bool m_inLayout;
159 bool m_needsUpdate; 158 bool m_needsUpdate;
160 V8InspectorSession* m_v8Session; 159 V8InspectorSession* m_v8Session;
161 Member<InspectorDOMAgent> m_domAgent; 160 Member<InspectorDOMAgent> m_domAgent;
162 Member<InspectorCSSAgent> m_cssAgent; 161 Member<InspectorCSSAgent> m_cssAgent;
163 Member<LayoutEditor> m_layoutEditor; 162 Member<LayoutEditor> m_layoutEditor;
164 OwnPtr<PageOverlay> m_pageOverlay; 163 std::unique_ptr<PageOverlay> m_pageOverlay;
165 Member<Node> m_hoveredNodeForInspectMode; 164 Member<Node> m_hoveredNodeForInspectMode;
166 InspectorDOMAgent::SearchMode m_inspectMode; 165 InspectorDOMAgent::SearchMode m_inspectMode;
167 OwnPtr<InspectorHighlightConfig> m_inspectModeHighlightConfig; 166 std::unique_ptr<InspectorHighlightConfig> m_inspectModeHighlightConfig;
168 }; 167 };
169 168
170 } // namespace blink 169 } // namespace blink
171 170
172 171
173 #endif // InspectorOverlay_h 172 #endif // InspectorOverlay_h
OLDNEW
« 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