Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2309)

Unified Diff: third_party/WebKit/Source/devtools/front_end/cm/overlay.js

Issue 2166603002: DevTools: roll CodeMirror (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert unnecessary typeIn change Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/cm/overlay.js
diff --git a/third_party/WebKit/Source/devtools/front_end/cm/overlay.js b/third_party/WebKit/Source/devtools/front_end/cm/overlay.js
index 393054dfa441778fe8501d96bbe7cb8cf0167327..e1b9ed37530ad824e23d50a0c4c91057c8e9fb41 100644
--- a/third_party/WebKit/Source/devtools/front_end/cm/overlay.js
+++ b/third_party/WebKit/Source/devtools/front_end/cm/overlay.js
@@ -28,7 +28,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
overlay: CodeMirror.startState(overlay),
basePos: 0, baseCur: null,
overlayPos: 0, overlayCur: null,
- lineSeen: null
+ streamSeen: null
};
},
copyState: function(state) {
@@ -41,9 +41,9 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
},
token: function(stream, state) {
- if (stream.sol() || stream.string != state.lineSeen ||
+ if (stream != state.streamSeen ||
Math.min(state.basePos, state.overlayPos) < stream.start) {
- state.lineSeen = stream.string;
+ state.streamSeen = stream;
state.basePos = state.overlayPos = stream.start;
}

Powered by Google App Engine
This is Rietveld 408576698