Support focus management and keyboard events for iframes.

3 files changed, 54 insertions, 33 deletions

diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 3fc82215167..aa360edd3a3 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -64,7 +64,7 @@ use dom::window::{Window, WindowHelpers, ReflowReason};
 use layout_interface::{HitTestResponse, MouseOverResponse};
 use msg::compositor_msg::ScriptListener;
 use msg::constellation_msg::Msg as ConstellationMsg;
-use msg::constellation_msg::{ConstellationChan, Key, KeyState, KeyModifiers, MozBrowserEvent};
+use msg::constellation_msg::{ConstellationChan, FocusType, Key, KeyState, KeyModifiers, MozBrowserEvent};
 use msg::constellation_msg::{SUPER, ALT, SHIFT, CONTROL};
 use net_traits::CookieSource::NonHTTP;
 use net_traits::ControlMsg::{SetCookiesForUrl, GetCookiesForUrl};
@@ -216,7 +216,7 @@ pub trait DocumentHelpers<'a> {
     fn is_scripting_enabled(self) -> bool;
     fn begin_focus_transaction(self);
     fn request_focus(self, elem: JSRef<Element>);
-    fn commit_focus_transaction(self);
+    fn commit_focus_transaction(self, focus_type: FocusType);
     fn title_changed(self);
     fn send_title_to_compositor(self);
     fn dirty_all_nodes(self);
@@ -460,7 +460,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
 
     /// Reassign the focus context to the element that last requested focus during this
     /// transaction, or none if no elements requested it.
-    fn commit_focus_transaction(self) {
+    fn commit_focus_transaction(self, focus_type: FocusType) {
         //TODO: dispatch blur, focus, focusout, and focusin events
 
         if let Some(ref elem) = self.focused.get().root() {
@@ -473,9 +473,16 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
         if let Some(ref elem) = self.focused.get().root() {
             let node: JSRef<Node> = NodeCast::from_ref(elem.r());
             node.set_focus_state(true);
+
+            // Update the focus state for all elements in the focus chain.
+            // https://html.spec.whatwg.org/multipage/#focus-chain
+            if focus_type == FocusType::Element {
+                let window = self.window.root();
+                let ConstellationChan(ref chan) = window.r().constellation_chan();
+                let event = ConstellationMsg::FocusMsg(window.r().pipeline());
+                chan.send(event).unwrap();
+            }
         }
-        // TODO: Update the focus state for all elements in the focus chain.
-        // https://html.spec.whatwg.org/multipage/#focus-chain
     }
 
     /// Handles any updates when the document's title has changed.
@@ -555,7 +562,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
         // https://html.spec.whatwg.org/multipage/#run-authentic-click-activation-steps
         el.r().authentic_click_activation(event);
 
-        self.commit_focus_transaction();
+        self.commit_focus_transaction(FocusType::Element);
         window.r().reflow(ReflowGoal::ForDisplay, ReflowQueryType::NoQuery, ReflowReason::MouseEvent);
     }
 
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
index 84f1d698cdf..68c097158dc 100644
--- a/components/script/dom/htmlelement.rs
+++ b/components/script/dom/htmlelement.rs
@@ -28,6 +28,7 @@ use dom::node::{Node, NodeHelpers, NodeTypeId, document_from_node, window_from_n
 use dom::virtualmethods::VirtualMethods;
 use dom::window::WindowHelpers;
 
+use msg::constellation_msg::FocusType;
 use util::str::DOMString;
 
 use string_cache::Atom;
@@ -145,7 +146,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> {
         let document = document.r();
         document.begin_focus_transaction();
         document.request_focus(element);
-        document.commit_focus_transaction();
+        document.commit_focus_transaction(FocusType::Element);
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-blur
@@ -159,7 +160,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> {
         let document = document_from_node(self).root();
         document.r().begin_focus_transaction();
         // If `request_focus` is not called, focus will be set to None.
-        document.r().commit_focus_transaction();
+        document.r().commit_focus_transaction(FocusType::Element);
     }
 }
 
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 4956e810d0f..c9c51eaeb9b 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -24,7 +24,7 @@ use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, Documen
 use dom::bindings::codegen::InheritTypes::{ElementCast, EventTargetCast, HTMLIFrameElementCast, NodeCast, EventCast};
 use dom::bindings::conversions::FromJSValConvertible;
 use dom::bindings::conversions::StringificationBehavior;
-use dom::bindings::js::{JS, JSRef, OptionalRootable, RootedReference};
+use dom::bindings::js::{JS, JSRef, Temporary, OptionalRootable, RootedReference};
 use dom::bindings::js::{RootCollection, RootCollectionPtr};
 use dom::bindings::refcounted::{LiveDOMReferences, Trusted, TrustedReference};
 use dom::bindings::structuredclone::StructuredCloneData;
@@ -33,7 +33,7 @@ use dom::bindings::utils::{wrap_for_same_compartment, pre_wrap};
 use dom::document::{Document, IsHTMLDocument, DocumentHelpers, DocumentProgressHandler, DocumentProgressTask, DocumentSource};
 use dom::element::{Element, AttributeHandlers};
 use dom::event::{Event, EventHelpers, EventBubbles, EventCancelable};
-use dom::htmliframeelement::HTMLIFrameElementHelpers;
+use dom::htmliframeelement::{HTMLIFrameElement, HTMLIFrameElementHelpers};
 use dom::uievent::UIEvent;
 use dom::eventtarget::EventTarget;
 use dom::node::{self, Node, NodeHelpers, NodeDamage, window_from_node};
@@ -58,7 +58,7 @@ use script_traits::{ConstellationControlMsg, ScriptControlChan};
 use script_traits::ScriptTaskFactory;
 use msg::compositor_msg::ReadyState::{FinishedLoading, Loading, PerformingLayout};
 use msg::compositor_msg::{LayerId, ScriptListener};
-use msg::constellation_msg::{ConstellationChan};
+use msg::constellation_msg::{ConstellationChan, FocusType};
 use msg::constellation_msg::{LoadData, PipelineId, SubpageId, MozBrowserEvent, WorkerId};
 use msg::constellation_msg::{Failure, WindowSizeData, PipelineExitType};
 use msg::constellation_msg::Msg as ConstellationMsg;
@@ -694,6 +694,8 @@ impl ScriptTask {
                                                      old_subpage_id,
                                                      new_subpage_id) =>
                 self.handle_update_subpage_id(containing_pipeline_id, old_subpage_id, new_subpage_id),
+            ConstellationControlMsg::FocusIFrameMsg(containing_pipeline_id, subpage_id) =>
+                self.handle_focus_iframe_msg(containing_pipeline_id, subpage_id),
         }
     }
 
