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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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/core/inspector/InspectorDOMAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
index c49f92367ee1f2892c7326c403ced6ba241b7893..da950b94dfce28730bfa4c21670e0a73d3374ee1 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
@@ -1166,7 +1166,7 @@ Response InspectorDOMAgent::highlightConfigFromInspectorObject(
protocol::DOM::HighlightConfig* config = highlightInspectorObject.fromJust();
std::unique_ptr<InspectorHighlightConfig> highlightConfig =
- makeUnique<InspectorHighlightConfig>();
+ WTF::makeUnique<InspectorHighlightConfig>();
highlightConfig->showInfo = config->getShowInfo(false);
highlightConfig->showRulers = config->getShowRulers(false);
highlightConfig->showExtensionLines = config->getShowExtensionLines(false);
@@ -1218,7 +1218,7 @@ Response InspectorDOMAgent::highlightRect(
Maybe<protocol::DOM::RGBA> color,
Maybe<protocol::DOM::RGBA> outlineColor) {
std::unique_ptr<FloatQuad> quad =
- wrapUnique(new FloatQuad(FloatRect(x, y, width, height)));
+ WTF::wrapUnique(new FloatQuad(FloatRect(x, y, width, height)));
innerHighlightQuad(std::move(quad), std::move(color),
std::move(outlineColor));
return Response::OK();
@@ -1228,7 +1228,7 @@ Response InspectorDOMAgent::highlightQuad(
std::unique_ptr<protocol::Array<double>> quadArray,
Maybe<protocol::DOM::RGBA> color,
Maybe<protocol::DOM::RGBA> outlineColor) {
- std::unique_ptr<FloatQuad> quad = makeUnique<FloatQuad>();
+ std::unique_ptr<FloatQuad> quad = WTF::makeUnique<FloatQuad>();
if (!parseQuad(std::move(quadArray), quad.get()))
return Response::Error("Invalid Quad format");
innerHighlightQuad(std::move(quad), std::move(color),
@@ -1241,7 +1241,7 @@ void InspectorDOMAgent::innerHighlightQuad(
Maybe<protocol::DOM::RGBA> color,
Maybe<protocol::DOM::RGBA> outlineColor) {
std::unique_ptr<InspectorHighlightConfig> highlightConfig =
- makeUnique<InspectorHighlightConfig>();
+ WTF::makeUnique<InspectorHighlightConfig>();
highlightConfig->content = parseColor(color.fromMaybe(nullptr));
highlightConfig->contentOutline = parseColor(outlineColor.fromMaybe(nullptr));
if (m_client)
@@ -1308,7 +1308,7 @@ Response InspectorDOMAgent::highlightFrame(
// FIXME: Inspector doesn't currently work cross process.
if (frame && frame->deprecatedLocalOwner()) {
std::unique_ptr<InspectorHighlightConfig> highlightConfig =
- makeUnique<InspectorHighlightConfig>();
+ WTF::makeUnique<InspectorHighlightConfig>();
highlightConfig->showInfo = true; // Always show tooltips for frames.
highlightConfig->content = parseColor(color.fromMaybe(nullptr));
highlightConfig->contentOutline =
@@ -2205,7 +2205,7 @@ Response InspectorDOMAgent::setInspectedNode(int nodeId) {
Response response = assertNode(nodeId, node);
if (!response.isSuccess())
return response;
- m_v8Session->addInspectedObject(makeUnique<InspectableNode>(node));
+ m_v8Session->addInspectedObject(WTF::makeUnique<InspectableNode>(node));
return Response::OK();
}

Powered by Google App Engine
This is Rietveld 408576698