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

Timestamp:

Sep 8, 2013, 10:12:43 PM (12 years ago)

Author:

Darin Adler

Message:

Make Editor::deleteButtonController a reference
​https://bugs.webkit.org/show_bug.cgi?id=121019

Reviewed by Andreas Kling.

• dom/ContainerNode.cpp:

(WebCore::ContainerNode::cloneChildNodes): Updated to use . instead of ->.

• editing/DeleteButton.cpp:

(WebCore::DeleteButton::defaultEventHandler): Ditto.

• editing/DeleteButtonController.cpp:

(WebCore::DeleteButtonController::DeleteButtonController): Updated to take a Frame&
instead of a Frame*.
(WebCore::DeleteButtonController::respondToChangedSelection): Ditto.
(WebCore::DeleteButtonController::createDeletionUI): Ditto.
(WebCore::DeleteButtonController::show): Ditto.
(WebCore::DeleteButtonController::enable): Ditto.
(WebCore::DeleteButtonController::deleteTarget): Ditto.

• editing/DeleteButtonController.h: Ditto.

• editing/Editor.cpp:

(WebCore::Editor::avoidIntersectionWithDeleteButtonController): Removed bogus
null check from both versions of this function.
(WebCore::Editor::Editor): Use construction rather than assignment and pass
a reference instead of a pointer to make m_deleteButtonController.
(WebCore::Editor::clear): Ditto.

• editing/Editor.h: Made deleteButtonController return a reference.

Also reorganized the header to put all the conditional functions together,
and not mixed in with non-conditional ones.

• editing/markup.cpp:

(WebCore::createMarkup): Updated to use . instead of -> and also to use
emptyString() instead of constructing a new empty string.

File:

• trunk/Source/WebCore/editing/markup.cpp (modified) (1 diff)

trunk/Source/WebCore/editing/markup.cpp

@@ -758 +758 @@
 {
     if (!node)
-        return "";
+        return emptyString();
 
     HTMLElement* deleteButtonContainerElement = 0;
 #if ENABLE(DELETION_UI)
     if (Frame* frame = node->document().frame()) {
-        deleteButtonContainerElement = frame->editor().deleteButtonController()->containerElement();
+        deleteButtonContainerElement = frame->editor().deleteButtonController().containerElement();
         if (node->isDescendantOf(deleteButtonContainerElement))
-            return "";
+            return emptyString();
     }
 #endif