Merge WebKit at branches/chromium/742 r88085: Initial merge by git.

Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde

1 files changed, 9 insertions, 0 deletions

diff --git a/Source/WebCore/inspector/front-end/TextViewer.js b/Source/WebCore/inspector/front-end/TextViewer.js
index 1b40b3e..0c03a59 100644
--- a/Source/WebCore/inspector/front-end/TextViewer.js
+++ b/Source/WebCore/inspector/front-end/TextViewer.js
@@ -108,6 +108,9 @@ WebInspector.TextViewer.prototype = {
 
     highlightLine: function(lineNumber)
     {
+        if (typeof lineNumber !== "number" || lineNumber < 0)
+            return;
+
         this._mainPanel.highlightLine(lineNumber);
     },
 
@@ -406,6 +409,12 @@ WebInspector.TextEditorChunkedPanel.prototype = {
     {
         var chunkNumber = this._chunkNumberForLine(lineNumber);
         var oldChunk = this._textChunks[chunkNumber];
+
+        if (!oldChunk) {
+            console.error("No chunk for line number: " + lineNumber);
+            return;
+        }
+
         if (oldChunk.linesCount === 1)
             return oldChunk;