@@ -841,6 +843,23 @@ impl ScriptTask {
         window.r().thaw();
     }
 
+    fn handle_focus_iframe_msg(&self,
+                               parent_pipeline_id: PipelineId,
+                               subpage_id: SubpageId) {
+        let borrowed_page = self.root_page();
+        let page = borrowed_page.find(parent_pipeline_id).unwrap();
+
+        let doc = page.document().root();
+        let frame_element = self.find_iframe(doc.r(), subpage_id).root();
+
+        if let Some(frame_element) = frame_element {
+            let element: JSRef<Element> = ElementCast::from_ref(frame_element.r());
+            doc.r().begin_focus_transaction();
+            doc.r().request_focus(element);
+            doc.r().commit_focus_transaction(FocusType::Parent);
+        }
+    }
+
     /// Handles a mozbrowser event, for example see:
     /// https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowserloadstart
     fn handle_mozbrowser_event_msg(&self,
@@ -851,11 +870,7 @@ impl ScriptTask {
 
         let frame_element = borrowed_page.find(parent_pipeline_id).and_then(|page| {
             let doc = page.document().root();
-            let doc: JSRef<Node> = NodeCast::from_ref(doc.r());
-
-            doc.traverse_preorder()
-               .filter_map(HTMLIFrameElementCast::to_temporary)
-               .find(|node| node.root().r().subpage_id() == Some(subpage_id))
+            self.find_iframe(doc.r(), subpage_id)
         }).root();
 
         if let Some(frame_element) = frame_element {
@@ -871,11 +886,7 @@ impl ScriptTask {
 
         let frame_element = borrowed_page.find(containing_pipeline_id).and_then(|page| {
             let doc = page.document().root();
-            let doc: JSRef<Node> = NodeCast::from_ref(doc.r());
-
-            doc.traverse_preorder()
-               .filter_map(HTMLIFrameElementCast::to_temporary)
-               .find(|node| node.root().r().subpage_id() == Some(old_subpage_id))
+            self.find_iframe(doc.r(), old_subpage_id)
         }).root();
 
         frame_element.unwrap().r().update_subpage_id(new_subpage_id);
@@ -990,12 +1001,7 @@ impl ScriptTask {
             borrowed_page.as_ref().and_then(|borrowed_page| {
                 borrowed_page.find(parent_id).and_then(|page| {
                     let doc = page.document().root();
-                    let doc: JSRef<Node> = NodeCast::from_ref(doc.r());
-
-                    doc.traverse_preorder()
-                       .filter_map(HTMLIFrameElementCast::to_temporary)
-                       .find(|node| node.root().r().subpage_id() == Some(subpage_id))
-                       .map(ElementCast::from_temporary)
+                    self.find_iframe(doc.r(), subpage_id)
                 })
             })
         }).root();
@@ -1094,7 +1100,8 @@ impl ScriptTask {
                                      last_modified,
                                      DocumentSource::FromParser).root();
 
-        window.r().init_browser_context(document.r(), frame_element.r());
+        let frame_element = frame_element.r().map(|elem| ElementCast::from_ref(elem));
+        window.r().init_browser_context(document.r(), frame_element);
 
         // Create the root frame
         page.set_frame(Some(Frame {
@@ -1186,6 +1193,16 @@ impl ScriptTask {
         window.r().reflow(ReflowGoal::ForDisplay, ReflowQueryType::NoQuery, reason);
     }
 
+    /// Find an iframe element in a provided document.
+    fn find_iframe(&self, doc: JSRef<Document>, subpage_id: SubpageId)
+                   -> Option<Temporary<HTMLIFrameElement>> {
+        let doc: JSRef<Node> = NodeCast::from_ref(doc);
+
+        doc.traverse_preorder()
+            .filter_map(HTMLIFrameElementCast::to_temporary)
+            .find(|node| node.root().r().subpage_id() == Some(subpage_id))
+    }
+
     /// This is the main entry point for receiving and dispatching DOM events.
     ///
     /// TODO: Actually perform DOM event dispatch.
@@ -1272,11 +1289,7 @@ impl ScriptTask {
                 let borrowed_page = self.root_page();
                 let iframe = borrowed_page.find(pipeline_id).and_then(|page| {
                     let doc = page.document().root();
-                    let doc: JSRef<Node> = NodeCast::from_ref(doc.r());
-
-                    doc.traverse_preorder()
-                       .filter_map(HTMLIFrameElementCast::to_temporary)
-                       .find(|node| node.root().r().subpage_id() == Some(subpage_id))
+                    self.find_iframe(doc.r(), subpage_id)
                 }).root();
                 if let Some(iframe) = iframe.r() {
                     iframe.navigate_child_browsing_context(load_data.url);