Bug 1184842. Remove layout.frames.force_resizability pref. r=mats

--HG--
extra : commitid : 7nC2lTgLu0Q
extra : rebase_source : f13e3e7009930be6a0cacc5a9badbd5ae80dc30e

layout/generic/nsFrameSetFrame.cpp

@@ -172,7 +172,6 @@ protected:
  * nsHTMLFramesetFrame
  ******************************************************************************/
 bool    nsHTMLFramesetFrame::gDragInProgress = false;
-#define kFrameResizePref "layout.frames.force_resizability"
 #define DEFAULT_BORDER_WIDTH_PX 6
 
 nsHTMLFramesetFrame::nsHTMLFramesetFrame(nsStyleContext* aContext)
@@ -198,7 +197,6 @@ nsHTMLFramesetFrame::nsHTMLFramesetFrame(nsStyleContext* aContext)
   mHorBorders          = nullptr;
   mChildFrameborder    = nullptr;
   mChildBorderColors   = nullptr;
-  mForceFrameResizability = false;
 }
 
 nsHTMLFramesetFrame::~nsHTMLFramesetFrame()
@@ -209,43 +207,12 @@ nsHTMLFramesetFrame::~nsHTMLFramesetFrame()
   delete[] mHorBorders;
   delete[] mChildFrameborder;
   delete[] mChildBorderColors;
-
-  Preferences::UnregisterCallback(FrameResizePrefCallback,
-                                  kFrameResizePref, this);
 }
 
 NS_QUERYFRAME_HEAD(nsHTMLFramesetFrame)
   NS_QUERYFRAME_ENTRY(nsHTMLFramesetFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame)
 
