Reviewed by Ken and Darin.

        <rdar://problem/3856215> Cannot remove bold from the beginning of a message

        Problem is that KHTMLPart::computeAndSetTypingStyle always looked upstream
        for the existing style, but in this case (hitting cmd-B with caret at top of
        file) there is nothing upstream.  Changed this to use the VisiblePosition
        deepEquivalent instead.

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

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index aa5abd92153338792732bb2c24ac2dcf821a42ef..fc691ae30fbd13e919a4be4a276a87a72018fb92 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2004-11-19  David Harrison  <harrison@apple.com>
+
+        Reviewed by Ken and Darin.
+
+        <rdar://problem/3856215> Cannot remove bold from the beginning of a message
+
+        Problem is that KHTMLPart::computeAndSetTypingStyle always looked upstream
+        for the existing style, but in this case (hitting cmd-B with caret at top of
+        file) there is nothing upstream.  Changed this to use the VisiblePosition
+        deepEquivalent instead.
+        
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::computeAndSetTypingStyle):
+
 === Safari-172 ===
 
 2004-11-19  Maciej Stachowiak  <mjs@apple.com>

diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index f1fb3d531f660eb49a32428ef106b9549d2a40fe..72f185fd09fc1013b60a1dbf5acb6433b8150600 100644 (file)
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -5338,7 +5338,9 @@ void KHTMLPart::computeAndSetTypingStyle(CSSStyleDeclarationImpl *style)
         mutableStyle = typingStyle();
         mutableStyle->ref();
     }
-    CSSComputedStyleDeclarationImpl computedStyle(selection().start().upstream(StayInBlock).node());
+
+    NodeImpl *node = VisiblePosition(selection().start()).deepEquivalent().node();
+    CSSComputedStyleDeclarationImpl computedStyle(node);
     computedStyle.diff(mutableStyle);
     
     // Handle block styles, substracting these from the typing style.