aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_thread.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-05-04 08:06:06 -0700
committerbors-servo <lbergstrom+bors@mozilla.com>2016-05-04 08:06:06 -0700
commit944a8dc25a590e9722753abc968cb8cb21745997 (patch)
treeb30c99329ebf79ac1402933d3deecbf29c64ed03 /components/script/script_thread.rs
parent7a439e62371189a986f3339b80b70e76642dc060 (diff)
parent6828b3e720c5787a0affd466d12d1c5bc5c1e4e0 (diff)
downloadservo-944a8dc25a590e9722753abc968cb8cb21745997.tar.gz
servo-944a8dc25a590e9722753abc968cb8cb21745997.zip
Auto merge of #10632 - szeged:bluetooth-ipc, r=jdm
WebBluetooth impementation Update the current WebBluetooth implementation. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10632) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r--components/script/script_thread.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 86f5a49ce6a..a46c1a28b18 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -64,6 +64,7 @@ use msg::constellation_msg::{PipelineId, PipelineNamespace};
use msg::constellation_msg::{SubpageId, WindowSizeData, WindowSizeType};
use msg::webdriver_msg::WebDriverScriptCommand;
use net_traits::LoadData as NetLoadData;
+use net_traits::bluetooth_thread::BluetoothMethodMsg;
use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheResult, ImageCacheThread};
use net_traits::storage_thread::StorageThread;
use net_traits::{AsyncResponseTarget, ControlMsg, LoadConsumer, LoadContext, Metadata, ResourceThread};
@@ -310,6 +311,8 @@ pub struct ScriptThread {
/// A handle to the resource thread. This is an `Arc` to avoid running out of file descriptors if
/// there are many iframes.
resource_thread: Arc<ResourceThread>,
+ /// A handle to the bluetooth thread.
+ bluetooth_thread: IpcSender<BluetoothMethodMsg>,
/// A handle to the storage thread.
storage_thread: StorageThread,
@@ -554,6 +557,7 @@ impl ScriptThread {
image_cache_port: image_cache_port,
resource_thread: Arc::new(state.resource_thread),
+ bluetooth_thread: state.bluetooth_thread,
storage_thread: state.storage_thread,
port: port,
@@ -1496,6 +1500,7 @@ impl ScriptThread {
self.compositor.borrow_mut().clone(),
self.image_cache_thread.clone(),
self.resource_thread.clone(),
+ self.bluetooth_thread.clone(),
self.storage_thread.clone(),
self.mem_profiler_chan.clone(),
self.devtools_chan.clone(),