Index: third_party/WebKit/Source/modules/accessibility/AXInlineTextBox.cpp |
diff --git a/third_party/WebKit/Source/modules/accessibility/AXInlineTextBox.cpp b/third_party/WebKit/Source/modules/accessibility/AXInlineTextBox.cpp |
index 305dfbc8c7b761ac70e59763a18fceae1ee396da..068a1d7b27b3a6b65f2df4b1b5f126f5ef02c08c 100644 |
--- a/third_party/WebKit/Source/modules/accessibility/AXInlineTextBox.cpp |
+++ b/third_party/WebKit/Source/modules/accessibility/AXInlineTextBox.cpp |
@@ -41,8 +41,7 @@ |
AXInlineTextBox::AXInlineTextBox( |
PassRefPtr<AbstractInlineTextBox> inline_text_box, |
AXObjectCacheImpl& ax_object_cache) |
- : AXObjectImpl(ax_object_cache), |
- inline_text_box_(std::move(inline_text_box)) {} |
+ : AXObject(ax_object_cache), inline_text_box_(std::move(inline_text_box)) {} |
AXInlineTextBox* AXInlineTextBox::Create( |
PassRefPtr<AbstractInlineTextBox> inline_text_box, |
@@ -53,12 +52,12 @@ |
void AXInlineTextBox::Init() {} |
void AXInlineTextBox::Detach() { |
- AXObjectImpl::Detach(); |
+ AXObject::Detach(); |
inline_text_box_ = nullptr; |
} |
void AXInlineTextBox::GetRelativeBounds( |
- AXObjectImpl** out_container, |
+ AXObject** out_container, |
FloatRect& out_bounds_in_container, |
SkMatrix44& out_container_transform) const { |
*out_container = nullptr; |
@@ -82,7 +81,7 @@ |
bool AXInlineTextBox::ComputeAccessibilityIsIgnored( |
IgnoredReasons* ignored_reasons) const { |
- AXObjectImpl* parent = ParentObject(); |
+ AXObject* parent = ParentObject(); |
if (!parent) |
return false; |
@@ -124,9 +123,8 @@ |
AXRange(word_boundaries[i].start_index, word_boundaries[i].end_index); |
} |
-String AXInlineTextBox::GetName( |
- AXNameFrom& name_from, |
- AXObjectImpl::AXObjectVector* name_objects) const { |
+String AXInlineTextBox::GetName(AXNameFrom& name_from, |
+ AXObject::AXObjectVector* name_objects) const { |
if (!inline_text_box_) |
return String(); |
@@ -134,7 +132,7 @@ |
return inline_text_box_->GetText(); |
} |
-AXObjectImpl* AXInlineTextBox::ComputeParent() const { |
+AXObject* AXInlineTextBox::ComputeParent() const { |
DCHECK(!IsDetached()); |
if (!inline_text_box_ || !ax_object_cache_) |
return 0; |
@@ -148,7 +146,7 @@ |
// top to bottom and bottom to top via the CSS writing-mode property. |
AccessibilityTextDirection AXInlineTextBox::GetTextDirection() const { |
if (!inline_text_box_) |
- return AXObjectImpl::GetTextDirection(); |
+ return AXObject::GetTextDirection(); |
switch (inline_text_box_->GetDirection()) { |
case AbstractInlineTextBox::kLeftToRight: |
@@ -161,10 +159,10 @@ |
return kAccessibilityTextDirectionBTT; |
} |
- return AXObjectImpl::GetTextDirection(); |
+ return AXObject::GetTextDirection(); |
} |
-AXObjectImpl* AXInlineTextBox::NextOnLine() const { |
+AXObject* AXInlineTextBox::NextOnLine() const { |
RefPtr<AbstractInlineTextBox> next_on_line = inline_text_box_->NextOnLine(); |
if (next_on_line) |
return ax_object_cache_->GetOrCreate(next_on_line.Get()); |
@@ -175,7 +173,7 @@ |
return ParentObject()->NextOnLine(); |
} |
-AXObjectImpl* AXInlineTextBox::PreviousOnLine() const { |
+AXObject* AXInlineTextBox::PreviousOnLine() const { |
RefPtr<AbstractInlineTextBox> previous_on_line = |
inline_text_box_->PreviousOnLine(); |
if (previous_on_line) |