Storage notifications routed via the constellation.

1 files changed, 18 insertions, 7 deletions

diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 7dfe41dac20..632397cc147 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -75,6 +75,7 @@ use msg::constellation_msg::{FrameId, FrameType, PipelineId, PipelineNamespace};
 use net_traits::{CoreResourceMsg, IpcSend, Metadata, ReferrerPolicy, ResourceThreads};
 use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheResult, ImageCacheThread};
 use net_traits::request::{CredentialsMode, Destination, RequestInit};
+use net_traits::storage_thread::StorageType;
 use network_listener::NetworkListener;
 use profile_traits::mem::{self, OpaqueSender, Report, ReportKind, ReportsChan};
 use profile_traits::time::{self, ProfilerCategory, profile};
@@ -90,7 +91,7 @@ use script_traits::CompositorEvent::{KeyEvent, MouseButtonEvent, MouseMoveEvent,
 use script_traits::CompositorEvent::{TouchEvent, TouchpadPressureEvent};
 use script_traits::webdriver_msg::WebDriverScriptCommand;
 use std::borrow::ToOwned;
-use std::cell::{Cell, Ref};
+use std::cell::Cell;
 use std::collections::{hash_map, HashMap, HashSet};
 use std::option::Option;
 use std::ptr;
@@ -605,12 +606,6 @@ impl ScriptThread {
         }))
     }
 
-    // TODO: This method is only needed for storage, and can be removed
-    // once storage event dispatch is moved to the constellation.
-    pub fn borrow_documents(&self) -> Ref<Documents> {
-        self.documents.borrow()
-    }
-
     /// Creates a new script thread.
     pub fn new(state: InitialScriptState,
                port: Receiver<MainThreadScriptMsg>,
@@ -981,6 +976,8 @@ impl ScriptThread {
             ConstellationControlMsg::DispatchFrameLoadEvent {
                 target: frame_id, parent: parent_id, child: child_id } =>
                 self.handle_frame_load_event(parent_id, frame_id, child_id),
+            ConstellationControlMsg::DispatchStorageEvent(pipeline_id, storage, url, key, old_value, new_value) =>
+                self.handle_storage_event(pipeline_id, storage, url, key, old_value, new_value),
             ConstellationControlMsg::FramedContentChanged(parent_pipeline_id, frame_id) =>
                 self.handle_framed_content_changed(parent_pipeline_id, frame_id),
             ConstellationControlMsg::ReportCSSError(pipeline_id, filename, line, column, msg) =>
@@ -1582,6 +1579,20 @@ impl ScriptThread {
         }
     }
 
+    /// Notify a window of a storage event
+    fn handle_storage_event(&self, pipeline_id: PipelineId, storage_type: StorageType, url: Url,
+                            key: Option<String>, old_value: Option<String>, new_value: Option<String>) {
+        let storage = match self.documents.borrow().find_window(pipeline_id) {
+            None => return warn!("Storage event sent to closed pipeline {}.", pipeline_id),
+            Some(window) => match storage_type {
+                StorageType::Local => window.LocalStorage(),
+                StorageType::Session => window.SessionStorage(),
+            },
+        };
+
+        storage.queue_storage_event(url, key, old_value, new_value);
+    }
+
     /// Notify the containing document of a child frame that has completed loading.
     fn handle_frame_load_event(&self, parent_id: PipelineId, frame_id: FrameId, child_id: PipelineId) {
         match self.documents.borrow().find_iframe(parent_id, frame_id) {