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

Unified Diff: third_party/WebKit/Source/core/editing/EditingUtilities.cpp

Issue 2184823004: [Editing][CodeHealth] Remove redundant Editabletype arguments in layoutObjectIsRichlyEditable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
Index: third_party/WebKit/Source/core/editing/EditingUtilities.cpp
diff --git a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
index 742755960833b21ed25818d812686d968695b74c..20b4753190feede4d31d1867652e9df342057f34 100644
--- a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
+++ b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
@@ -256,7 +256,7 @@ int comparePositions(const VisiblePosition& a, const VisiblePosition& b)
}
enum EditableLevel { Editable, RichlyEditable };
-static bool hasEditableStyle(const Node& node, EditableLevel editableLevel)
+static bool hasEditableLevel(const Node& node, EditableLevel editableLevel)
{
if (node.isPseudoElement())
return false;
@@ -283,9 +283,9 @@ static bool hasEditableStyle(const Node& node, EditableLevel editableLevel)
return false;
}
-static bool isEditableToAccessibility(const Node& node, EditableLevel editableLevel)
+static bool hasAXEditableLevel(const Node& node, EditableLevel editableLevel)
{
- if (blink::hasEditableStyle(node, editableLevel))
+ if (hasEditableLevel(node, editableLevel))
return true;
// FIXME: Respect editableLevel for ARIA editable elements.
@@ -302,37 +302,30 @@ static bool isEditableToAccessibility(const Node& node, EditableLevel editableLe
bool isContentEditable(const Node& node)
{
node.document().updateStyleAndLayoutTree();
- return blink::hasEditableStyle(node, Editable);
+ return hasEditableLevel(node, Editable);
}
bool isContentRichlyEditable(const Node& node)
{
node.document().updateStyleAndLayoutTree();
- return blink::hasEditableStyle(node, RichlyEditable);
+ return hasEditableLevel(node, RichlyEditable);
}
bool hasEditableStyle(const Node& node, EditableType editableType)
{
switch (editableType) {
case ContentIsEditable:
- return blink::hasEditableStyle(node, Editable);
+ return hasEditableLevel(node, Editable);
case HasEditableAXRole:
- return isEditableToAccessibility(node, Editable);
+ return hasAXEditableLevel(node, Editable);
}
NOTREACHED();
return false;
}
-bool layoutObjectIsRichlyEditable(const Node& node, EditableType editableType)
+bool hasRichlyEditableStyle(const Node& node)
{
- switch (editableType) {
- case ContentIsEditable:
- return blink::hasEditableStyle(node, RichlyEditable);
- case HasEditableAXRole:
- return isEditableToAccessibility(node, RichlyEditable);
- }
- NOTREACHED();
- return false;
+ return hasEditableLevel(node, RichlyEditable);
}
bool isRootEditableElement(const Node& node)
@@ -435,7 +428,7 @@ bool isRichlyEditablePosition(const Position& p)
if (isDisplayInsideTable(node))
node = node->parentNode();
- return layoutObjectIsRichlyEditable(*node);
+ return hasRichlyEditableStyle(*node);
}
Element* rootEditableElementOf(const Position& p, EditableType editableType)

Powered by Google App Engine
This is Rietveld 408576698