Reviewed by Darin.
authorharrison <harrison@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 8 Nov 2004 18:31:03 +0000 (18:31 +0000)
committerharrison <harrison@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 8 Nov 2004 18:31:03 +0000 (18:31 +0000)
        Renamed NodeImpl::enclosingNonBlockFlowElement to NodeImpl::enclosingInlineElement, per Hyatt.

        * khtml/editing/htmlediting.cpp:
        (khtml::DeleteSelectionCommand::moveNodesAfterNode):
        * khtml/xml/dom_nodeimpl.cpp:
        (NodeImpl::enclosingInlineElement):
        * khtml/xml/dom_nodeimpl.h:

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

WebCore/ChangeLog-2005-08-23
WebCore/khtml/editing/htmlediting.cpp
WebCore/khtml/xml/dom_nodeimpl.cpp
WebCore/khtml/xml/dom_nodeimpl.h

index 8efa72183ec36dca440a8450abc77f16c54f9983..44e66ccdee939fb0fc3c187805528d3de452ae34 100644 (file)
@@ -1,3 +1,15 @@
+2004-11-08  David Harrison  <harrison@apple.com>
+
+        Reviewed by Darin.
+        
+        Renamed NodeImpl::enclosingNonBlockFlowElement to NodeImpl::enclosingInlineElement, per Hyatt.
+
+        * khtml/editing/htmlediting.cpp:
+        (khtml::DeleteSelectionCommand::moveNodesAfterNode):
+        * khtml/xml/dom_nodeimpl.cpp:
+        (NodeImpl::enclosingInlineElement):
+        * khtml/xml/dom_nodeimpl.h:
+
 2004-11-05  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/3838413> REGRESSION (Mail): "Smart" word paste adds spaces before/after special characters
index 84a12932af9a897987f206c60cc1b232fc5ab734..cb68c2963116d148f9ca9c9fbbd119a68b64004b 100644 (file)
@@ -1646,10 +1646,10 @@ void DeleteSelectionCommand::moveNodesAfterNode()
     removeBlockPlaceholderIfNeeded(startBlock);
 
     // Move the subtree containing node
-    NodeImpl *node = startNode->enclosingNonBlockFlowElement();
+    NodeImpl *node = startNode->enclosingInlineElement();
 
     // Insert after the subtree containing destNode
-    NodeImpl *refNode = dstNode->enclosingNonBlockFlowElement();
+    NodeImpl *refNode = dstNode->enclosingInlineElement();
 
     // Nothing to do if start is already at the beginning of dstBlock
     NodeImpl *dstBlock = refNode->enclosingBlockFlowElement();
index b7149a6cdb8f759dcaf8202e6ad59fa62b676ec6..2e909a8534cfa381d2528a538ddc2834cddd7775 100644 (file)
@@ -1365,7 +1365,7 @@ ElementImpl *NodeImpl::enclosingBlockFlowElement() const
     return 0;
 }
 
-ElementImpl *NodeImpl::enclosingNonBlockFlowElement() const
+ElementImpl *NodeImpl::enclosingInlineElement() const
 {
     NodeImpl *n = const_cast<NodeImpl *>(this);
     NodeImpl *p;
index d8b8b3c940f0a373f12755c63d9fbcb7b2a5e45a..685efd5daf41ce6207f650d11bd683768207af7c 100644 (file)
@@ -169,7 +169,7 @@ public:
 
     bool isEditableBlock() const;
     ElementImpl *enclosingBlockFlowElement() const;
-    ElementImpl *enclosingNonBlockFlowElement() const;
+    ElementImpl *enclosingInlineElement() const;
     ElementImpl *rootEditableElement() const;
     
     bool inSameRootEditableElement(NodeImpl *);