[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
apavlov at chromium.org
apavlov at chromium.org
Wed Dec 22 11:35:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9fc99dea5158cbd0b08f2c75f33f76ee4e9082ee
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 30 08:44:28 2010 +0000
2010-07-29 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: Crash on refresh with a comment selected in the Elements panel
https://bugs.webkit.org/show_bug.cgi?id=43183
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::nodeForPath):
* inspector/front-end/ElementsPanel.js:
(WebInspector.ElementsPanel.prototype.reset):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64341 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5b62900..a8ceae9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-29 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Crash on refresh with a comment selected in the Elements panel
+ https://bugs.webkit.org/show_bug.cgi?id=43183
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::nodeForPath):
+ * inspector/front-end/ElementsPanel.js:
+ (WebInspector.ElementsPanel.prototype.reset):
+
2010-07-30 Renata Hodovan <reni at inf.u-szeged.hu>
Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index ad40464..075944a 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -1560,6 +1560,8 @@ Node* InspectorDOMAgent::nodeForPath(const String& path)
Vector<String> pathTokens;
path.split(",", false, pathTokens);
+ if (!pathTokens.size())
+ return 0;
for (size_t i = 0; i < pathTokens.size() - 1; i += 2) {
bool success = true;
unsigned childNumber = pathTokens[i].toUInt(&success);
diff --git a/WebCore/inspector/front-end/ElementsPanel.js b/WebCore/inspector/front-end/ElementsPanel.js
index ec9559f..557a8bd 100644
--- a/WebCore/inspector/front-end/ElementsPanel.js
+++ b/WebCore/inspector/front-end/ElementsPanel.js
@@ -161,7 +161,7 @@ WebInspector.ElementsPanel.prototype = {
if (this.focusedDOMNode) {
this._selectedPathOnReset = [];
var node = this.focusedDOMNode;
- while ("index" in node) {
+ while ("index" in node && node.nodeName && node.nodeName.length) {
this._selectedPathOnReset.push(node.nodeName);
this._selectedPathOnReset.push(node.index);
node = node.parentNode;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list