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

Unified Diff: Source/core/editing/htmlediting.cpp

Issue 15732019: Revert 151179 "On IE and FireFox, they treats contenteditable="f..." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 months 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 | « Source/core/editing/htmlediting.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/htmlediting.cpp
diff --git a/Source/core/editing/htmlediting.cpp b/Source/core/editing/htmlediting.cpp
index 80b36f7907437d16ed7d4670f9045e16c9320942..69a59f3064ddfba20a4b7531e0de1a07c4889e9d 100644
--- a/Source/core/editing/htmlediting.cpp
+++ b/Source/core/editing/htmlediting.cpp
@@ -66,18 +66,7 @@ using namespace HTMLNames;
// purposes of editing.
bool isAtomicNode(const Node *node)
{
- if (!node)
- return false;
- if (!node->hasChildNodes() || editingIgnoresContent(node))
- return true;
- RenderObject* renderer = node->renderer();
- if (!renderer)
- return false;
- // For compatibility with IE, we allow to move caret into table cell event
- // if TABLE and TR are uneditable.
- if (renderer->isTable() || renderer->isTableRow())
- return false;
- return renderer->style()->userModify() == READ_ONLY && lowestEditableAncestor(node);
+ return node && (!node->hasChildNodes() || editingIgnoresContent(node));
}
// Compare two positions, taking into account the possibility that one or both
@@ -139,7 +128,7 @@ Node* highestEditableRoot(const Position& position, EditableType editableType)
return highestRoot;
}
-Node* lowestEditableAncestor(const Node* node)
+Node* lowestEditableAncestor(Node* node)
{
if (!node)
return 0;
« no previous file with comments | « Source/core/editing/htmlediting.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698