More work on filtering

Author: mwcampbell

consumer/src/filters.rs

@@ -14,16 +14,25 @@ pub enum FilterResult {
     ExcludeSubtree,
 }
 
-fn filter_for_sibling_clip_check(node: &Node) -> FilterResult {
+fn common_filter_base(node: &Node) -> Option<FilterResult> {
     if node.is_focused() {
-        return FilterResult::Include;
+        return Some(FilterResult::Include);
     }
 
     if node.is_hidden() {
-        return FilterResult::ExcludeSubtree;
+        return Some(FilterResult::ExcludeSubtree);
     }
 
-    FilterResult::Include
+    let role = node.role();
+    if role == Role::GenericContainer || role == Role::TextRun {
+        return Some(FilterResult::ExcludeNode);
+    }
+
+    None
+}
+
+fn common_filter_without_parent_checks(node: &Node) -> FilterResult {
+    common_filter_base(node).unwrap_or(FilterResult::Include)
 }
 
 fn is_first_sibling_in_parent_bbox<'a>(
@@ -38,33 +47,26 @@ fn is_first_sibling_in_parent_bbox<'a>(
 }
 
 pub fn common_filter(node: &Node) -> FilterResult {
-    if node.is_focused() {
-        return FilterResult::Include;
-    }
-
-    if node.is_hidden() {
-        return FilterResult::ExcludeSubtree;
-    }
-
-    let role = node.role();
-    if role == Role::GenericContainer || role == Role::TextRun {
-        return FilterResult::ExcludeNode;
+    if let Some(result) = common_filter_base(node) {
+        return result;
     }
 
     if let Some(parent) = node.parent() {
         if common_filter(&parent) == FilterResult::ExcludeSubtree {
             return FilterResult::ExcludeSubtree;
         }
+    }
 
+    if let Some(parent) = node.filtered_parent(&common_filter_without_parent_checks) {
         if parent.clips_children() {
             if let Some(bbox) = node.bounding_box() {
                 if let Some(parent_bbox) = parent.bounding_box() {
                     if bbox.intersect(parent_bbox).is_empty()
                         && !(is_first_sibling_in_parent_bbox(
-                            node.following_filtered_siblings(&filter_for_sibling_clip_check),
+                            node.following_filtered_siblings(&common_filter_without_parent_checks),
                             parent_bbox,
                         ) || is_first_sibling_in_parent_bbox(
-                            node.preceding_filtered_siblings(&filter_for_sibling_clip_check),
+                            node.preceding_filtered_siblings(&common_filter_without_parent_checks),
                             parent_bbox,
                         ))
                     {