{"body":"We can use the existing unscheduling logic in findNextUnitOfWork.","parents":["c80f390823266385df75fe52be397210e23c0301"],"commit":{"authoredAt":"2016-11-04T17:37:09-07:00","revision":"ef143244414edda081ef724480408bbb427e81fa","shortRevision":"ef14324441","authorName":"Andrew Clark","authorEmail":"acdlite@fb.com","subject":"Remove unscheduleWork"},"patch":"diff --git a\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js b\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\nindex 3b12adcd73..25526d3805 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\n@@ -101,6 +101,9 @@ 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@@ -116,8 +119,11 @@ module.exports = function(config : HostConfig) {\n }\n \n function findNextUnitOfWork() {\n- \/\/ Clear out roots with no more work on them.\n- while (nextScheduledRoot && nextScheduledRoot.current.pendingWorkPriority === NoWork) {\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 \/\/ Unschedule this root.\n nextScheduledRoot.isScheduled = false;\n \/\/ Read the next pointer now.\n@@ -539,7 +545,7 @@ module.exports = function(config : HostConfig) {\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- const rootsWithUncaughtErrors = new Set();\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@@ -567,7 +573,7 @@ module.exports = function(config : HostConfig) {\n \/\/ unusual if we end up here. Since we assume this function always\n \/\/ unschedules failed roots, our only resort is to completely\n \/\/ unschedule all roots. Otherwise we may get into an infinite loop\n- \/\/ trying to resume work and finding the failing but unknown root again. \n+ \/\/ trying to resume work and finding the failing but unknown root again.\n nextScheduledRoot = null;\n lastScheduledRoot = null;\n }\n@@ -607,14 +613,9 @@ module.exports = function(config : HostConfig) {\n }\n }\n \n- \/\/ Unschedule the roots that fataled so that we can later schedule\n- \/\/ other updates to the same roots and potentially replace them.\n- if (rootsWithUncaughtErrors.size) {\n- unscheduleWork(rootsWithUncaughtErrors);\n- }\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@@ -677,48 +678,6 @@ module.exports = function(config : HostConfig) {\n });\n }\n \n- function unscheduleWork(unscheduledRoots : Set) {\n- \/\/ New pointers for the new linked list\n- let newNextScheduledRoot = null;\n- let newLastScheduledRoot = null;\n-\n- \/\/ Search for the first first root that should remain scheduled\n- let root = nextScheduledRoot;\n- while (root) {\n- if (unscheduledRoots.has(root)) {\n- root.isScheduled = false;\n- \/\/ Read the next pointer now.\n- \/\/ We need to clear it in case this root gets scheduled again later.\n- const next = root.nextScheduledRoot;\n- root.nextScheduledRoot = null;\n- root = next;\n- } else {\n- newNextScheduledRoot = newNextScheduledRoot || root;\n- newLastScheduledRoot = root;\n- break;\n- }\n- }\n-\n- \/\/ Find the other roots that should remain scheduled\n- while (root) {\n- const next = root.nextScheduledRoot;\n- if (next && unscheduledRoots.has(next)) {\n- \/\/ Skip the next root.\n- next.isScheduled = false;\n- \/\/ Move forward.\n- root.nextScheduledRoot = next.nextScheduledRoot;\n- } else {\n- \/\/ Keep the root and move forward.\n- newLastScheduledRoot = root;\n- root = next;\n- }\n- }\n-\n- \/\/ We're done filtering\n- nextScheduledRoot = newNextScheduledRoot;\n- lastScheduledRoot = newLastScheduledRoot;\n- }\n-\n function scheduleWork(root : FiberRoot) {\n let priorityLevel = priorityContext;\n \n","files":[{"path":"src\/renderers\/shared\/fiber\/ReactFiberScheduler.js","status":"M"}]}

dillon1000/react

Files changed