summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/editing/DeleteButtonController.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/editing/DeleteButtonController.cpp')
-rw-r--r--Source/WebCore/editing/DeleteButtonController.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/WebCore/editing/DeleteButtonController.cpp b/Source/WebCore/editing/DeleteButtonController.cpp
index 332e68f..5e76c08 100644
--- a/Source/WebCore/editing/DeleteButtonController.cpp
+++ b/Source/WebCore/editing/DeleteButtonController.cpp
@@ -112,8 +112,12 @@ static bool isDeletableElement(const Node* node)
return false;
// Allow blocks that have background images
- if (style->hasBackgroundImage() && style->backgroundImage()->canRender(1.0f))
- return true;
+ if (style->hasBackgroundImage()) {
+ for (const FillLayer* background = style->backgroundLayers(); background; background = background->next()) {
+ if (background->image() && background->image()->canRender(1))
+ return true;
+ }
+ }
// Allow blocks with a minimum number of non-transparent borders
unsigned visibleBorders = style->borderTop().isVisible() + style->borderBottom().isVisible() + style->borderLeft().isVisible() + style->borderRight().isVisible();
@@ -188,7 +192,7 @@ void DeleteButtonController::createDeletionUI()
CSSMutableStyleDeclaration* style = container->getInlineStyleDecl();
style->setProperty(CSSPropertyWebkitUserDrag, CSSValueNone);
style->setProperty(CSSPropertyWebkitUserSelect, CSSValueNone);
- style->setProperty(CSSPropertyWebkitUserModify, CSSValueNone);
+ style->setProperty(CSSPropertyWebkitUserModify, CSSValueReadOnly);
style->setProperty(CSSPropertyVisibility, CSSValueHidden);
style->setProperty(CSSPropertyPosition, CSSValueAbsolute);
style->setProperty(CSSPropertyCursor, CSSValueDefault);