Implement performance interface extension for PerformanceResourceTiming

components/atoms/static_atoms.txt

@@ -74,6 +74,7 @@ rejectionhandled
 removetrack
 reset
 resize
+resourcetimingbufferfull
 right
 rtl
 sans-serif

components/constellation/constellation.rs

@@ -1659,20 +1659,48 @@ where
             EmbedderMsg::Panic(reason, backtrace),
         ));
 
+<<<<<<< HEAD
+        let browsing_context = self.browsing_contexts.get(&browsing_context_id);
+        let window_size = browsing_context.and_then(|ctx| ctx.size);
+        let pipeline_id = browsing_context.map(|ctx| ctx.pipeline_id);
+        let is_visible = browsing_context.map(|ctx| ctx.is_visible);
+||||||| merged common ancestors
+        let (window_size, pipeline_id, is_visible) = {
+            let browsing_context = self.browsing_contexts.get(&browsing_context_id);
+            let window_size = browsing_context.and_then(|ctx| ctx.size);
+            let pipeline_id = browsing_context.map(|ctx| ctx.pipeline_id);
+            let is_visible = browsing_context.map(|ctx| ctx.is_visible);
+            (window_size, pipeline_id, is_visible)
+        };
+=======
         let browsing_context = match self.browsing_contexts.get(&browsing_context_id) {
             Some(context) => context,
             None => return warn!("failed browsing context is missing"),
         };
         let window_size = browsing_context.size;
         let pipeline_id = browsing_context.pipeline_id;
         let is_visible = browsing_context.is_visible;
-
+>>>>>>> c2b212ad43b2899c410bde339d75cadd939d0ad6
+
+<<<<<<< HEAD
+        let pipeline = pipeline_id.and_then(|id| self.pipelines.get(&id));
+        let pipeline_url = pipeline.map(|pipeline| pipeline.url.clone());
+        let opener = pipeline.and_then(|pipeline| pipeline.opener);
+||||||| merged common ancestors
+        let (pipeline_url, opener) = {
+            let pipeline = pipeline_id.and_then(|id| self.pipelines.get(&id));
+            let pipeline_url = pipeline.map(|pipeline| pipeline.url.clone());
+            let opener = pipeline.and_then(|pipeline| pipeline.opener);
+            (pipeline_url, opener)
+        };
+=======
         let pipeline = match self.pipelines.get(&pipeline_id) {
             Some(p) => p,
             None => return warn!("failed pipeline is missing"),
         };
         let pipeline_url = pipeline.url.clone();
         let opener = pipeline.opener;
+>>>>>>> c2b212ad43b2899c410bde339d75cadd939d0ad6
 
         self.close_browsing_context_children(
             browsing_context_id,
@@ -1801,8 +1829,16 @@ where
             top_level_browsing_context_id,
             None,
             None,
+<<<<<<< HEAD
+            Some(window_size),
+            load_data,
+||||||| merged common ancestors
+            Some(window_size),
+            load_data.clone(),
+=======
             window_size,
             load_data,
+>>>>>>> c2b212ad43b2899c410bde339d75cadd939d0ad6
             sandbox,
             is_private,
             is_visible,

components/constellation/pipeline.rs

@@ -218,7 +218,17 @@ impl Pipeline {
                     load_data: state.load_data.clone(),
                     window_size: window_size,
                     pipeline_port: pipeline_port,
+<<<<<<< HEAD
                     content_process_shutdown_chan: Some(layout_content_process_shutdown_chan),
+                    layout_threads: PREFS.get("layout.threads").as_u64().expect("count") as usize,
+||||||| merged common ancestors
+                    content_process_shutdown_chan: Some(
+                        layout_content_process_shutdown_chan.clone(),
+                    ),
+                    layout_threads: PREFS.get("layout.threads").as_u64().expect("count") as usize,
+=======
+                    content_process_shutdown_chan: Some(layout_content_process_shutdown_chan),
+>>>>>>> c2b212ad43b2899c410bde339d75cadd939d0ad6
                 };
 
                 if let Err(e) =