Changeset 156256 in webkit for trunk/Source/WebCore/editing/markup.cpp

Timestamp:

Sep 22, 2013, 8:40:47 PM (12 years ago)

Author:

[email protected]

Message:

CTTE: Use references more in ContainerNode, ContainerNodeAlgorithms and related classes
​https://bugs.webkit.org/show_bug.cgi?id=121772

Reviewed by Andreas Kling.

../WebCore:

Use references for never null Nodes in ContainerNode and related classes.

../WebKit/qt:

• Api/qwebelement.cpp:

(QWebElementCollection::append):
Update to work with the new StaticNodeList adopt function.

File:

• trunk/Source/WebCore/editing/markup.cpp (modified) (4 diffs)

trunk/Source/WebCore/editing/markup.cpp

@@ -1066 +1066 @@
 }
 
-void replaceChildrenWithFragment(ContainerNode* container, PassRefPtr<DocumentFragment> fragment, ExceptionCode& ec)
-{
-    RefPtr<ContainerNode> containerNode(container);
-
+void replaceChildrenWithFragment(ContainerNode& container, PassRefPtr<DocumentFragment> fragment, ExceptionCode& ec)
+{
+    Ref<ContainerNode> containerNode(container);
     ChildListMutationScope mutation(containerNode.get());
 
@@ -1077 +1076 @@
     }
 
-    if (hasOneTextChild(containerNode.get()) && hasOneTextChild(fragment.get())) {
+    if (hasOneTextChild(&containerNode.get()) && hasOneTextChild(fragment.get())) {
         toText(containerNode->firstChild())->setData(toText(fragment->firstChild())->data(), ec);
         return;
     }
 
-    if (hasOneChild(containerNode.get())) {
+    if (hasOneChild(&containerNode.get())) {
         containerNode->replaceChild(fragment, containerNode->firstChild(), ec);
         return;
@@ -1091 +1090 @@
 }
 
-void replaceChildrenWithText(ContainerNode* container, const String& text, ExceptionCode& ec)
-{
-    RefPtr<ContainerNode> containerNode(container);
-
+void replaceChildrenWithText(ContainerNode& container, const String& text, ExceptionCode& ec)
+{
+    Ref<ContainerNode> containerNode(container);
     ChildListMutationScope mutation(containerNode.get());
 
-    if (hasOneTextChild(containerNode.get())) {
+    if (hasOneTextChild(&containerNode.get())) {
         toText(containerNode->firstChild())->setData(text, ec);
         return;
@@ -1104 +1102 @@
     RefPtr<Text> textNode = Text::create(containerNode->document(), text);
 
-    if (hasOneChild(containerNode.get())) {
+    if (hasOneChild(&containerNode.get())) {
         containerNode->replaceChild(textNode.release(), containerNode->firstChild(), ec);
         return;