--- a/layout/generic/nsFrameSelection.cpp
+++ b/layout/generic/nsFrameSelection.cpp
@@ -1425,36 +1425,41 @@ nsresult nsFrameSelection::TakeFocus(nsI
 
       NS_ENSURE_STATE(mPresShell);
       bool editableCell = false;
       mTableSelection.mClosestInclusiveTableCellAncestor = nullptr;
       RefPtr<nsPresContext> context = mPresShell->GetPresContext();
       if (context) {
         RefPtr<HTMLEditor> htmlEditor = nsContentUtils::GetHTMLEditor(context);
         if (htmlEditor) {
-          nsINode* cellparent = GetClosestInclusiveTableCellAncestor(aNewFocus);
+          nsINode* inclusiveTableCellAncestor =
+              GetClosestInclusiveTableCellAncestor(aNewFocus);
           nsCOMPtr<nsINode> editorHostNode = htmlEditor->GetActiveEditingHost();
-          editableCell = cellparent && editorHostNode &&
-                         cellparent->IsInclusiveDescendantOf(editorHostNode);
+          editableCell = inclusiveTableCellAncestor && editorHostNode &&
+                         inclusiveTableCellAncestor->IsInclusiveDescendantOf(
+                             editorHostNode);
           if (editableCell) {
-            mTableSelection.mClosestInclusiveTableCellAncestor = cellparent;
+            mTableSelection.mClosestInclusiveTableCellAncestor =
+                inclusiveTableCellAncestor;
 #ifdef DEBUG_TABLE_SELECTION
             printf(" * TakeFocus - Collapsing into new cell\n");
 #endif
           }
         }
       }
       break;
     }
     case FocusMode::kExtendSelection: {
       // Now update the range list:
       int32_t offset;
-      nsINode* cellparent = GetClosestInclusiveTableCellAncestor(aNewFocus);
-      if (mTableSelection.mClosestInclusiveTableCellAncestor && cellparent &&
-          cellparent !=
+      nsINode* inclusiveTableCellAncestor =
+          GetClosestInclusiveTableCellAncestor(aNewFocus);
+      if (mTableSelection.mClosestInclusiveTableCellAncestor &&
+          inclusiveTableCellAncestor &&
+          inclusiveTableCellAncestor !=
               mTableSelection
                   .mClosestInclusiveTableCellAncestor)  // switch to cell
                                                         // selection mode
       {
 #ifdef DEBUG_TABLE_SELECTION
         printf(" * TakeFocus - moving into new cell\n");
 #endif
         WidgetMouseEvent event(false, eVoidEvent, nullptr,
@@ -1467,23 +1472,24 @@ nsresult nsFrameSelection::TakeFocus(nsI
           const nsresult result = HandleTableSelection(
               parent, offset, TableSelectionMode::Cell, &event);
           if (NS_WARN_IF(NS_FAILED(result))) {
             return result;
           }
         }
 
         // Find the parent of this new cell and extend selection to it
-        parent = ParentOffset(cellparent, &offset);
+        parent = ParentOffset(inclusiveTableCellAncestor, &offset);
 
         // XXXX We need to REALLY get the current key shift state
         //  (we'd need to add event listener -- let's not bother for now)
         event.mModifiers &= ~MODIFIER_SHIFT;  // aContinueSelection;
         if (parent) {
-          mTableSelection.mClosestInclusiveTableCellAncestor = cellparent;
+          mTableSelection.mClosestInclusiveTableCellAncestor =
+              inclusiveTableCellAncestor;
           // Continue selection into next cell
           const nsresult result = HandleTableSelection(
               parent, offset, TableSelectionMode::Cell, &event);
           if (NS_WARN_IF(NS_FAILED(result))) {
             return result;
           }
         }
       } else {