[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 12:42:26 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit f4ddfbb271a9c46f085f88deb931096fa1288369
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 14:21:46 2010 +0000

    2010-08-27  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Elements panel breaks after calling "Edit as HTML" on <body>
            https://bugs.webkit.org/show_bug.cgi?id=44765
    
            * inspector/InspectorDOMAgent.cpp:
            (WebCore::InspectorDOMAgent::setOuterHTML):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66222 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 31d3017..c6bc8ea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-27  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Elements panel breaks after calling "Edit as HTML" on <body>
+        https://bugs.webkit.org/show_bug.cgi?id=44765
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::setOuterHTML):
+
 2010-08-27  Andrey Kosyakov  <caseq at chromium.org>
 
         Unreviewed build fix.
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index 635769a..ef7cf8e 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -538,6 +538,8 @@ void InspectorDOMAgent::setOuterHTML(long nodeId, const String& outerHTML, long*
     if (!node || !node->isHTMLElement())
         return;
 
+    bool requiresTotalUpdate = node->nodeName() == "HTML" || node->nodeName() == "BODY" || node->nodeName() == "HEAD";
+
     bool childrenRequested = m_childrenRequested.contains(nodeId);
     Node* previousSibling = node->previousSibling();
     Node* parentNode = node->parentNode();
@@ -548,8 +550,15 @@ void InspectorDOMAgent::setOuterHTML(long nodeId, const String& outerHTML, long*
     if (ec)
         return;
 
-    Node* newNode = previousSibling ? previousSibling->nextSibling() : parentNode->firstChild();
+    if (requiresTotalUpdate) {
+        Document* document = mainFrameDocument();
+        reset();
+        setDocument(document);
+        *newId = 0;
+        return;
+    }
 
+    Node* newNode = previousSibling ? previousSibling->nextSibling() : parentNode->firstChild();
     *newId = pushNodePathToFrontend(newNode);
     if (childrenRequested)
         pushChildNodesToFrontend(*newId);
diff --git a/WebCore/inspector/front-end/EventListenersSidebarPane.js b/WebCore/inspector/front-end/EventListenersSidebarPane.js
index 2800d6e..5be1812 100644
--- a/WebCore/inspector/front-end/EventListenersSidebarPane.js
+++ b/WebCore/inspector/front-end/EventListenersSidebarPane.js
@@ -183,7 +183,7 @@ WebInspector.EventListenerBar = function(eventListener, nodeId)
     this._setFunctionSubtitle();
     this.editable = false;
     this.element.className = "event-bar"; /* Changed from "section" */
-    this.propertiesElement.className = "event-properties"; /* Changed from "properties" */
+    this.propertiesElement.className = "event-properties source-code"; /* Changed from "properties" */
 }
 
 WebInspector.EventListenerBar.prototype = {

-- 
WebKit Debian packaging

