Commit 40099ae8 authored by Dominic Mazzoni's avatar Dominic Mazzoni Committed by Commit Bot

Remove IsNative

This was originally needed so that we wouldn't cast a
BrowserAccessibility* into a platform-specific subclass
in a unit test that was explicitly constructing the
parent class.

We got rid of all such unit tests now, so there's no longer a
need for IsNative.

Bug: None
Change-Id: I934f08f22aa497c3894ee60c0c8f13fb046fc98e
Relnotes: N/A
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2141047Reviewed-by: default avatarAaron Leventhal <aleventhal@chromium.org>
Reviewed-by: default avatarNektarios Paisios <nektar@chromium.org>
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757753}
parent 9e8d8194
...@@ -229,10 +229,6 @@ BrowserAccessibility* BrowserAccessibility::PlatformGetSelectionContainer() ...@@ -229,10 +229,6 @@ BrowserAccessibility* BrowserAccessibility::PlatformGetSelectionContainer()
return container; return container;
} }
bool BrowserAccessibility::IsNative() const {
return false;
}
bool BrowserAccessibility::IsDescendantOf( bool BrowserAccessibility::IsDescendantOf(
const BrowserAccessibility* ancestor) const { const BrowserAccessibility* ancestor) const {
if (!ancestor) if (!ancestor)
......
...@@ -323,11 +323,6 @@ class CONTENT_EXPORT BrowserAccessibility : public ui::AXPlatformNodeDelegate { ...@@ -323,11 +323,6 @@ class CONTENT_EXPORT BrowserAccessibility : public ui::AXPlatformNodeDelegate {
typedef base::StringPairs HtmlAttributes; typedef base::StringPairs HtmlAttributes;
const HtmlAttributes& GetHtmlAttributes() const; const HtmlAttributes& GetHtmlAttributes() const;
// Returns true if this is a native platform-specific object, vs a
// cross-platform generic object. Don't call ToBrowserAccessibilityXXX if
// IsNative returns false.
virtual bool IsNative() const;
// Accessing accessibility attributes: // Accessing accessibility attributes:
// //
// There are dozens of possible attributes for an accessibility node, // There are dozens of possible attributes for an accessibility node,
......
...@@ -87,10 +87,6 @@ BrowserAccessibilityAndroid::~BrowserAccessibilityAndroid() { ...@@ -87,10 +87,6 @@ BrowserAccessibilityAndroid::~BrowserAccessibilityAndroid() {
g_unique_id_map.Get().erase(unique_id()); g_unique_id_map.Get().erase(unique_id());
} }
bool BrowserAccessibilityAndroid::IsNative() const {
return true;
}
void BrowserAccessibilityAndroid::OnLocationChanged() { void BrowserAccessibilityAndroid::OnLocationChanged() {
auto* manager = auto* manager =
static_cast<BrowserAccessibilityManagerAndroid*>(this->manager()); static_cast<BrowserAccessibilityManagerAndroid*>(this->manager());
......
...@@ -26,7 +26,6 @@ class CONTENT_EXPORT BrowserAccessibilityAndroid : public BrowserAccessibility { ...@@ -26,7 +26,6 @@ class CONTENT_EXPORT BrowserAccessibilityAndroid : public BrowserAccessibility {
// Overrides from BrowserAccessibility. // Overrides from BrowserAccessibility.
void OnDataChanged() override; void OnDataChanged() override;
bool IsNative() const override;
void OnLocationChanged() override; void OnLocationChanged() override;
base::string16 GetValue() const override; base::string16 GetValue() const override;
......
...@@ -11,7 +11,6 @@ namespace content { ...@@ -11,7 +11,6 @@ namespace content {
BrowserAccessibilityAuraLinux* ToBrowserAccessibilityAuraLinux( BrowserAccessibilityAuraLinux* ToBrowserAccessibilityAuraLinux(
BrowserAccessibility* obj) { BrowserAccessibility* obj) {
DCHECK(!obj || obj->IsNative());
return static_cast<BrowserAccessibilityAuraLinux*>(obj); return static_cast<BrowserAccessibilityAuraLinux*>(obj);
} }
...@@ -57,10 +56,6 @@ ui::AXPlatformNode* BrowserAccessibilityAuraLinux::GetAXPlatformNode() const { ...@@ -57,10 +56,6 @@ ui::AXPlatformNode* BrowserAccessibilityAuraLinux::GetAXPlatformNode() const {
return GetNode(); return GetNode();
} }
bool BrowserAccessibilityAuraLinux::IsNative() const {
return true;
}
base::string16 BrowserAccessibilityAuraLinux::GetText() const { base::string16 BrowserAccessibilityAuraLinux::GetText() const {
return GetHypertext(); return GetHypertext();
} }
......
...@@ -31,7 +31,6 @@ class BrowserAccessibilityAuraLinux : public BrowserAccessibility { ...@@ -31,7 +31,6 @@ class BrowserAccessibilityAuraLinux : public BrowserAccessibility {
// BrowserAccessibility methods. // BrowserAccessibility methods.
void OnDataChanged() override; void OnDataChanged() override;
ui::AXPlatformNode* GetAXPlatformNode() const override; ui::AXPlatformNode* GetAXPlatformNode() const override;
bool IsNative() const override;
base::string16 GetText() const override; base::string16 GetText() const override;
base::string16 GetHypertext() const override; base::string16 GetHypertext() const override;
......
...@@ -1677,7 +1677,7 @@ void BrowserAccessibilityComWin::FireNativeEvent(LONG win_event_type) const { ...@@ -1677,7 +1677,7 @@ void BrowserAccessibilityComWin::FireNativeEvent(LONG win_event_type) const {
BrowserAccessibilityComWin* ToBrowserAccessibilityComWin( BrowserAccessibilityComWin* ToBrowserAccessibilityComWin(
BrowserAccessibility* obj) { BrowserAccessibility* obj) {
if (!obj || !obj->IsNative()) if (!obj)
return nullptr; return nullptr;
auto* result = static_cast<BrowserAccessibilityWin*>(obj)->GetCOM(); auto* result = static_cast<BrowserAccessibilityWin*>(obj)->GetCOM();
return result; return result;
......
...@@ -28,7 +28,6 @@ class BrowserAccessibilityMac : public BrowserAccessibility { ...@@ -28,7 +28,6 @@ class BrowserAccessibilityMac : public BrowserAccessibility {
public: public:
// BrowserAccessibility overrides. // BrowserAccessibility overrides.
~BrowserAccessibilityMac() override; ~BrowserAccessibilityMac() override;
bool IsNative() const override;
void OnDataChanged() override; void OnDataChanged() override;
uint32_t PlatformChildCount() const override; uint32_t PlatformChildCount() const override;
BrowserAccessibility* PlatformGetChild(uint32_t child_index) const override; BrowserAccessibility* PlatformGetChild(uint32_t child_index) const override;
......
...@@ -31,10 +31,6 @@ BrowserAccessibilityMac::~BrowserAccessibilityMac() { ...@@ -31,10 +31,6 @@ BrowserAccessibilityMac::~BrowserAccessibilityMac() {
[browser_accessibility_cocoa_ release]; [browser_accessibility_cocoa_ release];
} }
bool BrowserAccessibilityMac::IsNative() const {
return true;
}
void BrowserAccessibilityMac::OnDataChanged() { void BrowserAccessibilityMac::OnDataChanged() {
BrowserAccessibility::OnDataChanged(); BrowserAccessibility::OnDataChanged();
...@@ -180,14 +176,12 @@ BrowserAccessibility* BrowserAccessibilityMac::PlatformGetPreviousSibling() ...@@ -180,14 +176,12 @@ BrowserAccessibility* BrowserAccessibilityMac::PlatformGetPreviousSibling()
const BrowserAccessibilityCocoa* ToBrowserAccessibilityCocoa( const BrowserAccessibilityCocoa* ToBrowserAccessibilityCocoa(
const BrowserAccessibility* obj) { const BrowserAccessibility* obj) {
DCHECK(obj); DCHECK(obj);
DCHECK(obj->IsNative());
return static_cast<const BrowserAccessibilityMac*>(obj)->native_view(); return static_cast<const BrowserAccessibilityMac*>(obj)->native_view();
} }
BrowserAccessibilityCocoa* ToBrowserAccessibilityCocoa( BrowserAccessibilityCocoa* ToBrowserAccessibilityCocoa(
BrowserAccessibility* obj) { BrowserAccessibility* obj) {
DCHECK(obj); DCHECK(obj);
DCHECK(obj->IsNative());
return static_cast<BrowserAccessibilityMac*>(obj)->native_view(); return static_cast<BrowserAccessibilityMac*>(obj)->native_view();
} }
......
...@@ -1534,7 +1534,7 @@ void BrowserAccessibilityManager::CollectChangedNodesAndParentsForAtomicUpdate( ...@@ -1534,7 +1534,7 @@ void BrowserAccessibilityManager::CollectChangedNodesAndParentsForAtomicUpdate(
DCHECK(changed_node); DCHECK(changed_node);
BrowserAccessibility* obj = GetFromAXNode(changed_node); BrowserAccessibility* obj = GetFromAXNode(changed_node);
if (obj && obj->IsNative()) if (obj)
nodes_needing_update->insert(obj->GetAXPlatformNode()); nodes_needing_update->insert(obj->GetAXPlatformNode());
// When a node is a text node or line break, update its parent, because // When a node is a text node or line break, update its parent, because
...@@ -1545,7 +1545,7 @@ void BrowserAccessibilityManager::CollectChangedNodesAndParentsForAtomicUpdate( ...@@ -1545,7 +1545,7 @@ void BrowserAccessibilityManager::CollectChangedNodesAndParentsForAtomicUpdate(
if (ui::IsTextOrLineBreak(changed_node->data().role)) { if (ui::IsTextOrLineBreak(changed_node->data().role)) {
BrowserAccessibility* parent_obj = GetFromAXNode(parent); BrowserAccessibility* parent_obj = GetFromAXNode(parent);
if (parent_obj && parent_obj->IsNative()) if (parent_obj)
nodes_needing_update->insert(parent_obj->GetAXPlatformNode()); nodes_needing_update->insert(parent_obj->GetAXPlatformNode());
} }
...@@ -1559,7 +1559,7 @@ void BrowserAccessibilityManager::CollectChangedNodesAndParentsForAtomicUpdate( ...@@ -1559,7 +1559,7 @@ void BrowserAccessibilityManager::CollectChangedNodesAndParentsForAtomicUpdate(
} }
BrowserAccessibility* editable_root_obj = GetFromAXNode(editable_root); BrowserAccessibility* editable_root_obj = GetFromAXNode(editable_root);
if (editable_root_obj && editable_root_obj->IsNative()) if (editable_root_obj)
nodes_needing_update->insert(editable_root_obj->GetAXPlatformNode()); nodes_needing_update->insert(editable_root_obj->GetAXPlatformNode());
} }
} }
......
...@@ -69,9 +69,6 @@ void BrowserAccessibilityManagerAuraLinux::FireSelectedEvent( ...@@ -69,9 +69,6 @@ void BrowserAccessibilityManagerAuraLinux::FireSelectedEvent(
void BrowserAccessibilityManagerAuraLinux::FireLoadingEvent( void BrowserAccessibilityManagerAuraLinux::FireLoadingEvent(
BrowserAccessibility* node, BrowserAccessibility* node,
bool is_loading) { bool is_loading) {
if (!node->IsNative())
return;
gfx::NativeViewAccessible obj = node->GetNativeViewAccessible(); gfx::NativeViewAccessible obj = node->GetNativeViewAccessible();
if (!ATK_IS_OBJECT(obj)) if (!ATK_IS_OBJECT(obj))
return; return;
...@@ -84,18 +81,12 @@ void BrowserAccessibilityManagerAuraLinux::FireLoadingEvent( ...@@ -84,18 +81,12 @@ void BrowserAccessibilityManagerAuraLinux::FireLoadingEvent(
void BrowserAccessibilityManagerAuraLinux::FireExpandedEvent( void BrowserAccessibilityManagerAuraLinux::FireExpandedEvent(
BrowserAccessibility* node, BrowserAccessibility* node,
bool is_expanded) { bool is_expanded) {
if (!node->IsNative())
return;
ToBrowserAccessibilityAuraLinux(node)->GetNode()->OnExpandedStateChanged( ToBrowserAccessibilityAuraLinux(node)->GetNode()->OnExpandedStateChanged(
is_expanded); is_expanded);
} }
void BrowserAccessibilityManagerAuraLinux::FireEvent(BrowserAccessibility* node, void BrowserAccessibilityManagerAuraLinux::FireEvent(BrowserAccessibility* node,
ax::mojom::Event event) { ax::mojom::Event event) {
if (!node->IsNative())
return;
ToBrowserAccessibilityAuraLinux(node)->GetNode()->NotifyAccessibilityEvent( ToBrowserAccessibilityAuraLinux(node)->GetNode()->NotifyAccessibilityEvent(
event); event);
} }
...@@ -205,7 +196,7 @@ void BrowserAccessibilityManagerAuraLinux::OnNodeDataWillChange( ...@@ -205,7 +196,7 @@ void BrowserAccessibilityManagerAuraLinux::OnNodeDataWillChange(
// children-changed:add is handled with the generated Event::IGNORED_CHANGED. // children-changed:add is handled with the generated Event::IGNORED_CHANGED.
if (!old_node_data.IsIgnored() && new_node_data.IsIgnored()) { if (!old_node_data.IsIgnored() && new_node_data.IsIgnored()) {
BrowserAccessibility* obj = GetFromID(old_node_data.id); BrowserAccessibility* obj = GetFromID(old_node_data.id);
if (obj && obj->IsNative() && obj->GetParent()) { if (obj && obj->GetParent()) {
DCHECK(!obj->IsIgnored()); DCHECK(!obj->IsIgnored());
g_signal_emit_by_name(obj->GetParent(), "children-changed::remove", g_signal_emit_by_name(obj->GetParent(), "children-changed::remove",
obj->GetIndexInParent(), obj->GetIndexInParent(),
...@@ -222,7 +213,7 @@ void BrowserAccessibilityManagerAuraLinux::OnSubtreeWillBeDeleted( ...@@ -222,7 +213,7 @@ void BrowserAccessibilityManagerAuraLinux::OnSubtreeWillBeDeleted(
return; return;
BrowserAccessibility* obj = GetFromAXNode(node); BrowserAccessibility* obj = GetFromAXNode(node);
if (obj && obj->IsNative()) if (obj)
ToBrowserAccessibilityAuraLinux(obj)->GetNode()->OnSubtreeWillBeDeleted(); ToBrowserAccessibilityAuraLinux(obj)->GetNode()->OnSubtreeWillBeDeleted();
} }
......
...@@ -203,9 +203,6 @@ void BrowserAccessibilityManagerMac::FireGeneratedEvent( ...@@ -203,9 +203,6 @@ void BrowserAccessibilityManagerMac::FireGeneratedEvent(
ui::AXEventGenerator::Event event_type, ui::AXEventGenerator::Event event_type,
BrowserAccessibility* node) { BrowserAccessibility* node) {
BrowserAccessibilityManager::FireGeneratedEvent(event_type, node); BrowserAccessibilityManager::FireGeneratedEvent(event_type, node);
if (!node->IsNative())
return;
auto native_node = ToBrowserAccessibilityCocoa(node); auto native_node = ToBrowserAccessibilityCocoa(node);
DCHECK(native_node); DCHECK(native_node);
...@@ -469,9 +466,6 @@ void BrowserAccessibilityManagerMac::FireGeneratedEvent( ...@@ -469,9 +466,6 @@ void BrowserAccessibilityManagerMac::FireGeneratedEvent(
void BrowserAccessibilityManagerMac::FireNativeMacNotification( void BrowserAccessibilityManagerMac::FireNativeMacNotification(
NSString* mac_notification, NSString* mac_notification,
BrowserAccessibility* node) { BrowserAccessibility* node) {
if (!node->IsNative())
return;
DCHECK(mac_notification); DCHECK(mac_notification);
auto native_node = ToBrowserAccessibilityCocoa(node); auto native_node = ToBrowserAccessibilityCocoa(node);
DCHECK(native_node); DCHECK(native_node);
...@@ -494,7 +488,7 @@ void BrowserAccessibilityManagerMac::OnAtomicUpdateFinished( ...@@ -494,7 +488,7 @@ void BrowserAccessibilityManagerMac::OnAtomicUpdateFinished(
std::set<const BrowserAccessibilityCocoa*> changed_editable_roots; std::set<const BrowserAccessibilityCocoa*> changed_editable_roots;
for (const auto& change : changes) { for (const auto& change : changes) {
const BrowserAccessibility* obj = GetFromAXNode(change.node); const BrowserAccessibility* obj = GetFromAXNode(change.node);
if (obj && obj->IsNative() && obj->HasState(ax::mojom::State::kEditable)) { if (obj && obj->HasState(ax::mojom::State::kEditable)) {
const BrowserAccessibilityCocoa* editable_root = const BrowserAccessibilityCocoa* editable_root =
[ToBrowserAccessibilityCocoa(obj) editableAncestor]; [ToBrowserAccessibilityCocoa(obj) editableAncestor];
if (editable_root && [editable_root instanceActive]) if (editable_root && [editable_root instanceActive])
......
...@@ -47,10 +47,6 @@ ui::AXPlatformNode* BrowserAccessibilityWin::GetAXPlatformNode() const { ...@@ -47,10 +47,6 @@ ui::AXPlatformNode* BrowserAccessibilityWin::GetAXPlatformNode() const {
return GetCOM(); return GetCOM();
} }
bool BrowserAccessibilityWin::IsNative() const {
return true;
}
void BrowserAccessibilityWin::OnLocationChanged() { void BrowserAccessibilityWin::OnLocationChanged() {
GetCOM()->FireNativeEvent(EVENT_OBJECT_LOCATIONCHANGE); GetCOM()->FireNativeEvent(EVENT_OBJECT_LOCATIONCHANGE);
} }
...@@ -104,13 +100,11 @@ BrowserAccessibilityComWin* BrowserAccessibilityWin::GetCOM() const { ...@@ -104,13 +100,11 @@ BrowserAccessibilityComWin* BrowserAccessibilityWin::GetCOM() const {
} }
BrowserAccessibilityWin* ToBrowserAccessibilityWin(BrowserAccessibility* obj) { BrowserAccessibilityWin* ToBrowserAccessibilityWin(BrowserAccessibility* obj) {
DCHECK(!obj || obj->IsNative());
return static_cast<BrowserAccessibilityWin*>(obj); return static_cast<BrowserAccessibilityWin*>(obj);
} }
const BrowserAccessibilityWin* ToBrowserAccessibilityWin( const BrowserAccessibilityWin* ToBrowserAccessibilityWin(
const BrowserAccessibility* obj) { const BrowserAccessibility* obj) {
DCHECK(!obj || obj->IsNative());
return static_cast<const BrowserAccessibilityWin*>(obj); return static_cast<const BrowserAccessibilityWin*>(obj);
} }
......
...@@ -26,7 +26,6 @@ class CONTENT_EXPORT BrowserAccessibilityWin : public BrowserAccessibility { ...@@ -26,7 +26,6 @@ class CONTENT_EXPORT BrowserAccessibilityWin : public BrowserAccessibility {
// BrowserAccessibility methods. // BrowserAccessibility methods.
// //
ui::AXPlatformNode* GetAXPlatformNode() const override; ui::AXPlatformNode* GetAXPlatformNode() const override;
bool IsNative() const override;
void OnLocationChanged() override; void OnLocationChanged() override;
base::string16 GetText() const override; base::string16 GetText() const override;
base::string16 GetHypertext() const override; base::string16 GetHypertext() const override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment