Merge 86683 - 2011-05-17 Pavel Feldman <pfeldman@google.com>

Source/WebCore/inspector/front-end/TextViewer.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 90 matching lines @@
         this._gutterPanel.removeDecoration(lineNumber, decoration);
     },
 
     markAndRevealRange: function(range)
     {
         this._mainPanel.markAndRevealRange(range);
     },
 
     highlightLine: function(lineNumber)
     {
+        if (typeof lineNumber !== "number" || lineNumber < 0)
+            return;
+
         this._mainPanel.highlightLine(lineNumber);
     },
 
     clearLineHighlight: function()
     {
         this._mainPanel.clearLineHighlight();
     },
 
     freeCachedElements: function()
     {
@@ skipping 278 matching lines @@
 
         this._repaintAll();
 
         this.endDomUpdates();
     },
 
     makeLineAChunk: function(lineNumber)
     {
         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;
 
         return this._splitChunkOnALine(lineNumber, chunkNumber);
     },
 
     _splitChunkOnALine: function(lineNumber, chunkNumber)
     {
         this.beginDomUpdates();
 
@@ skipping 1475 matching lines @@
             lines.push(this._textModel.line(i));
 
         this.element.removeChildren();
         this.element.textContent = lines.join("\n");
 
         // The last empty line will get swallowed otherwise.
         if (!lines[lines.length - 1])
             this.element.appendChild(document.createElement("br"));
     }
 }