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

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

Issue 308123008: DevTools: added support for image url & node in tracing-based timeline (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: skip check for presence of endData in Layout Created 6 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
« no previous file with comments | « Source/core/inspector/InspectorTraceEvents.h ('k') | Source/core/rendering/RenderImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorTraceEvents.cpp
diff --git a/Source/core/inspector/InspectorTraceEvents.cpp b/Source/core/inspector/InspectorTraceEvents.cpp
index 09309e0a5108311bd6d9f85ded1bef4a96e654eb..ef49e4317f3ae0a3663348056721df495644d2c4 100644
--- a/Source/core/inspector/InspectorTraceEvents.cpp
+++ b/Source/core/inspector/InspectorTraceEvents.cpp
@@ -14,6 +14,7 @@
#include "core/inspector/InspectorNodeIds.h"
#include "core/inspector/ScriptCallStack.h"
#include "core/page/Page.h"
+#include "core/rendering/RenderImage.h"
#include "core/rendering/RenderObject.h"
#include "core/xml/XMLHttpRequest.h"
#include "platform/JSONValues.h"
@@ -116,7 +117,7 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorReceiveResponseEvent::
data->setString("requestId", requestId);
data->setString("frame", toHexString(frame));
data->setNumber("statusCode", response.httpStatusCode());
- data->setString("mimeType", response.mimeType());
+ data->setString("mimeType", response.mimeType().string().isolatedCopy());
return TracedValue::fromJSONValue(data);
}
@@ -295,6 +296,17 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorFunctionCallEvent::dat
return TracedValue::fromJSONValue(data);
}
+PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorPaintImageEvent::data(const RenderImage& renderImage)
+{
+ RefPtr<JSONObject> data = JSONObject::create();
+ data->setNumber("nodeId", InspectorNodeIds::idForNode(renderImage.generatingNode()));
+
+ if (const ImageResource* resource = renderImage.cachedImage())
+ data->setString("url", resource->url().string());
+
+ return TracedValue::fromJSONValue(data);
+}
+
static size_t usedHeapSize()
{
HeapInfo info;
« no previous file with comments | « Source/core/inspector/InspectorTraceEvents.h ('k') | Source/core/rendering/RenderImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698