Title: [199095] trunk/Source/WebInspectorUI
- Revision
- 199095
- Author
- commit-qu...@webkit.org
- Date
- 2016-04-05 22:45:13 -0700 (Tue, 05 Apr 2016)
Log Message
Web Inspector: Do not create CodeMirror color/gradient markers in _javascript_ resources
https://bugs.webkit.org/show_bug.cgi?id=156278
<rdar://problem/25570404>
Patch by Joseph Pecoraro <pecor...@apple.com> on 2016-04-05
Reviewed by Timothy Hatcher.
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype._hasStyleSheetContents):
(WebInspector.SourceCodeTextEditor.prototype._updateEditableMarkers):
Only spend the time to create style markers for style sheet contents.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (199094 => 199095)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-06 05:45:13 UTC (rev 199095)
@@ -1,3 +1,16 @@
+2016-04-05 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Do not create CodeMirror color/gradient markers in _javascript_ resources
+ https://bugs.webkit.org/show_bug.cgi?id=156278
+ <rdar://problem/25570404>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype._hasStyleSheetContents):
+ (WebInspector.SourceCodeTextEditor.prototype._updateEditableMarkers):
+ Only spend the time to create style markers for style sheet contents.
+
2016-04-05 Timothy Hatcher <timo...@apple.com>
Web Inspector: Make the Timelines sidebar wider
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (199094 => 199095)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-04-06 05:31:07 UTC (rev 199094)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-04-06 05:45:13 UTC (rev 199095)
@@ -1573,11 +1573,22 @@
this._mouseIsOverPopover = this._popover.element.contains(event.relatedTarget);
}
+ _hasStyleSheetContents()
+ {
+ let mimeType = this.mimeType;
+ return mimeType === "text/css"
+ || mimeType === "text/x-less"
+ || mimeType === "text/x-sass"
+ || mimeType === "text/x-scss";
+ }
+
_updateEditableMarkers(range)
{
- this.createColorMarkers(range);
- this.createGradientMarkers(range);
- this.createCubicBezierMarkers(range);
+ if (this._hasStyleSheetContents()) {
+ this.createColorMarkers(range);
+ this.createGradientMarkers(range);
+ this.createCubicBezierMarkers(range);
+ }
this._updateTokenTrackingControllerState();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
