[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.3-2-25-gb2c19be

Mon Sep 6 13:09:52 UTC 2010

The following commit has been merged in the debian/unstable branch:
commit 2890332391d2b40dab60657bb41a67b937421b35
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 22 00:36:38 2010 +0000

    2010-07-21  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Oliver Hunt.
    
            Prevent DeleteButtonController enable state from changing when not editing
            https://bugs.webkit.org/show_bug.cgi?id=42659
    
            Test: svg/custom/use-invalid-html.xhtml
    
            * dom/ContainerNode.cpp:
            (WebCore::ContainerNode::cloneChildNodes):
    2010-07-21  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Oliver Hunt.
    
            Prevent DeleteButtonController enable state from changing when not editing
            https://bugs.webkit.org/show_bug.cgi?id=42659
    
            * svg/custom/use-invalid-html-expected.txt: Added.
            * svg/custom/use-invalid-html.xhtml: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4095925..5ed0540 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-21  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Oliver Hunt.
+
+        Prevent DeleteButtonController enable state from changing when not editing
+        https://bugs.webkit.org/show_bug.cgi?id=42659
+
+        * svg/custom/use-invalid-html-expected.txt: Added.
+        * svg/custom/use-invalid-html.xhtml: Added.
+
 2010-07-06  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/LayoutTests/svg/custom/use-invalid-html-expected.txt b/LayoutTests/svg/custom/use-invalid-html-expected.txt
new file mode 100644
index 0000000..7e333c3
--- /dev/null
+++ b/LayoutTests/svg/custom/use-invalid-html-expected.txt
@@ -0,0 +1,6 @@
+This page contains the following errors:
+
+error on line 19 at column 92: Comment must not contain '--' (double-hyphen)
+Below is a rendering of the page up to the first error.
+
+This test passes if a malformed html document triggers an error, not crash.
diff --git a/LayoutTests/svg/custom/use-invalid-html.xhtml b/LayoutTests/svg/custom/use-invalid-html.xhtml
new file mode 100644
index 0000000..98aea28
--- /dev/null
+++ b/LayoutTests/svg/custom/use-invalid-html.xhtml
@@ -0,0 +1,19 @@
+<html>This test passes if a malformed html document triggers an error, not crash.
+  <svg xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      onload="restyle()">
+    <script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+    function restyle() {
+        document.getElementById("b").style.position = "absolute";
+    }
+    </script>
+    <defs>
+        <g id="a" />
+    </defs>
+    <g id="b">
+        <use xlink:href="#a" />
+    </g>
+  </svg>
+<!-- no closing html tag --->
\ No newline at end of file
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d7173ee..e1548c3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-21  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Oliver Hunt.
+
+        Prevent DeleteButtonController enable state from changing when not editing
+        https://bugs.webkit.org/show_bug.cgi?id=42659
+
+        Test: svg/custom/use-invalid-html.xhtml
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::cloneChildNodes):
+
 2010-07-06  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/dom/ContainerNode.cpp b/WebCore/dom/ContainerNode.cpp
index c17489a..d277365 100644
--- a/WebCore/dom/ContainerNode.cpp
+++ b/WebCore/dom/ContainerNode.cpp
@@ -675,12 +675,13 @@ void ContainerNode::childrenChanged(bool changedByParser, Node* beforeChange, No
 void ContainerNode::cloneChildNodes(ContainerNode *clone)
 {
     // disable the delete button so it's elements are not serialized into the markup
-    if (document()->frame())
+    bool isEditorEnabled = document()->frame() && document()->frame()->editor()->canEdit();
+    if (isEditorEnabled)
         document()->frame()->editor()->deleteButtonController()->disable();
     ExceptionCode ec = 0;
     for (Node* n = firstChild(); n && !ec; n = n->nextSibling())
         clone->appendChild(n->cloneNode(true), ec);
-    if (document()->frame())
+    if (isEditorEnabled && document()->frame())
         document()->frame()->editor()->deleteButtonController()->enable();
 }
 

-- 
WebKit Debian packaging

