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

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

Issue 1979183002: Remove OwnPtr::release() calls in core/ (part 3). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with trunk. Created 4 years, 7 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/core/inspector/InspectorTraceEvents.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
index b3016e3008884f67e2ef33cbf526ae0f19d2778f..1bb3cd0e27ef3d61cd1e944129be56a08ada16c2 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
@@ -176,7 +176,7 @@ PassOwnPtr<TracedValue> fillCommonPart(Element& element, const InvalidationSet&
value->setString("invalidatedSelectorId", invalidatedSelector);
if (RefPtr<ScriptCallStack> stackTrace = ScriptCallStack::capture(1))
stackTrace->toTracedValue(value.get(), "stackTrace");
- return value.release();
+ return value;
}
} // namespace InspectorScheduleStyleInvalidationTrackingEvent
@@ -203,28 +203,28 @@ PassOwnPtr<TracedValue> InspectorScheduleStyleInvalidationTrackingEvent::idChang
{
OwnPtr<TracedValue> value = fillCommonPart(element, invalidationSet, Id);
value->setString("changedId", id);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorScheduleStyleInvalidationTrackingEvent::classChange(Element& element, const InvalidationSet& invalidationSet, const AtomicString& className)
{
OwnPtr<TracedValue> value = fillCommonPart(element, invalidationSet, Class);
value->setString("changedClass", className);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorScheduleStyleInvalidationTrackingEvent::attributeChange(Element& element, const InvalidationSet& invalidationSet, const QualifiedName& attributeName)
{
OwnPtr<TracedValue> value = fillCommonPart(element, invalidationSet, Attribute);
value->setString("changedAttribute", attributeName.toString());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorScheduleStyleInvalidationTrackingEvent::pseudoChange(Element& element, const InvalidationSet& invalidationSet, CSSSelector::PseudoType pseudoType)
{
OwnPtr<TracedValue> value = fillCommonPart(element, invalidationSet, Attribute);
value->setString("changedPseudo", pseudoTypeToString(pseudoType));
- return value.release();
+ return value;
}
String descendantInvalidationSetToIdString(const InvalidationSet& set)
@@ -247,7 +247,7 @@ PassOwnPtr<TracedValue> fillCommonPart(Element& element, const char* reason)
value->setString("frame", toHexString(element.document().frame()));
setNodeInfo(value.get(), &element, "nodeId", "nodeName");
value->setString("reason", reason);
- return value.release();
+ return value;
}
} // namespace InspectorStyleInvalidatorInvalidateEvent
@@ -263,7 +263,7 @@ PassOwnPtr<TracedValue> InspectorStyleInvalidatorInvalidateEvent::selectorPart(E
invalidationSet.toTracedValue(value.get());
value->endArray();
value->setString("selectorPart", selectorPart);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorStyleInvalidatorInvalidateEvent::invalidationList(Element& element, const Vector<RefPtr<InvalidationSet>>& invalidationList)
@@ -273,7 +273,7 @@ PassOwnPtr<TracedValue> InspectorStyleInvalidatorInvalidateEvent::invalidationLi
for (const auto& invalidationSet : invalidationList)
invalidationSet->toTracedValue(value.get());
value->endArray();
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorStyleRecalcInvalidationTrackingEvent::data(Node* node, const StyleChangeReasonForTracing& reason)
@@ -287,7 +287,7 @@ PassOwnPtr<TracedValue> InspectorStyleRecalcInvalidationTrackingEvent::data(Node
value->setString("extraData", reason.getExtraData());
if (RefPtr<ScriptCallStack> stackTrace = ScriptCallStack::capture(1))
stackTrace->toTracedValue(value.get(), "stackTrace");
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorLayoutEvent::beginData(FrameView* frameView)
@@ -304,7 +304,7 @@ PassOwnPtr<TracedValue> InspectorLayoutEvent::beginData(FrameView* frameView)
value->setBoolean("partialLayout", isPartial);
value->setString("frame", toHexString(&frame));
setCallStack(value.get());
- return value.release();
+ return value;
}
static void createQuad(TracedValue* value, const char* name, const FloatQuad& quad)
@@ -344,7 +344,7 @@ PassOwnPtr<TracedValue> InspectorLayoutEvent::endData(LayoutObject* rootForThisL
} else {
ASSERT_NOT_REACHED();
}
- return value.release();
+ return value;
}
namespace LayoutInvalidationReason {
@@ -391,7 +391,7 @@ PassOwnPtr<TracedValue> InspectorLayoutInvalidationTrackingEvent::data(const Lay
value->setString("reason", reason);
if (RefPtr<ScriptCallStack> stackTrace = ScriptCallStack::capture(1))
stackTrace->toTracedValue(value.get(), "stackTrace");
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorPaintInvalidationTrackingEvent::data(const LayoutObject* layoutObject, const LayoutObject& paintContainer)
@@ -401,7 +401,7 @@ PassOwnPtr<TracedValue> InspectorPaintInvalidationTrackingEvent::data(const Layo
value->setString("frame", toHexString(layoutObject->frame()));
setGeneratingNodeInfo(value.get(), &paintContainer, "paintId");
setGeneratingNodeInfo(value.get(), layoutObject, "nodeId", "nodeName");
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorScrollInvalidationTrackingEvent::data(const LayoutObject& layoutObject)
@@ -414,7 +414,7 @@ PassOwnPtr<TracedValue> InspectorScrollInvalidationTrackingEvent::data(const Lay
setGeneratingNodeInfo(value.get(), &layoutObject, "nodeId", "nodeName");
if (RefPtr<ScriptCallStack> stackTrace = ScriptCallStack::capture(1))
stackTrace->toTracedValue(value.get(), "stackTrace");
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorChangeResourcePriorityEvent::data(unsigned long identifier, const ResourceLoadPriority& loadPriority)
@@ -424,7 +424,7 @@ PassOwnPtr<TracedValue> InspectorChangeResourcePriorityEvent::data(unsigned long
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("requestId", requestId);
value->setString("priority", resourcePriorityString(loadPriority));
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorSendRequestEvent::data(unsigned long identifier, LocalFrame* frame, const ResourceRequest& request)
@@ -440,7 +440,7 @@ PassOwnPtr<TracedValue> InspectorSendRequestEvent::data(unsigned long identifier
if (priority)
value->setString("priority", priority);
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorReceiveResponseEvent::data(unsigned long identifier, LocalFrame* frame, const ResourceResponse& response)
@@ -452,7 +452,7 @@ PassOwnPtr<TracedValue> InspectorReceiveResponseEvent::data(unsigned long identi
value->setString("frame", toHexString(frame));
value->setInteger("statusCode", response.httpStatusCode());
value->setString("mimeType", response.mimeType().getString().isolatedCopy());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorReceiveDataEvent::data(unsigned long identifier, LocalFrame* frame, int encodedDataLength)
@@ -463,7 +463,7 @@ PassOwnPtr<TracedValue> InspectorReceiveDataEvent::data(unsigned long identifier
value->setString("requestId", requestId);
value->setString("frame", toHexString(frame));
value->setInteger("encodedDataLength", encodedDataLength);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorResourceFinishEvent::data(unsigned long identifier, double finishTime, bool didFail)
@@ -475,7 +475,7 @@ PassOwnPtr<TracedValue> InspectorResourceFinishEvent::data(unsigned long identif
value->setBoolean("didFail", didFail);
if (finishTime)
value->setDouble("networkTime", finishTime);
- return value.release();
+ return value;
}
static LocalFrame* frameForExecutionContext(ExecutionContext* context)
@@ -492,7 +492,7 @@ static PassOwnPtr<TracedValue> genericTimerData(ExecutionContext* context, int t
value->setInteger("timerId", timerId);
if (LocalFrame* frame = frameForExecutionContext(context))
value->setString("frame", toHexString(frame));
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorTimerInstallEvent::data(ExecutionContext* context, int timerId, int timeout, bool singleShot)
@@ -501,7 +501,7 @@ PassOwnPtr<TracedValue> InspectorTimerInstallEvent::data(ExecutionContext* conte
value->setInteger("timeout", timeout);
value->setBoolean("singleShot", singleShot);
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorTimerRemoveEvent::data(ExecutionContext* context, int timerId)
@@ -525,7 +525,7 @@ PassOwnPtr<TracedValue> InspectorAnimationFrameEvent::data(ExecutionContext* con
else if (context->isWorkerGlobalScope())
value->setString("worker", toHexString(toWorkerGlobalScope(context)));
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> genericIdleCallbackEvent(ExecutionContext* context, int id)
@@ -535,14 +535,14 @@ PassOwnPtr<TracedValue> genericIdleCallbackEvent(ExecutionContext* context, int
if (LocalFrame* frame = frameForExecutionContext(context))
value->setString("frame", toHexString(frame));
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorIdleCallbackRequestEvent::data(ExecutionContext* context, int id, double timeout)
{
OwnPtr<TracedValue> value = genericIdleCallbackEvent(context, id);
value->setInteger("timeout", timeout);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorIdleCallbackCancelEvent::data(ExecutionContext* context, int id)
@@ -555,7 +555,7 @@ PassOwnPtr<TracedValue> InspectorIdleCallbackFireEvent::data(ExecutionContext* c
OwnPtr<TracedValue> value = genericIdleCallbackEvent(context, id);
value->setDouble("allottedMilliseconds", allottedMilliseconds);
value->setBoolean("timedOut", timedOut);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorParseHtmlEvent::beginData(Document* document, unsigned startLine)
@@ -565,21 +565,21 @@ PassOwnPtr<TracedValue> InspectorParseHtmlEvent::beginData(Document* document, u
value->setString("frame", toHexString(document->frame()));
value->setString("url", document->url().getString());
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorParseHtmlEvent::endData(unsigned endLine)
{
OwnPtr<TracedValue> value = TracedValue::create();
value->setInteger("endLine", endLine);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorParseAuthorStyleSheetEvent::data(const CSSStyleSheetResource* cachedStyleSheet)
{
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("styleSheetUrl", cachedStyleSheet->url().getString());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorXhrReadyStateChangeEvent::data(ExecutionContext* context, XMLHttpRequest* request)
@@ -590,7 +590,7 @@ PassOwnPtr<TracedValue> InspectorXhrReadyStateChangeEvent::data(ExecutionContext
if (LocalFrame* frame = frameForExecutionContext(context))
value->setString("frame", toHexString(frame));
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorXhrLoadEvent::data(ExecutionContext* context, XMLHttpRequest* request)
@@ -600,7 +600,7 @@ PassOwnPtr<TracedValue> InspectorXhrLoadEvent::data(ExecutionContext* context, X
if (LocalFrame* frame = frameForExecutionContext(context))
value->setString("frame", toHexString(frame));
setCallStack(value.get());
- return value.release();
+ return value;
}
static void localToPageQuad(const LayoutObject& layoutObject, const LayoutRect& rect, FloatQuad* quad)
@@ -628,7 +628,7 @@ PassOwnPtr<TracedValue> InspectorLayerInvalidationTrackingEvent::data(const Pain
value->setString("frame", toHexString(paintInvalidationContainer.frame()));
setGeneratingNodeInfo(value.get(), &paintInvalidationContainer, "paintId");
value->setString("reason", reason);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorPaintEvent::data(LayoutObject* layoutObject, const LayoutRect& clipRect, const GraphicsLayer* graphicsLayer)
@@ -642,7 +642,7 @@ PassOwnPtr<TracedValue> InspectorPaintEvent::data(LayoutObject* layoutObject, co
int graphicsLayerId = graphicsLayer ? graphicsLayer->platformLayer()->id() : 0;
value->setInteger("layerId", graphicsLayerId);
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> frameEventData(LocalFrame* frame)
@@ -652,7 +652,7 @@ PassOwnPtr<TracedValue> frameEventData(LocalFrame* frame)
bool isMainFrame = frame && frame->isMainFrame();
value->setBoolean("isMainFrame", isMainFrame);
value->setString("page", toHexString(frame));
- return value.release();
+ return value;
}
@@ -671,14 +671,14 @@ PassOwnPtr<TracedValue> InspectorScrollLayerEvent::data(LayoutObject* layoutObje
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("frame", toHexString(layoutObject->frame()));
setGeneratingNodeInfo(value.get(), layoutObject, "nodeId");
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorUpdateLayerTreeEvent::data(LocalFrame* frame)
{
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("frame", toHexString(frame));
- return value.release();
+ return value;
}
namespace {
@@ -688,7 +688,7 @@ PassOwnPtr<TracedValue> fillLocation(const String& url, const TextPosition& text
value->setString("url", url);
value->setInteger("lineNumber", textPosition.m_line.oneBasedInt());
value->setInteger("columnNumber", textPosition.m_column.oneBasedInt());
- return value.release();
+ return value;
}
}
@@ -697,7 +697,7 @@ PassOwnPtr<TracedValue> InspectorEvaluateScriptEvent::data(LocalFrame* frame, co
OwnPtr<TracedValue> value = fillLocation(url, textPosition);
value->setString("frame", toHexString(frame));
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorParseScriptEvent::data(unsigned long identifier, const String& url)
@@ -706,7 +706,7 @@ PassOwnPtr<TracedValue> InspectorParseScriptEvent::data(unsigned long identifier
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("requestId", requestId);
value->setString("url", url);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorCompileScriptEvent::data(const String& url, const TextPosition& textPosition)
@@ -721,7 +721,7 @@ PassOwnPtr<TracedValue> InspectorFunctionCallEvent::data(ExecutionContext* conte
value->setString("frame", toHexString(frame));
if (function.IsEmpty())
- return value.release();
+ return value;
v8::Local<v8::Function> originalFunction = getBoundFunction(function);
v8::ScriptOrigin origin = originalFunction->GetScriptOrigin();
@@ -741,7 +741,7 @@ PassOwnPtr<TracedValue> InspectorFunctionCallEvent::data(ExecutionContext* conte
value->setString("scriptId", String::number(scriptId));
value->setString("scriptName", scriptName);
value->setInteger("scriptLine", lineNumber);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorPaintImageEvent::data(const LayoutImage& layoutImage)
@@ -750,7 +750,7 @@ PassOwnPtr<TracedValue> InspectorPaintImageEvent::data(const LayoutImage& layout
setGeneratingNodeInfo(value.get(), &layoutImage, "nodeId");
if (const ImageResource* resource = layoutImage.cachedImage())
value->setString("url", resource->url().getString());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorPaintImageEvent::data(const LayoutObject& owningLayoutObject, const StyleImage& styleImage)
@@ -759,7 +759,7 @@ PassOwnPtr<TracedValue> InspectorPaintImageEvent::data(const LayoutObject& ownin
setGeneratingNodeInfo(value.get(), &owningLayoutObject, "nodeId");
if (const ImageResource* resource = styleImage.cachedImage())
value->setString("url", resource->url().getString());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorPaintImageEvent::data(const LayoutObject* owningLayoutObject, const ImageResource& imageResource)
@@ -767,7 +767,7 @@ PassOwnPtr<TracedValue> InspectorPaintImageEvent::data(const LayoutObject* ownin
OwnPtr<TracedValue> value = TracedValue::create();
setGeneratingNodeInfo(value.get(), owningLayoutObject, "nodeId");
value->setString("url", imageResource.url().getString());
- return value.release();
+ return value;
}
static size_t usedHeapSize()
@@ -786,7 +786,7 @@ PassOwnPtr<TracedValue> InspectorUpdateCountersEvent::data()
value->setInteger("jsEventListeners", InstanceCounters::counterValue(InstanceCounters::JSEventListenerCounter));
}
value->setDouble("jsHeapSizeUsed", static_cast<double>(usedHeapSize()));
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorInvalidateLayoutEvent::data(LocalFrame* frame)
@@ -794,7 +794,7 @@ PassOwnPtr<TracedValue> InspectorInvalidateLayoutEvent::data(LocalFrame* frame)
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("frame", toHexString(frame));
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorRecalculateStylesEvent::data(LocalFrame* frame)
@@ -802,7 +802,7 @@ PassOwnPtr<TracedValue> InspectorRecalculateStylesEvent::data(LocalFrame* frame)
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("frame", toHexString(frame));
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorEventDispatchEvent::data(const Event& event)
@@ -810,7 +810,7 @@ PassOwnPtr<TracedValue> InspectorEventDispatchEvent::data(const Event& event)
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("type", event.type());
setCallStack(value.get());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorTimeStampEvent::data(ExecutionContext* context, const String& message)
@@ -819,7 +819,7 @@ PassOwnPtr<TracedValue> InspectorTimeStampEvent::data(ExecutionContext* context,
value->setString("message", message);
if (LocalFrame* frame = frameForExecutionContext(context))
value->setString("frame", toHexString(frame));
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorTracingSessionIdForWorkerEvent::data(const String& sessionId, const String& workerId, WorkerThread* workerThread)
@@ -828,7 +828,7 @@ PassOwnPtr<TracedValue> InspectorTracingSessionIdForWorkerEvent::data(const Stri
value->setString("sessionId", sessionId);
value->setString("workerId", workerId);
value->setDouble("workerThreadId", workerThread->platformThreadId());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorTracingStartedInFrame::data(const String& sessionId, LocalFrame* frame)
@@ -836,7 +836,7 @@ PassOwnPtr<TracedValue> InspectorTracingStartedInFrame::data(const String& sessi
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("sessionId", sessionId);
value->setString("page", toHexString(frame));
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorSetLayerTreeId::data(const String& sessionId, int layerTreeId)
@@ -844,7 +844,7 @@ PassOwnPtr<TracedValue> InspectorSetLayerTreeId::data(const String& sessionId, i
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("sessionId", sessionId);
value->setInteger("layerTreeId", layerTreeId);
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorAnimationEvent::data(const Animation& animation)
@@ -859,14 +859,14 @@ PassOwnPtr<TracedValue> InspectorAnimationEvent::data(const Animation& animation
setNodeInfo(value.get(), target, "nodeId", "nodeName");
}
}
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorAnimationStateEvent::data(const Animation& animation)
{
OwnPtr<TracedValue> value = TracedValue::create();
value->setString("state", animation.playState());
- return value.release();
+ return value;
}
PassOwnPtr<TracedValue> InspectorHitTestEvent::endData(const HitTestRequest& request, const HitTestLocation& location, const HitTestResult& result)
@@ -886,7 +886,7 @@ PassOwnPtr<TracedValue> InspectorHitTestEvent::endData(const HitTestRequest& req
value->setBoolean("listBased", true);
else if (Node* node = result.innerNode())
setNodeInfo(value.get(), node, "nodeId", "nodeName");
- return value.release();
+ return value;
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698