aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/stylesheet_loader.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-04-13 11:29:58 -0500
committerGitHub <noreply@github.com>2017-04-13 11:29:58 -0500
commitebc61bb2c3ac682ca366019b21160819ec3c7882 (patch)
treebab11afecb3b5d7a6317eb17f5fcfe8c008f5118 /components/script/stylesheet_loader.rs
parentea20bd6f6362191875bba7bce376c9d805588cbe (diff)
parent3c3311b16a0a1f0c84d02ff10283fb0800529184 (diff)
downloadservo-ebc61bb2c3ac682ca366019b21160819ec3c7882.tar.gz
servo-ebc61bb2c3ac682ca366019b21160819ec3c7882.zip
Auto merge of #16407 - jdm:style_panic, r=emilio
Allow loading multiple stylesheets for the same link element. - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #16399 - [x] There are tests for these changes <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16407) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/stylesheet_loader.rs')
-rw-r--r--components/script/stylesheet_loader.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs
index ec13395a531..a859e798818 100644
--- a/components/script/stylesheet_loader.rs
+++ b/components/script/stylesheet_loader.rs
@@ -22,7 +22,6 @@ use ipc_channel::router::ROUTER;
use net_traits::{FetchResponseListener, FetchMetadata, FilteredMetadata, Metadata, NetworkError, ReferrerPolicy};
use net_traits::request::{CorsSettings, CredentialsMode, Destination, RequestInit, RequestMode, Type as RequestType};
use network_listener::{NetworkListener, PreInvoke};
-use script_layout_interface::message::Msg;
use servo_url::ServoUrl;
use std::mem;
use std::sync::{Arc, Mutex};
@@ -151,9 +150,7 @@ impl FetchResponseListener for StylesheetContext {
sheet.set_disabled(true);
}
- link.set_stylesheet(sheet.clone());
-
- win.layout_chan().send(Msg::AddStylesheet(sheet)).unwrap();
+ link.set_stylesheet(sheet);
}
}
StylesheetContextSource::Import(ref stylesheet) => {