Bug 51124: Tabbing into text control now again scrolls it into view if offscreen, also adding additional bulletproofing per code review; r=jst@netscape.com

layout/forms/nsComboboxControlFrame.cpp

@@ -501,9 +501,10 @@ nsComboboxControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
+    }
   }
 }
 

layout/forms/nsFileControlFrame.cpp

@@ -225,9 +225,10 @@ nsFileControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }
 

layout/forms/nsFormControlFrame.cpp

@@ -638,9 +638,10 @@ nsFormControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }
 

layout/forms/nsHTMLButtonControlFrame.cpp

@@ -361,9 +361,11 @@ nsHTMLButtonControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+     presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
 
+    }
   }
 }
 

layout/forms/nsImageControlFrame.cpp

@@ -327,9 +327,10 @@ nsImageControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }
 

layout/forms/nsIsIndexFrame.cpp

@@ -276,9 +276,10 @@ nsIsIndexFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }
 

layout/forms/nsListControlFrame.cpp

@@ -2034,9 +2034,10 @@ nsListControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }
 

layout/html/forms/src/nsComboboxControlFrame.cpp

@@ -501,9 +501,10 @@ nsComboboxControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
+    }
   }
 }
 

layout/html/forms/src/nsFileControlFrame.cpp

@@ -225,9 +225,10 @@ nsFileControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }
 

layout/html/forms/src/nsFormControlFrame.cpp

@@ -638,9 +638,10 @@ nsFormControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }
 

layout/html/forms/src/nsGfxListControlFrame.cpp

@@ -2215,9 +2215,10 @@ nsGfxListControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }
 

layout/html/forms/src/nsGfxTextControlFrame2.cpp

@@ -2195,7 +2195,19 @@ nsGfxTextControlFrame2::GetSizeFromContent(PRInt32* aSize) const
 }
 
 void    nsGfxTextControlFrame2::SetFocus(PRBool aOn , PRBool aRepaint){}
-void    nsGfxTextControlFrame2::ScrollIntoView(nsIPresContext* aPresContext){}
+
+void    nsGfxTextControlFrame2::ScrollIntoView(nsIPresContext* aPresContext)
+{
+  if (aPresContext) {
+    nsCOMPtr<nsIPresShell> presShell;
+    aPresContext->GetShell(getter_AddRefs(presShell));
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
+                   NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
+    }
+  }
+}
+
 void    nsGfxTextControlFrame2::MouseClicked(nsIPresContext* aPresContext){}
 
 void    nsGfxTextControlFrame2::Reset(nsIPresContext* aPresContext)

layout/html/forms/src/nsHTMLButtonControlFrame.cpp

@@ -361,9 +361,11 @@ nsHTMLButtonControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+     presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
 
+    }
   }
 }
 

layout/html/forms/src/nsImageControlFrame.cpp

@@ -327,9 +327,10 @@ nsImageControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }
 

layout/html/forms/src/nsIsIndexFrame.cpp

@@ -276,9 +276,10 @@ nsIsIndexFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }
 

layout/html/forms/src/nsListControlFrame.cpp

@@ -2034,9 +2034,10 @@ nsListControlFrame::ScrollIntoView(nsIPresContext* aPresContext)
   if (aPresContext) {
     nsCOMPtr<nsIPresShell> presShell;
     aPresContext->GetShell(getter_AddRefs(presShell));
-    presShell->ScrollFrameIntoView(this,
+    if (presShell) {
+      presShell->ScrollFrameIntoView(this,
                    NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-
+    }
   }
 }