Changeset 181905 in webkit

Timestamp:

Mar 24, 2015, 2:16:52 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Workaround issue causing uncaught exception in Inspector
​https://bugs.webkit.org/show_bug.cgi?id=143015

Patch by Joseph Pecoraro <Joseph Pecoraro> 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):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/ReplayManager.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-03-24  Joseph Pecoraro  <pecoraro@apple.com>
+
+        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  <burg@cs.washington.edu>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js

@@ -50 +50 @@
         this._playbackSpeed = WebInspector.ReplayManager.PlaybackSpeed.RealTime;
 
-        if (!window.ReplayAgent)
-            return;
-
-        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);
-
-                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;
-            });
+        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);
+
+                    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;
+                });
+        }
     }