| 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 ad8cbb44bc25ed3e16ec6a51c36b4e1fb368847f..35e6d020c6d8e0bb42544b4a4912d953bafc8809 100644
|
| --- a/third_party/WebKit/Source/core/dom/Node.h
|
| +++ b/third_party/WebKit/Source/core/dom/Node.h
|
| @@ -431,9 +431,9 @@ public:
|
| {
|
| switch (editableType) {
|
| case ContentIsEditable:
|
| - return hasEditableStyle(Editable, treatment);
|
| + return hasEditableStyle(this, Editable, treatment);
|
| case HasEditableAXRole:
|
| - return isEditableToAccessibility(Editable);
|
| + return isEditableToAccessibility(this, Editable);
|
| }
|
| ASSERT_NOT_REACHED();
|
| return false;
|
| @@ -443,9 +443,9 @@ public:
|
| {
|
| switch (editableType) {
|
| case ContentIsEditable:
|
| - return hasEditableStyle(RichlyEditable, UserSelectAllIsAlwaysNonEditable);
|
| + return hasEditableStyle(this, RichlyEditable, UserSelectAllIsAlwaysNonEditable);
|
| case HasEditableAXRole:
|
| - return isEditableToAccessibility(RichlyEditable);
|
| + return isEditableToAccessibility(this, RichlyEditable);
|
| }
|
| ASSERT_NOT_REACHED();
|
| return false;
|
| @@ -804,9 +804,10 @@ private:
|
|
|
| void checkSlotChange();
|
|
|
| + // TODO(yoichio): Move these to core/editing
|
| enum EditableLevel { Editable, RichlyEditable };
|
| - bool hasEditableStyle(EditableLevel, UserSelectAllTreatment = UserSelectAllIsAlwaysNonEditable) const;
|
| - bool isEditableToAccessibility(EditableLevel) const;
|
| + static bool hasEditableStyle(const Node*, EditableLevel, UserSelectAllTreatment = UserSelectAllIsAlwaysNonEditable);
|
| + static bool isEditableToAccessibility(const Node*, EditableLevel);
|
|
|
| bool isUserActionElementActive() const;
|
| bool isUserActionElementInActiveChain() const;
|
|
|