{"patch":"diff --git a\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js b\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\nindex 25526d3805..e3cb91cdeb 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\n@@ -101,9 +101,6 @@ module.exports = function(config : HostConfig) {\n let activeErrorBoundaries : Set | null = null;\n let nextTrappedErrors : Array | null = null;\n \n- \/\/ Roots that have uncaught errors and should not be worked on\n- let rootsWithUncaughtErrors : Set | null = null;\n-\n function scheduleAnimationCallback(callback) {\n if (!isAnimationCallbackScheduled) {\n isAnimationCallbackScheduled = true;\n@@ -120,10 +117,7 @@ module.exports = function(config : HostConfig) {\n \n function findNextUnitOfWork() {\n \/\/ Clear out roots with no more work on them, or if they have uncaught errors\n- while (nextScheduledRoot && (\n- nextScheduledRoot.current.pendingWorkPriority === NoWork ||\n- (rootsWithUncaughtErrors && rootsWithUncaughtErrors.has(nextScheduledRoot))\n- )) {\n+ while (nextScheduledRoot && nextScheduledRoot.current.pendingWorkPriority === NoWork) {\n \/\/ Unschedule this root.\n nextScheduledRoot.isScheduled = false;\n \/\/ Read the next pointer now.\n@@ -544,8 +538,6 @@ module.exports = function(config : HostConfig) {\n activeErrorBoundaries = new Set();\n \/\/ If we find unhandled errors, we'll only remember the first one.\n let firstUncaughtError = null;\n- \/\/ Keep track of which roots have fataled and need to be unscheduled.\n- rootsWithUncaughtErrors = new Set();\n \n \/\/ All work created by error boundaries should have Task priority\n \/\/ so that it finishes before this function exits.\n@@ -563,11 +555,11 @@ module.exports = function(config : HostConfig) {\n const root = trappedError.root;\n if (!boundary) {\n firstUncaughtError = firstUncaughtError || error;\n- if (root) {\n- \/\/ Remember to unschedule this particular root since it fataled\n- \/\/ and we can't do more work on it. This lets us continue working on\n- \/\/ other roots even if one of them fails before rethrowing the error.\n- rootsWithUncaughtErrors.add(root);\n+ if (root && root.current) {\n+ \/\/ Unschedule this particular root since it fataled and we can't do\n+ \/\/ more work on it. This lets us continue working on other roots\n+ \/\/ even if one of them fails before rethrowing the error.\n+ root.current.pendingWorkPriority = NoWork;\n } else {\n \/\/ Normally we should know which root caused the error, so it is\n \/\/ unusual if we end up here. Since we assume this function always\n@@ -615,7 +607,6 @@ module.exports = function(config : HostConfig) {\n \n nextTrappedErrors = null;\n activeErrorBoundaries = null;\n- rootsWithUncaughtErrors = null;\n priorityContext = previousPriorityContext;\n \n \/\/ Return the error so we can rethrow after handling other roots.\n","parents":["c0c245564361b0a4d2f7b6500b07e611aa986957"],"commit":{"shortRevision":"c1cca0c7d8","authorName":"Andrew Clark","authoredAt":"2016-11-04T17:58:57-07:00","subject":"Don't need to keep track of rootsWithUncaughtErrors","revision":"c1cca0c7d8e0cad2e4dfb88cdd3a095b8acc1c51","authorEmail":"acdlite@fb.com"},"files":[{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberScheduler.js"}],"body":"Just give it NoWork priority and findNextUnitOfWork will handle the rest"}

dillon1000/react

Files changed