Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1204)

Unified Diff: sky/engine/core/dom/Node.cpp

Issue 716223003: Fix contenteditable (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sky/viewer/document_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/Node.cpp
diff --git a/sky/engine/core/dom/Node.cpp b/sky/engine/core/dom/Node.cpp
index 8451d27d0d1c1935bdafb1ec9a48e49d8004156c..35f7801a2d918a0c3ca05c0388ab7a1ad956feb7 100644
--- a/sky/engine/core/dom/Node.cpp
+++ b/sky/engine/core/dom/Node.cpp
@@ -400,20 +400,13 @@ bool Node::hasEditableStyle(EditableLevel editableLevel, UserSelectAllTreatment
// would fire in the middle of Document::setFocusedNode().
for (const Node* node = this; node; node = node->parentNode()) {
- if ((node->isHTMLElement() || node->isDocumentNode()) && node->renderer()) {
+ if (node->isHTMLElement() && node->renderer()) {
// Elements with user-select: all style are considered atomic
// therefore non editable.
if (Position::nodeIsUserSelectAll(node) && treatment == UserSelectAllIsAlwaysNonEditable)
return false;
- switch (node->renderer()->style()->userModify()) {
- case READ_ONLY:
- return false;
- case READ_WRITE:
- return true;
- case READ_WRITE_PLAINTEXT_ONLY:
+ if (static_cast<const Element*>(node)->hasAttribute(HTMLNames::contenteditableAttr))
return editableLevel != RichlyEditable;
- }
- ASSERT_NOT_REACHED();
return false;
}
}
« no previous file with comments | « no previous file | sky/viewer/document_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698