Title: [181905] trunk/Source/WebInspectorUI
- Revision
- 181905
- Author
- [email protected]
- Date
- 2015-03-24 14:16:52 -0700 (Tue, 24 Mar 2015)
Log Message
Web Inspector: Workaround issue causing uncaught exception in Inspector
https://bugs.webkit.org/show_bug.cgi?id=143015
Patch by Joseph Pecoraro <[email protected]> on 2015-03-24
Reviewed by Timothy Hatcher.
Workaround <https://webkit.org/b/143012> and avoid early returning in constructors.
* UserInterface/Controllers/ReplayManager.js:
(WebInspector.ReplayManager.class.ReplayManager):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (181904 => 181905)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-24 20:42:20 UTC (rev 181904)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-24 21:16:52 UTC (rev 181905)
@@ -1,3 +1,15 @@
+2015-03-24 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Workaround issue causing uncaught exception in Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=143015
+
+ Reviewed by Timothy Hatcher.
+
+ Workaround <https://webkit.org/b/143012> and avoid early returning in constructors.
+
+ * UserInterface/Controllers/ReplayManager.js:
+ (WebInspector.ReplayManager.class.ReplayManager):
+
2015-03-06 Brian J. Burg <[email protected]>
Web Inspector: unify resizer implementations used by DataGrid and Sidebar
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js (181904 => 181905)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js 2015-03-24 20:42:20 UTC (rev 181904)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js 2015-03-24 21:16:52 UTC (rev 181905)
@@ -49,32 +49,30 @@
// for the duration of the playback command until another playback begins.
this._playbackSpeed = WebInspector.ReplayManager.PlaybackSpeed.RealTime;
- if (!window.ReplayAgent)
- return;
+ if (window.ReplayAgent) {
+ var instance = this;
+ this._initializationPromise = ReplayAgent.currentReplayState()
+ .then(function(payload) {
+ console.assert(payload.sessionState in WebInspector.ReplayManager.SessionState, "Unknown session state: " + payload.sessionState);
+ console.assert(payload.segmentState in WebInspector.ReplayManager.SegmentState, "Unknown segment state: " + payload.segmentState);
- var instance = this;
+ instance._activeSessionIdentifier = payload.sessionIdentifier;
+ instance._activeSegmentIdentifier = payload.segmentIdentifier;
+ instance._sessionState = WebInspector.ReplayManager.SessionState[payload.sessionState];
+ instance._segmentState = WebInspector.ReplayManager.SegmentState[payload.segmentState];
+ instance._currentPosition = payload.replayPosition;
- this._initializationPromise = ReplayAgent.currentReplayState()
- .then(function(payload) {
- console.assert(payload.sessionState in WebInspector.ReplayManager.SessionState, "Unknown session state: " + payload.sessionState);
- console.assert(payload.segmentState in WebInspector.ReplayManager.SegmentState, "Unknown segment state: " + payload.segmentState);
-
- instance._activeSessionIdentifier = payload.sessionIdentifier;
- instance._activeSegmentIdentifier = payload.segmentIdentifier;
- instance._sessionState = WebInspector.ReplayManager.SessionState[payload.sessionState];
- instance._segmentState = WebInspector.ReplayManager.SegmentState[payload.segmentState];
- instance._currentPosition = payload.replayPosition;
-
- instance._initialized = true;
- }).then(function() {
- return ReplayAgent.getAvailableSessions();
- }).then(function(payload) {
- for (var sessionId of payload.ids)
- instance.sessionCreated(sessionId);
- }).catch(function(error) {
- console.error("ReplayManager initialization failed: ", error);
- throw error;
- });
+ instance._initialized = true;
+ }).then(function() {
+ return ReplayAgent.getAvailableSessions();
+ }).then(function(payload) {
+ for (var sessionId of payload.ids)
+ instance.sessionCreated(sessionId);
+ }).catch(function(error) {
+ console.error("ReplayManager initialization failed: ", error);
+ throw error;
+ });
+ }
}
// Public
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
