Find first input field also in frame elements

Author: antoyo

src/main.rs

@@ -50,8 +50,6 @@
  *
  * TODO: might find this useful for for filler: https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebPage.html#WebKitWebPage-form-controls-associated
  *
- * TODO: find first input also in frames.
- *
  * FIXME: submit not working in bnc.ca login form.
  *
  * FIXME: cannot follow the clone button on GitHub anymore.

titanium-web-extension/src/dom.rs

@@ -43,6 +43,10 @@ use webkit2gtk_webextension::{
     DOMHTMLElement,
     DOMHTMLFieldSetElement,
     DOMHTMLFieldSetElementExtManual,
+    DOMHTMLFrameElement,
+    DOMHTMLFrameElementExt,
+    DOMHTMLIFrameElement,
+    DOMHTMLIFrameElementExt,
     DOMHTMLInputElement,
     DOMHTMLInputElementExt,
     DOMHTMLSelectElement,
@@ -144,6 +148,40 @@ pub fn get_document(page: &WebPage) -> Option<DOMElement> {
     )
 }
 
+pub fn get_elements_by_tag_name_in_all_frames(document: &DOMDocument, tag_name: &str) -> Vec<(DOMDocument, DOMElement)> {
+    let mut elements = vec![];
+    let iter = NodeIter::new(document.get_elements_by_tag_name(tag_name));
+    for element in iter {
+        elements.push((document.clone(), element));
+    }
+
+    let iter = NodeIter::new(document.get_elements_by_tag_name("frame"));
+    for frame in iter {
+        if let Ok(frame) = frame.downcast::<DOMHTMLFrameElement>() {
+            if let Some(document) = frame.get_content_document() {
+                let iter = NodeIter::new(document.get_elements_by_tag_name(tag_name));
+                for element in iter {
+                    elements.push((document.clone(), element));
+                }
+            }
+        }
+    }
+
+    let iter = NodeIter::new(document.get_elements_by_tag_name("iframe"));
+    for frame in iter {
+        if let Ok(frame) = frame.downcast::<DOMHTMLIFrameElement>() {
+            if let Some(document) = frame.get_content_document() {
+                let iter = NodeIter::new(document.get_elements_by_tag_name(tag_name));
+                for element in iter {
+                    elements.push((document.clone(), element));
+                }
+            }
+        }
+    }
+
+    elements
+}
+
 /// Get the body if it exists or the html element.
 pub fn get_hints_container(page: &WebPage) -> Option<DOMNode> {
     let document = page.get_dom_document()?;
@@ -260,7 +298,7 @@ pub fn is_hidden(document: &DOMDocument, element: &DOMElement) -> bool {
         {
             return true;
         }
-        element = el.get_offset_parent();
+        element = el.get_parent_element();
     }
     true
 }

titanium-web-extension/src/executor/mod.rs

@@ -73,6 +73,7 @@ use titanium_common::InnerMessage::*;
 use dom::{
     NodeIter,
     get_body,
+    get_elements_by_tag_name_in_all_frames,
     get_hints_container,
     get_href,
     get_position,
@@ -340,8 +341,8 @@ impl Executor {
             let mut element_to_focus = None;
             let mut element_y_pos = f32::INFINITY;
             for tag_name in &tag_names {
-                let iter = NodeIter::new(document.get_elements_by_tag_name(tag_name));
-                for element in iter {
+                let iter = get_elements_by_tag_name_in_all_frames(&document, tag_name);
+                for (document, element) in iter {
                     let tabindex = element.get_attribute("tabindex");
                     if !is_hidden(&document, &element) && is_enabled(&element) && is_text_input(&element)
                         && tabindex != Some("-1".to_string())