| Index: third_party/WebKit/Source/core/dom/Node.h
|
| diff --git a/third_party/WebKit/Source/core/dom/Node.h b/third_party/WebKit/Source/core/dom/Node.h
|
| index a3f8ef6d7178ab3cc3fef910916d7a6ead739df0..e81dfe8cb0155dd7ff4f8aaff278736ae9d468b1 100644
|
| --- a/third_party/WebKit/Source/core/dom/Node.h
|
| +++ b/third_party/WebKit/Source/core/dom/Node.h
|
| @@ -416,18 +416,14 @@ public:
|
| // must be recognized as inert to prevent text selection.
|
| bool isInert() const;
|
|
|
| - enum UserSelectAllTreatment {
|
| - UserSelectAllDoesNotAffectEditability,
|
| - UserSelectAllIsAlwaysNonEditable
|
| - };
|
| - bool isContentEditable(UserSelectAllTreatment = UserSelectAllDoesNotAffectEditability) const;
|
| + bool isContentEditable() const;
|
| bool isContentRichlyEditable() const;
|
|
|
| - bool hasEditableStyle(EditableType editableType = ContentIsEditable, UserSelectAllTreatment treatment = UserSelectAllIsAlwaysNonEditable) const
|
| + bool hasEditableStyle(EditableType editableType = ContentIsEditable) const
|
| {
|
| switch (editableType) {
|
| case ContentIsEditable:
|
| - return hasEditableStyle(Editable, treatment);
|
| + return hasEditableStyle(Editable);
|
| case HasEditableAXRole:
|
| return isEditableToAccessibility(Editable);
|
| }
|
| @@ -439,7 +435,7 @@ public:
|
| {
|
| switch (editableType) {
|
| case ContentIsEditable:
|
| - return hasEditableStyle(RichlyEditable, UserSelectAllIsAlwaysNonEditable);
|
| + return hasEditableStyle(RichlyEditable);
|
| case HasEditableAXRole:
|
| return isEditableToAccessibility(RichlyEditable);
|
| }
|
| @@ -801,7 +797,7 @@ private:
|
| void checkSlotChange();
|
|
|
| enum EditableLevel { Editable, RichlyEditable };
|
| - bool hasEditableStyle(EditableLevel, UserSelectAllTreatment = UserSelectAllIsAlwaysNonEditable) const;
|
| + bool hasEditableStyle(EditableLevel) const;
|
| bool isEditableToAccessibility(EditableLevel) const;
|
|
|
| bool isUserActionElementActive() const;
|
|
|