Skip to content

Commit

Permalink
Backlight OCR: Changes all CHECKs to DCHECKs to avoid crashing the
Browse files Browse the repository at this point in the history 
browser

AX-Relnotes: n/a.
Bug: b/344720419
Change-Id: I62b79909f585dcd06d3c8b68ae9b42306d0563d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5598186
Auto-Submit: Nektarios Paisios <nektar@chromium.org>
Reviewed-by: Kyungjun Lee <kyungjunlee@google.com>
Commit-Queue: Kyungjun Lee <kyungjunlee@google.com>
Cr-Commit-Position: refs/heads/main@{#1310667}
  • Loading branch information
@pull
Nektarios Paisios authored and pull[bot] committed Jun 12, 2024
1 parent 0df3a24 commit 1130741
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions chrome/browser/accessibility/media_app/ax_media_app_untrusted_handler.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ void AXMediaAppUntrustedHandler::PerformAction(
if (!document_.GetRoot()) {
return;
}
CHECK(document_.ax_tree());
DCHECK(document_.ax_tree());
switch (action_data.action) {
case ax::mojom::Action::kBlur:
case ax::mojom::Action::kClearAccessibilityFocus:
Expand Down Expand Up @@ -274,15 +274,15 @@ void AXMediaAppUntrustedHandler::PerformAction(
}
case ax::mojom::Action::kScrollToMakeVisible: {
if (!media_app_) {
CHECK_NE(action_data.target_tree_id, ui::AXTreeIDUnknown());
DCHECK_NE(action_data.target_tree_id, ui::AXTreeIDUnknown());
} else {
// `media_app_` is only used for testing.
CHECK_IS_TEST();
}
CHECK_NE(action_data.target_node_id, ui::kInvalidAXNodeID);
CHECK_EQ(pages_.size(), document_.GetRoot()->GetUnignoredChildCount() -
(has_landmark_node_ ? 1u : 0u) -
(has_postamble_page_ ? 1u : 0u));
DCHECK_NE(action_data.target_node_id, ui::kInvalidAXNodeID);
DCHECK_EQ(pages_.size(), document_.GetRoot()->GetUnignoredChildCount() -
(has_landmark_node_ ? 1u : 0u) -
(has_postamble_page_ ? 1u : 0u));
for (int32_t page_index = 0; const auto& page : pages_) {
const std::unique_ptr<ui::AXTreeManager>& page_manager = page.second;
if (page_manager->GetTreeID() != action_data.target_tree_id) {
Expand All @@ -293,7 +293,7 @@ void AXMediaAppUntrustedHandler::PerformAction(
if (!target_node) {
break;
}
CHECK(page_manager->ax_tree());
DCHECK(page_manager->ax_tree());
// Passing an empty `RectF` for the node bounds will initialize it
// automatically to `target_node->data().relative_bounds.bounds`.
gfx::RectF global_bounds =
Expand Down Expand Up @@ -464,7 +464,7 @@ content::WebContents* AXMediaAppUntrustedHandler::GetMediaAppWebContents()
}
content::WebContents* web_contents =
browser->tab_strip_model()->GetActiveWebContents();
CHECK(web_contents);
DCHECK(web_contents);
return web_contents;
}

Expand All @@ -482,7 +482,7 @@ AXMediaAppUntrustedHandler::GetMediaAppRenderFrameHost() const {
}

size_t AXMediaAppUntrustedHandler::ComputePagesPerBatch() const {
CHECK_LE(min_pages_per_batch_, kMaxPagesPerBatch);
DCHECK_LE(min_pages_per_batch_, kMaxPagesPerBatch);
size_t page_count = page_metadata_.size();
return std::clamp<size_t>(page_count * 0.1, min_pages_per_batch_,
kMaxPagesPerBatch);
Expand Down Expand Up @@ -620,7 +620,7 @@ std::vector<ui::AXNodeData> AXMediaAppUntrustedHandler::CreatePostamblePage()
void AXMediaAppUntrustedHandler::SendAXTreeToAccessibilityService(
const ui::AXTreeManager& manager,
TreeSerializer& serializer) {
CHECK(manager.GetRoot());
DCHECK(manager.GetRoot());
ui::AXTreeUpdate update;
serializer.MarkSubtreeDirty(manager.GetRoot()->id());
if (!serializer.SerializeChanges(manager.GetRoot(), &update)) {
Expand All @@ -636,7 +636,7 @@ void AXMediaAppUntrustedHandler::SendAXTreeToAccessibilityService(
}
#if defined(USE_AURA)
auto* event_router = extensions::AutomationEventRouter::GetInstance();
CHECK(event_router);
DCHECK(event_router);
const gfx::Point& mouse_location =
aura::Env::GetInstance()->last_mouse_location();
event_router->DispatchAccessibilityEvents(manager.GetTreeID(), {update},
Expand All @@ -651,7 +651,7 @@ void AXMediaAppUntrustedHandler::ViewportUpdated(const gfx::RectF& viewport_box,
if (!document_.GetRoot()) {
return;
}
CHECK(document_.ax_tree());
DCHECK(document_.ax_tree());
ui::AXNodeData document_root_data = document_.GetRoot()->data();
document_root_data.AddIntAttribute(
ax::mojom::IntAttribute::kScrollXMax,
Expand Down Expand Up @@ -683,9 +683,9 @@ void AXMediaAppUntrustedHandler::UpdatePageLocation(
if (HasRendererTerminatedDueToBadPageId("UpdatePageLocation", page_id)) {
return;
}
CHECK(pages_.contains(page_id));
DCHECK(pages_.contains(page_id));
ui::AXTree* tree = pages_.at(page_id)->ax_tree();
CHECK(tree->root());
DCHECK(tree->root());
ui::AXNodeData root_data = tree->root()->data();
root_data.relative_bounds.bounds = page_location;
ui::AXTreeUpdate location_update;
Expand Down Expand Up @@ -739,15 +739,15 @@ void AXMediaAppUntrustedHandler::UpdateDocumentTree() {
std::vector<ui::AXNodeData> status_nodes;
if (has_landmark_node_) {
status_nodes = CreateStatusNodesWithLandmark();
CHECK_GE(status_nodes.size(), 1u);
DCHECK_GE(status_nodes.size(), 1u);
child_ids.at(0) = status_nodes.at(0).id;
}
std::iota(std::begin(child_ids) + (has_landmark_node_ ? 1u : 0u),
std::end(child_ids), kStartPageAXNodeId);
std::vector<ui::AXNodeData> postamble_page_nodes;
if (has_postamble_page_) {
postamble_page_nodes = CreatePostamblePage();
CHECK_GE(postamble_page_nodes.size(), 1u);
DCHECK_GE(postamble_page_nodes.size(), 1u);
child_ids.push_back(postamble_page_nodes.at(0).id);
}
document_root_data.child_ids.swap(child_ids);
Expand Down Expand Up @@ -844,7 +844,7 @@ void AXMediaAppUntrustedHandler::StitchDocumentTree() {
}
ui::AXActionData action_data;
action_data.action = ax::mojom::Action::kStitchChildTree;
CHECK(document_.ax_tree());
DCHECK(document_.ax_tree());
action_data.target_tree_id = document_.GetParentTreeID();
action_data.target_role = ax::mojom::Role::kGraphicsDocument;
action_data.child_tree_id = document_.GetTreeID();
Expand Down Expand Up @@ -979,8 +979,8 @@ void AXMediaAppUntrustedHandler::OnPageOcred(
return;
}
}
CHECK_NE(pages_.at(dirty_page_id)->GetTreeID().type(),
ax::mojom::AXTreeIDType::kUnknown);
DCHECK_NE(pages_.at(dirty_page_id)->GetTreeID().type(),
ax::mojom::AXTreeIDType::kUnknown);

// Update the page location again - running the page through OCR overwrites
// the previous `AXTree` it was given and thus the page location it was
Expand Down

0 comments on commit 1130741

Please sign in to comment.