Reviewed by Ken and John.

	Re-fixed a specific case of the following:

	<rdar://problem/3790449> REGRESSION (Mail): underline behavior is flaky because of how CSS handles text-decoration

	Oddly, Cmd-B, Cmd-U, type some text, return, Cmd-U, Cmd-B, type
	some text, worked fine. But hitting the second Cmd-B before the
	second Cmd-U still failed to remove underlining. The reason for
	this is that our code to compute the style of the current position
	did not work when you had a typing style and were positioned right
	at a <br> element. For various reasons, this did not show up for
	bold and italic, since those are handled through the font manager.

	The following change fixes this - for elements that can't have
	children, we add the dummy span after the element of interest,
	rather than as a child of it.

        * khtml/khtml_part.cpp:
        (KHTMLPart::selectionComputedStyle):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8588 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1f987826723b93655d9fa07b966fbf48df032fc8..9caeaa919aae03d07856080f6678ccf1f091ac9b 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,26 @@
+05-02-07  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Ken and John.
+
+       Re-fixed a specific case of the following:
+
+       <rdar://problem/3790449> REGRESSION (Mail): underline behavior is flaky because of how CSS handles text-decoration
+
+       Oddly, Cmd-B, Cmd-U, type some text, return, Cmd-U, Cmd-B, type
+       some text, worked fine. But hitting the second Cmd-B before the
+       second Cmd-U still failed to remove underlining. The reason for
+       this is that our code to compute the style of the current position
+       did not work when you had a typing style and were positioned right
+       at a <br> element. For various reasons, this did not show up for
+       bold and italic, since those are handled through the font manager.
+
+       The following change fixes this - for elements that can't have
+       children, we add the dummy span after the element of interest,
+       rather than as a child of it.
+       
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::selectionComputedStyle): 
+
 2005-02-11  David Harrison  <harrison@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index b3e4bb001280fef398f2cda74a312c7030c678c2..ce03b68982693e893d0842093ba9a83b3b76a734 100644 (file)
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -5607,7 +5607,19 @@ CSSComputedStyleDeclarationImpl *KHTMLPart::selectionComputedStyle(NodeImpl *&no
         styleElement->appendChild(text, exceptionCode);
         assert(exceptionCode == 0);
 
-        elem->appendChild(styleElement, exceptionCode);
+        if (elem->renderer() && elem->renderer()->canHaveChildren()) {
+          elem->appendChild(styleElement, exceptionCode);
+        } else {
+          NodeImpl *parent = elem->parent();
+          NodeImpl *next = elem->nextSibling();
+
+          if (next) {
+            parent->insertBefore(styleElement, next, exceptionCode);
+          } else {
+            parent->appendChild(styleElement, exceptionCode);
+          }
+        }
+
         assert(exceptionCode == 0);
 
         nodeToRemove = styleElement;