Reviewed by Ken.

        - fixed <rdar://problem/4042867> "Bigger" changes the font size of too much text when the selection is on a style-change boundary

        * khtml/editing/htmlediting.cpp: (khtml::ApplyStyleCommand::applyRelativeFontStyleChange):
        Advance out of the starting text node if we're at the end of it.

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e328fe8795d4a16a68a82404f354a97dbe373c2d..bf1110291cdfab472465bb846b8d121baf7e3e81 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2005-03-10  Darin Adler  <darin@apple.com>
+
+        Reviewed by Ken.
+
+        - fixed <rdar://problem/4042867> "Bigger" changes the font size of too much text when the selection is on a style-change boundary
+
+        * khtml/editing/htmlediting.cpp: (khtml::ApplyStyleCommand::applyRelativeFontStyleChange):
+        Advance out of the starting text node if we're at the end of it.
+
 2005-03-10  Darin Adler  <darin@apple.com>
 
         * khtml/html/htmltokenizer.cpp: (khtml::HTMLTokenizer::write): Fixed assertion for nested calls to write.

diff --git a/WebCore/khtml/editing/htmlediting.cpp b/WebCore/khtml/editing/htmlediting.cpp
index 1831a829397c37b7696a1432ad2b678c9ebfc3fb..e1743a564fe709e97c38280d1ceb7f284932c482 100644 (file)
--- a/WebCore/khtml/editing/htmlediting.cpp
+++ b/WebCore/khtml/editing/htmlediting.cpp
@@ -1425,18 +1425,21 @@ void ApplyStyleCommand::applyRelativeFontStyleChange(CSSMutableStyleDeclarationI
 
     NodeImpl *beyondEnd = end.node()->traverseNextNode(); // Calculate loop end point.
     start = start.upstream(StayInBlock); // Move upstream to ensure we do not add redundant spans.
+    NodeImpl *startNode = start.node();
+    if (startNode->isTextNode() && start.offset() >= startNode->caretMaxOffset()) // Move out of text node if range does not include its characters.
+        startNode = startNode->traverseNextNode();
 
     // Store away font size before making any changes to the document.
     // This ensures that changes to one node won't effect another.
     QMap<const NodeImpl *,float> startingFontSizes;
-    for (const NodeImpl *node = start.node(); node != beyondEnd; node = node->traverseNextNode())
+    for (const NodeImpl *node = startNode; node != beyondEnd; node = node->traverseNextNode())
         startingFontSizes.insert(node, computedFontSize(node));
 
     // These spans were added by us. If empty after font size changes, they can be removed.
     QPtrList<NodeImpl> emptySpans;
     
     NodeImpl *lastStyledNode = 0;
-    for (NodeImpl *node = start.node(); node != beyondEnd; node = node->traverseNextNode()) {
+    for (NodeImpl *node = startNode; node != beyondEnd; node = node->traverseNextNode()) {
         HTMLElementImpl *elem = 0;
         if (node->isHTMLElement()) {
             // Only work on fully selected nodes.