From 142d42a8332c1710b93fa3a79cf0485cbbf55c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= <ferjmoreno@gmail.com>
Date: Mon, 13 May 2019 11:06:49 +0200
Subject: [PATCH] Revert changes to load media styles as UA styles

Revert changes to set chrome url of user agent widget styles
---
 components/script/dom/htmlstyleelement.rs | 21 ++-------------------
 components/script/stylesheet_loader.rs    | 11 +----------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs
index cf64e316218..e483453252a 100644
--- a/components/script/dom/htmlstyleelement.rs
+++ b/components/script/dom/htmlstyleelement.rs
@@ -24,7 +24,6 @@ use dom_struct::dom_struct;
 use html5ever::{LocalName, Prefix};
 use net_traits::ReferrerPolicy;
 use servo_arc::Arc;
-use servo_url::ServoUrl;
 use std::cell::Cell;
 use style::media_queries::MediaList;
 use style::parser::ParserContext as CssParserContext;
@@ -112,26 +111,10 @@ impl HTMLStyleElement {
         let mq =
             Arc::new(shared_lock.wrap(MediaList::parse(&context, &mut CssParser::new(&mut input))));
         let loader = StylesheetLoader::for_element(self.upcast());
-        let (url, origin) = if let Some(shadow_root) = self
-            .upcast::<Node>()
-            .containing_shadow_root() {
-            if shadow_root.is_user_agent_widget() {
-                (
-                    ServoUrl::parse(&format!("chrome://{:?}", window.get_url().to_string()))
-                        .unwrap(),
-                    Origin::UserAgent,
-                )
-            } else {
-                (window.get_url(), Origin::Author)
-            }
-        } else {
-            (window.get_url(), Origin::Author)
-        };
-
         let sheet = Stylesheet::from_str(
             &data,
-            url,
-            origin,
+            window.get_url(),
+            Origin::Author,
             mq,
             shared_lock,
             Some(&loader),
diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs
index 35697fd981f..69975c7803b 100644
--- a/components/script/stylesheet_loader.rs
+++ b/components/script/stylesheet_loader.rs
@@ -141,16 +141,7 @@ impl FetchResponseListener for StylesheetContext {
             // TODO: Get the actual value. http://dev.w3.org/csswg/css-syntax/#environment-encoding
             let environment_encoding = UTF_8;
             let protocol_encoding_label = metadata.charset.as_ref().map(|s| &**s);
-            let final_url = if let Some(ref shadow_root) = self.shadow_root {
-                if shadow_root.root().is_user_agent_widget() {
-                    ServoUrl::parse(&format!("chrome://{:?}", metadata.final_url.to_string()))
-                        .unwrap()
-                } else {
-                    metadata.final_url
-                }
-            } else {
-                metadata.final_url
-            };
+            let final_url = metadata.final_url;
 
             let win = window_from_node(&*elem);