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

Side by Side Diff: Source/core/inspector/InspectorTraceEvents.cpp

Issue 570453003: Oilpan: fix build after r181867. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/inspector/InspectorTraceEvents.h" 6 #include "core/inspector/InspectorTraceEvents.h"
7 7
8 #include "bindings/core/v8/ScriptCallStackFactory.h" 8 #include "bindings/core/v8/ScriptCallStackFactory.h"
9 #include "bindings/core/v8/ScriptGCEvent.h" 9 #include "bindings/core/v8/ScriptGCEvent.h"
10 #include "bindings/core/v8/ScriptSourceCode.h" 10 #include "bindings/core/v8/ScriptSourceCode.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorLayoutInvalidationTrac kingEvent::data(const RenderObject* renderer) 115 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorLayoutInvalidationTrac kingEvent::data(const RenderObject* renderer)
116 { 116 {
117 ASSERT(renderer); 117 ASSERT(renderer);
118 RefPtr<TracedValue> value = TracedValue::create(); 118 RefPtr<TracedValue> value = TracedValue::create();
119 value->setString("frame", toHexString(renderer->frame())); 119 value->setString("frame", toHexString(renderer->frame()));
120 value->setString("rendererId", toHexString(renderer)); 120 value->setString("rendererId", toHexString(renderer));
121 if (Node* generatingNode = renderer->generatingNode()) { 121 if (Node* generatingNode = renderer->generatingNode()) {
122 value->setString("nodeName", generatingNode->debugName()); 122 value->setString("nodeName", generatingNode->debugName());
123 value->setInteger("nodeId", InspectorNodeIds::idForNode(generatingNode)) ; 123 value->setInteger("nodeId", InspectorNodeIds::idForNode(generatingNode)) ;
124 } 124 }
125 RefPtr<ScriptCallStack> callstack = createScriptCallStack(maxInvalidationTra ckingCallstackSize, true); 125 RefPtrWillBeRawPtr<ScriptCallStack> callstack = createScriptCallStack(maxInv alidationTrackingCallstackSize, true);
126 value->setString("callstack", callstack ? callstack->buildInspectorArray()-> toJSONString() : "[]"); 126 value->setString("callstack", callstack ? callstack->buildInspectorArray()-> toJSONString() : "[]");
127 return value; 127 return value;
128 } 128 }
129 129
130 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorSendRequestEvent::data (unsigned long identifier, LocalFrame* frame, const ResourceRequest& request) 130 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorSendRequestEvent::data (unsigned long identifier, LocalFrame* frame, const ResourceRequest& request)
131 { 131 {
132 String requestId = IdentifiersFactory::requestId(identifier); 132 String requestId = IdentifiersFactory::requestId(identifier);
133 133
134 RefPtr<TracedValue> value = TracedValue::create(); 134 RefPtr<TracedValue> value = TracedValue::create();
135 value->setString("requestId", requestId); 135 value->setString("requestId", requestId);
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 375
376 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTracingSessionIdForWor kerEvent::data(const String& sessionId, WorkerThread* workerThread) 376 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTracingSessionIdForWor kerEvent::data(const String& sessionId, WorkerThread* workerThread)
377 { 377 {
378 RefPtr<TracedValue> value = TracedValue::create(); 378 RefPtr<TracedValue> value = TracedValue::create();
379 value->setString("sessionId", sessionId); 379 value->setString("sessionId", sessionId);
380 value->setDouble("workerThreadId", workerThread->platformThreadId()); 380 value->setDouble("workerThreadId", workerThread->platformThreadId());
381 return value; 381 return value;
382 } 382 }
383 383
384 } 384 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698