diff options
Diffstat (limited to 'Source/WebCore/editing/DeleteButtonController.cpp')
| -rw-r--r-- | Source/WebCore/editing/DeleteButtonController.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/WebCore/editing/DeleteButtonController.cpp b/Source/WebCore/editing/DeleteButtonController.cpp index 75b9a96..332e68f 100644 --- a/Source/WebCore/editing/DeleteButtonController.cpp +++ b/Source/WebCore/editing/DeleteButtonController.cpp @@ -63,7 +63,7 @@ DeleteButtonController::DeleteButtonController(Frame* frame) static bool isDeletableElement(const Node* node) { - if (!node || !node->isHTMLElement() || !node->inDocument() || !node->isContentEditable()) + if (!node || !node->isHTMLElement() || !node->inDocument() || !node->rendererIsEditable()) return false; // In general we want to only draw the UI around object of a certain area, but we still keep the min width/height to @@ -156,15 +156,11 @@ static HTMLElement* enclosingDeletableElement(const VisibleSelection& selection) // The enclosingNodeOfType function only works on nodes that are editable // (which is strange, given its name). - if (!container->isContentEditable()) + if (!container->rendererIsEditable()) return 0; Node* element = enclosingNodeOfType(firstPositionInNode(container), &isDeletableElement); - if (!element) - return 0; - - ASSERT(element->isHTMLElement()); - return toHTMLElement(element); + return element && element->isHTMLElement() ? toHTMLElement(element) : 0; } void DeleteButtonController::respondToChangedSelection(const VisibleSelection& oldSelection) |