From be67bb87d40d196b58386a637144eb5b2bdb5ca9 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Fri, 25 Aug 2017 11:40:17 -0700
Subject: [PATCH] Revert rayon stack limits until we sort out the crashtest
 bustage.

---
 components/style/context.rs                 | 4 ++--
 components/style/gecko/global_style_data.rs | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/components/style/context.rs b/components/style/context.rs
index 4217cecd523..4e166929b9d 100644
--- a/components/style/context.rs
+++ b/components/style/context.rs
@@ -644,8 +644,8 @@ impl StackLimitChecker {
         //
         // The correctness of depends on the assumption that no stack wraps
         // around the end of the address space.
-        debug_assert!(curr_sp - self.lower_limit
-                      <= STYLE_THREAD_STACK_SIZE_KB * 1024);
+        //debug_assert!(curr_sp - self.lower_limit
+        //              <= STYLE_THREAD_STACK_SIZE_KB * 1024);
 
         // The actual bounds check.
         curr_sp <= self.lower_limit
diff --git a/components/style/gecko/global_style_data.rs b/components/style/gecko/global_style_data.rs
index 8ba55191c03..61c763609e7 100644
--- a/components/style/gecko/global_style_data.rs
+++ b/components/style/gecko/global_style_data.rs
@@ -9,7 +9,6 @@ use gecko_bindings::bindings;
 use gecko_bindings::bindings::{Gecko_RegisterProfilerThread, Gecko_UnregisterProfilerThread};
 use gecko_bindings::bindings::Gecko_SetJemallocThreadLocalArena;
 use num_cpus;
-use parallel::STYLE_THREAD_STACK_SIZE_KB;
 use rayon;
 use shared_lock::SharedRwLock;
 use std::cmp;
@@ -93,9 +92,9 @@ lazy_static! {
                 .breadth_first()
                 .thread_name(thread_name)
                 .start_handler(thread_startup)
-                .exit_handler(thread_shutdown)
+                .exit_handler(thread_shutdown);
                 // Set thread stack size to 128KB.  See Gecko bug 1376883.
-                .stack_size(STYLE_THREAD_STACK_SIZE_KB * 1024);
+                //.stack_size(STYLE_THREAD_STACK_SIZE_KB * 1024);
             let pool = rayon::ThreadPool::new(configuration).ok();
             pool
         };