-// static
-void
-nsHTMLFramesetFrame::FrameResizePrefCallback(const char* aPref, void* aClosure)
-{
-  nsHTMLFramesetFrame *frame =
-    reinterpret_cast<nsHTMLFramesetFrame *>(aClosure);
-
-  nsIDocument* doc = frame->mContent->GetComposedDoc();
-  mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, true);
-  if (doc) {
-    nsNodeUtils::AttributeWillChange(frame->GetContent()->AsElement(),
-                                     kNameSpaceID_None,
-                                     nsGkAtoms::frameborder,
-                                     nsIDOMMutationEvent::MODIFICATION);
-  }
-
-  frame->mForceFrameResizability =
-    Preferences::GetBool(kFrameResizePref, frame->mForceFrameResizability);
-
-  frame->RecalculateBorderResize();
-  if (doc) {
-    nsNodeUtils::AttributeChanged(frame->GetContent()->AsElement(),
-                                  kNameSpaceID_None,
-                                  nsGkAtoms::frameborder,
-                                  nsIDOMMutationEvent::MODIFICATION);
-  }
-}
-
 void
 nsHTMLFramesetFrame::Init(nsIContent*       aContent,
                           nsContainerFrame* aParent,
@@ -583,13 +550,9 @@ void nsHTMLFramesetFrame::GenerateRowCol(nsPresContext*        aPresContext,
 int32_t nsHTMLFramesetFrame::GetBorderWidth(nsPresContext* aPresContext,
                                             bool aTakeForcingIntoAccount)
 {
-  bool forcing = mForceFrameResizability && aTakeForcingIntoAccount;
-
-  if (!forcing) {
-    nsFrameborder frameborder = GetFrameBorder();
-    if (frameborder == eFrameborder_No) {
-      return 0;
-    }
+  nsFrameborder frameborder = GetFrameBorder();
+  if (frameborder == eFrameborder_No) {
+    return 0;
   }
   nsGenericHTMLElement *content = nsGenericHTMLElement::FromContent(mContent);
 
@@ -604,15 +567,11 @@ int32_t nsHTMLFramesetFrame::GetBorderWidth(nsPresContext* aPresContext,
         }
       }
 
-      if (forcing && intVal == 0) {
-        intVal = DEFAULT_BORDER_WIDTH_PX;
-      }
       return nsPresContext::CSSPixelsToAppUnits(intVal);
     }
   }
 
-  if (mParentBorderWidth > 0 ||
-      (mParentBorderWidth == 0 && !forcing)) {
+  if (mParentBorderWidth >= 0) {
     return mParentBorderWidth;
   }
 
@@ -872,11 +831,6 @@ nsHTMLFramesetFrame::Reflow(nsPresContext*           aPresContext,
     ? aDesiredSize.Height() : aReflowState.AvailableHeight();
 
   bool firstTime = (GetStateBits() & NS_FRAME_FIRST_REFLOW) != 0;
-  if (firstTime) {
-    Preferences::RegisterCallback(FrameResizePrefCallback,
-                                  kFrameResizePref, this);
-    mForceFrameResizability = Preferences::GetBool(kFrameResizePref);
-  }
 
   // subtract out the width of all of the potential borders. There are
   // only borders between <frame>s. There are none on the edges (e.g the
@@ -1113,11 +1067,7 @@ nsHTMLFramesetFrame::Reflow(nsPresContext*           aPresContext,
     for (int verX = 0; verX < mNumCols-1; verX++) {
       if (mVerBorders[verX]) {
         mVerBorders[verX]->SetVisibility(verBordersVis[verX]);
-        if (mForceFrameResizability) {
-          mVerBorders[verX]->mVisibilityOverride = true;
-        } else {
-          SetBorderResize(mVerBorders[verX]);
-        }
+        SetBorderResize(mVerBorders[verX]);
         childColor = (NO_COLOR == verBorderColors[verX]) ? borderColor : verBorderColors[verX];
         mVerBorders[verX]->SetColor(childColor);
       }
@@ -1125,11 +1075,7 @@ nsHTMLFramesetFrame::Reflow(nsPresContext*           aPresContext,
     for (int horX = 0; horX < mNumRows-1; horX++) {
       if (mHorBorders[horX]) {
         mHorBorders[horX]->SetVisibility(horBordersVis[horX]);
-        if (mForceFrameResizability) {
-          mHorBorders[horX]->mVisibilityOverride = true;
-        } else {
-          SetBorderResize(mHorBorders[horX]);
-        }
+        SetBorderResize(mHorBorders[horX]);
         childColor = (NO_COLOR == horBorderColors[horX]) ? borderColor : horBorderColors[horX];
         mHorBorders[horX]->SetColor(childColor);
       }
@@ -1230,24 +1176,16 @@ nsHTMLFramesetFrame::RecalculateBorderResize()
   for (verX = 0; verX < mNumCols-1; verX++) {
     if (mVerBorders[verX]) {
       mVerBorders[verX]->mCanResize = true;
-      if (mForceFrameResizability) {
-        mVerBorders[verX]->mVisibilityOverride = true;
-      } else {
-        mVerBorders[verX]->mVisibilityOverride = false;
-        SetBorderResize(mVerBorders[verX]);
-      }
+      mVerBorders[verX]->mVisibilityOverride = false;
+      SetBorderResize(mVerBorders[verX]);
     }
   }
   int32_t horX;
   for (horX = 0; horX < mNumRows-1; horX++) {
     if (mHorBorders[horX]) {
       mHorBorders[horX]->mCanResize = true;
-      if (mForceFrameResizability) {
-        mHorBorders[horX]->mVisibilityOverride = true;
-      } else {
-        mHorBorders[horX]->mVisibilityOverride = false;
-        SetBorderResize(mHorBorders[horX]);
-      }
+      mHorBorders[horX]->mVisibilityOverride = false;
+      SetBorderResize(mHorBorders[horX]);
     }
   }
 }

layout/generic/nsFrameSetFrame.h

@@ -187,8 +187,6 @@ protected:
   
   void SetBorderResize(nsHTMLFramesetBorderFrame* aBorderFrame);
 
-  static void FrameResizePrefCallback(const char* aPref, void* aClosure);
-
   nsFramesetDrag   mDrag;
   nsBorderColor    mEdgeColors;
   nsHTMLFramesetBorderFrame* mDragger;
@@ -212,7 +210,6 @@ protected:
   int32_t          mNextNeighborOrigSize;
   int32_t          mMinDrag;
   int32_t          mChildCount;
-  bool             mForceFrameResizability;
 };
 
 #endif

modules/libpref/init/all.js

@@ -2182,9 +2182,6 @@ pref("layout.word_select.stop_at_punctuation", true);
 // Windows default is 1 for word delete behavior, the rest as for 2.
 pref("layout.selection.caret_style", 0);
 
-// pref to force frames to be resizable
-pref("layout.frames.force_resizability", false);
-
 // pref to report CSS errors to the error console
 pref("layout.css.report_errors", true);