Bug 550882 followup. Remove the hack, since it's not useful anymore.
authorBoris Zbarsky <bzbarsky@mit.edu>
Tue, 06 Apr 2010 16:01:34 -0400
changeset 40502 23e09c2ded59b24e4c7c9a3cdfa211413220c7ef
parent 40501 7788846fd5d562375e259f0d6e59c5b5aa81ee1e
child 40503 260d768e55f4d471f0abbc00bca5968f590f1a31
push idunknown
push userunknown
push dateunknown
bugs550882
milestone1.9.3a4pre
Bug 550882 followup. Remove the hack, since it's not useful anymore.
layout/generic/nsGfxScrollFrame.cpp
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2204,21 +2204,18 @@ nsGfxScrollFrameInner::CreateAnonymousCo
 
   // If we're the scrollframe for the root, then we want to construct
   // our scrollbar frames no matter what.  That way later dynamic
   // changes to propagated overflow styles will show or hide
   // scrollbars on the viewport without requiring frame reconstruction
   // of the viewport (good!).
   PRBool canHaveHorizontal;
   PRBool canHaveVertical;
-  // Hack to try to avoid Tsspider regression: always call
-  // GetScrollbarStyles here, even if we plan to ignore the return
-  // value.
-  ScrollbarStyles styles = scrollable->GetScrollbarStyles();
   if (!mIsRoot) {
+    ScrollbarStyles styles = scrollable->GetScrollbarStyles();
     canHaveHorizontal = styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN;
     canHaveVertical = styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN;
     if (!canHaveHorizontal && !canHaveVertical && !isResizable) {
       // Nothing to do.
       return NS_OK;
     }
   } else {
     canHaveHorizontal = PR_TRUE;