Title: [116814] trunk/Source/WebCore
- Revision
- 116814
- Author
- [email protected]
- Date
- 2012-05-11 15:38:32 -0700 (Fri, 11 May 2012)
Log Message
Regression fix after r116798.
We need to return true for the html element in the design mode
in which case parentNode() is editable and is not a body element.
* dom/Node.cpp:
(WebCore::Node::isRootEditableElement):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116813 => 116814)
--- trunk/Source/WebCore/ChangeLog 2012-05-11 22:37:13 UTC (rev 116813)
+++ trunk/Source/WebCore/ChangeLog 2012-05-11 22:38:32 UTC (rev 116814)
@@ -1,3 +1,13 @@
+2012-05-11 Ryosuke Niwa <[email protected]>
+
+ Regression fix after r116798.
+
+ We need to return true for the html element in the design mode
+ in which case parentNode() is editable and is not a body element.
+
+ * dom/Node.cpp:
+ (WebCore::Node::isRootEditableElement):
+
2012-05-11 James Robinson <[email protected]>
[chromium] Move implementation of WebCore::GraphicsContext3D and related from WebKit/chromium/src to WebCore/platform/chromium/support
Modified: trunk/Source/WebCore/dom/Node.cpp (116813 => 116814)
--- trunk/Source/WebCore/dom/Node.cpp 2012-05-11 22:37:13 UTC (rev 116813)
+++ trunk/Source/WebCore/dom/Node.cpp 2012-05-11 22:38:32 UTC (rev 116814)
@@ -1569,7 +1569,8 @@
bool Node::isRootEditableElement() const
{
- return rendererIsEditable() && isElementNode() && (!parentNode() || !parentNode()->rendererIsEditable() || hasTagName(bodyTag));
+ return rendererIsEditable() && isElementNode() && (!parentNode() || !parentNode()->rendererIsEditable()
+ || !parentNode()->isElementNode() || hasTagName(bodyTag));
}
Element* Node::rootEditableElement(EditableType editableType) const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
