Title: [172068] branches/safari-600.1-branch/Source/WebInspectorUI
- Revision
- 172068
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 13:56:06 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r171894. <rdar://problem/17874096>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172067 => 172068)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-05 20:54:02 UTC (rev 172067)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-05 20:56:06 UTC (rev 172068)
@@ -1,5 +1,28 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r171894
+
+ 2014-07-31 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Timeline recording is not working inspecting iOS 7 and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=135466
+
+ Reviewed by Timothy Hatcher.
+
+ Start / stop capturing for older backends that won't emit start / stop events.
+
+ * UserInterface/Protocol/InspectorBackend.js:
+ (InspectorBackend.Agent.prototype.hasEvent):
+ Provide a way to check if an event is supported.
+
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype.startCapturing):
+ (WebInspector.TimelineManager.prototype.stopCapturing):
+ Fallback to starting and stopping capturing manually if the backend
+ does not provide the events.
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171885
2014-07-31 Jonathan Wells <jonowe...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (172067 => 172068)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2014-08-05 20:54:02 UTC (rev 172067)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2014-08-05 20:56:06 UTC (rev 172068)
@@ -62,11 +62,19 @@
startCapturing: function()
{
TimelineAgent.start();
+
+ // COMPATIBILITY (iOS 7): recordingStarted event did not exist yet. Start explicitly.
+ if (!TimelineAgent.hasEvent("recordingStarted"))
+ this.capturingStarted();
},
stopCapturing: function()
{
TimelineAgent.stop();
+
+ // COMPATIBILITY (iOS 7): recordingStopped event did not exist yet. Stop explicitly.
+ if (!TimelineAgent.hasEvent("recordingStopped"))
+ this.capturingStopped();
},
capturingStarted: function()
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js (172067 => 172068)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2014-08-05 20:54:02 UTC (rev 172067)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2014-08-05 20:56:06 UTC (rev 172068)
@@ -306,6 +306,11 @@
return this._events[eventName];
},
+ hasEvent: function(eventName)
+ {
+ return eventName in this._events;
+ },
+
dispatchEvent: function(eventName, eventArguments)
{
if (!(eventName in this._dispatcher)) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
