Diff
Modified: trunk/Source/WebCore/ChangeLog (158355 => 158356)
--- trunk/Source/WebCore/ChangeLog 2013-10-31 09:14:49 UTC (rev 158355)
+++ trunk/Source/WebCore/ChangeLog 2013-10-31 12:02:51 UTC (rev 158356)
@@ -1,3 +1,15 @@
+2013-10-31 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Remove stale optional native memory instrumentation protocol params
+ https://bugs.webkit.org/show_bug.cgi?id=123552
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/Inspector.json:
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::start):
+ * inspector/InspectorTimelineAgent.h:
+
2013-10-31 Zan Dobersek <[email protected]>
[GTK] Undefined references to RenderObject::style() when disabling video support
Modified: trunk/Source/WebCore/inspector/Inspector.json (158355 => 158356)
--- trunk/Source/WebCore/inspector/Inspector.json 2013-10-31 09:14:49 UTC (rev 158355)
+++ trunk/Source/WebCore/inspector/Inspector.json 2013-10-31 12:02:51 UTC (rev 158356)
@@ -2611,8 +2611,7 @@
{ "name": "data", "type": "object", "description": "Event data." },
{ "name": "children", "type": "array", "optional": true, "items": { "$ref": "TimelineEvent" }, "description": "Nested records." },
{ "name": "counters", "$ref": "DOMCounters", "optional": true, "description": "Current values of DOM counters." },
- { "name": "usedHeapSize", "type": "integer", "optional": true, "description": "Current size of JS heap." },
- { "name": "nativeHeapStatistics", "type": "object", "optional": true, "description": "Native heap statistics." }
+ { "name": "usedHeapSize", "type": "integer", "optional": true, "description": "Current size of JS heap." }
],
"description": "Timeline record contains information about the recorded activity."
}
@@ -2622,8 +2621,7 @@
"name": "start",
"parameters": [
{ "name": "maxCallStackDepth", "optional": true, "type": "integer", "description": "Samples _javascript_ stack traces up to <code>maxCallStackDepth</code>, defaults to 5." },
- { "name": "includeDomCounters", "optional": true, "type": "boolean", "description": "Whether DOM counters data should be included into timeline events." },
- { "name": "includeNativeMemoryStatistics", "optional": true, "type": "boolean", "description": "Whether native memory usage statistics should be reported as part of timeline events." }
+ { "name": "includeDomCounters", "optional": true, "type": "boolean", "description": "Whether DOM counters data should be included into timeline events." }
],
"description": "Starts capturing instrumentation events."
},
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (158355 => 158356)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2013-10-31 09:14:49 UTC (rev 158355)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2013-10-31 12:02:51 UTC (rev 158356)
@@ -79,7 +79,7 @@
m_frontend = 0;
}
-void InspectorTimelineAgent::start(ErrorString*, const int* maxCallStackDepth, const bool* includeDomCounters, const bool* includeNativeMemoryStatistics)
+void InspectorTimelineAgent::start(ErrorString*, const int* maxCallStackDepth, const bool* includeDomCounters)
{
if (!m_frontend)
return;
@@ -92,8 +92,6 @@
if (includeDomCounters)
m_includeDOMCounters = *includeDomCounters;
- UNUSED_PARAM(includeNativeMemoryStatistics);
-
m_timeConverter.reset();
m_instrumentingAgents->setInspectorTimelineAgent(this);
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (158355 => 158356)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2013-10-31 09:14:49 UTC (rev 158355)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2013-10-31 12:02:51 UTC (rev 158356)
@@ -139,7 +139,7 @@
virtual void setFrontend(InspectorFrontend*);
virtual void clearFrontend();
- virtual void start(ErrorString*, const int* maxCallStackDepth, const bool* includeDomCounters, const bool* includeNativeMemoryStatistics);
+ virtual void start(ErrorString*, const int* maxCallStackDepth, const bool* includeDomCounters);
virtual void stop(ErrorString*);
virtual void canMonitorMainThread(ErrorString*, bool*);
virtual void supportsFrameInstrumentation(ErrorString*, bool*);
Modified: trunk/Source/WebInspectorUI/ChangeLog (158355 => 158356)
--- trunk/Source/WebInspectorUI/ChangeLog 2013-10-31 09:14:49 UTC (rev 158355)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-10-31 12:02:51 UTC (rev 158356)
@@ -1,3 +1,12 @@
+2013-10-31 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Remove stale optional native memory instrumentation protocol params
+ https://bugs.webkit.org/show_bug.cgi?id=123552
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/InspectorBackendCommands.js:
+
2013-10-30 Joseph Pecoraro <[email protected]>
Web Inspector: Fix PrettyPrinting Tool Load from Saved URL
Modified: trunk/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js (158355 => 158356)
--- trunk/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js 2013-10-31 09:14:49 UTC (rev 158355)
+++ trunk/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js 2013-10-31 12:02:51 UTC (rev 158356)
@@ -268,7 +268,7 @@
InspectorBackend.registerTimelineDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Timeline");
InspectorBackend.registerEnum("Timeline.EventType", {EventDispatch: "EventDispatch", BeginFrame: "BeginFrame", ScheduleStyleRecalculation: "ScheduleStyleRecalculation", RecalculateStyles: "RecalculateStyles", InvalidateLayout: "InvalidateLayout", Layout: "Layout", Paint: "Paint", ScrollLayer: "ScrollLayer", ResizeImage: "ResizeImage", CompositeLayers: "CompositeLayers", ParseHTML: "ParseHTML", TimerInstall: "TimerInstall", TimerRemove: "TimerRemove", TimerFire: "TimerFire", EvaluateScript: "EvaluateScript", MarkLoad: "MarkLoad", MarkDOMContent: "MarkDOMContent", TimeStamp: "TimeStamp", Time: "Time", TimeEnd: "TimeEnd", ScheduleResourceRequest: "ScheduleResourceRequest", ResourceSendRequest: "ResourceSendRequest", ResourceReceiveResponse: "ResourceReceiveResponse", ResourceReceivedData: "ResourceReceivedData", ResourceFinish: "ResourceFinish", XHRReadyStateChange: "XHRReadyStateChange", XHRLoad: "XHRLoad", FunctionCall: "FunctionCall", GCEvent: "GCEvent", RequestAnimationFrame: "RequestAnimationFrame", CancelAnimationFrame: "CancelAnimationFrame", FireAnimationFrame: "FireAnimationFrame", WebSocketCreate: "WebSocketCreate", WebSocketSendHandshakeRequest: "WebSocketSendHandshakeRequest", WebSocketReceiveHandshakeResponse: "WebSocketReceiveHandshakeResponse", WebSocketDestroy: "WebSocketDestroy"});
InspectorBackend.registerEvent("Timeline.eventRecorded", ["record"]);
-InspectorBackend.registerCommand("Timeline.start", [{"name": "maxCallStackDepth", "type": "number", "optional": true}, {"name": "includeDomCounters", "type": "boolean", "optional": true}, {"name": "includeNativeMemoryStatistics", "type": "boolean", "optional": true}], []);
+InspectorBackend.registerCommand("Timeline.start", [{"name": "maxCallStackDepth", "type": "number", "optional": true}, {"name": "includeDomCounters", "type": "boolean", "optional": true}], []);
InspectorBackend.registerCommand("Timeline.stop", [], []);
InspectorBackend.registerCommand("Timeline.supportsFrameInstrumentation", [], ["result"]);
InspectorBackend.registerCommand("Timeline.canMonitorMainThread", [], ["result"]);
