Title: [172991] trunk/Source/WebInspectorUI
- Revision
- 172991
- Author
- commit-qu...@webkit.org
- Date
- 2014-08-26 17:52:53 -0700 (Tue, 26 Aug 2014)
Log Message
Web Inspector: Fix CodeMirrorTokenTrackingController::_startTracking assertion
https://bugs.webkit.org/show_bug.cgi?id=136160
Patch by Saam Barati <sbar...@apple.com> on 2014-08-26
Reviewed by Joseph Pecoraro.
Check if '_tracking' is already true before calling '_startTracking'
to prevent the assertion from always firing.
* UserInterface/Controllers/CodeMirrorTokenTrackingController.js:
(WebInspector.CodeMirrorTokenTrackingController.prototype._mouseEntered):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (172990 => 172991)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-27 00:34:48 UTC (rev 172990)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-27 00:52:53 UTC (rev 172991)
@@ -1,3 +1,16 @@
+2014-08-26 Saam Barati <sbar...@apple.com>
+
+ Web Inspector: Fix CodeMirrorTokenTrackingController::_startTracking assertion
+ https://bugs.webkit.org/show_bug.cgi?id=136160
+
+ Reviewed by Joseph Pecoraro.
+
+ Check if '_tracking' is already true before calling '_startTracking'
+ to prevent the assertion from always firing.
+
+ * UserInterface/Controllers/CodeMirrorTokenTrackingController.js:
+ (WebInspector.CodeMirrorTokenTrackingController.prototype._mouseEntered):
+
2014-08-25 Brent Fulgham <bfulg...@apple.com>
[Win] Pass OFFICIAL_BUILD flag to WebInspectorUI build process
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js (172990 => 172991)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js 2014-08-27 00:34:48 UTC (rev 172990)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js 2014-08-27 00:52:53 UTC (rev 172991)
@@ -261,7 +261,8 @@
_mouseEntered: function(event)
{
- this._startTracking();
+ if (!this._tracking)
+ this._startTracking();
},
_mouseLeft: function(event)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
