Changeset 84235 in webkit

Timestamp:

Apr 19, 2011 2:53:26 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-04-19 Andrey Adaikin <​aandrey@google.com>

Reviewed by Pavel Feldman.

Web Inspector: NPE in TextEditorModel
​https://bugs.webkit.org/show_bug.cgi?id=58870

• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype._frameAdded):
• inspector/front-end/TextEditorModel.js: (WebInspector.TextEditorModel.prototype.setText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ResourcesPanel.js (modified) (1 diff)
• inspector/front-end/TextEditorModel.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-19  Andrey Adaikin  <aandrey@google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: NPE in TextEditorModel
+        https://bugs.webkit.org/show_bug.cgi?id=58870
+
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype._frameAdded):
+        * inspector/front-end/TextEditorModel.js:
+        (WebInspector.TextEditorModel.prototype.setText):
+
 2011-04-19  Hans Wennborg  <hans@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js

@@ -203 +203 @@
         if (frameTreeElement) {
             // Maintain sorted order.
-            frameTreeElement.parent.removeChild(frameTreeElement);
+            var parent = frameTreeElement.parent;
+            parent.removeChild(frameTreeElement);
             frameTreeElement.setTitles(title, subtitle);
-            frameTreeElement.parent.appendChild(frameTreeElement);
+            parent.appendChild(frameTreeElement);
             return;
         }

trunk/Source/WebCore/inspector/front-end/TextEditorModel.js

@@ -93 +93 @@
     setText: function(range, text)
     {
+        text = text || "";
         if (!range) {
             range = new WebInspector.TextRange(0, 0, this._lines.length - 1, this._lines[this._lines.length - 1].length);