Backed out changeset 8c1f9996a7d6 (bug 906116)

dom/html/HTMLFrameSetElement.cpp

@@ -83,9 +83,9 @@ HTMLFrameSetElement::SetAttr(int32_t aNameSpaceID,
   if (aAttribute == nsGkAtoms::rows && aNameSpaceID == kNameSpaceID_None) {
     int32_t oldRows = mNumRows;
     ParseRowCol(aValue, mNumRows, &mRowSpecs);
-
+    
     if (mNumRows != oldRows) {
-      mCurrentRowColHint = nsChangeHint_ReconstructFrame;
+      mCurrentRowColHint = NS_STYLE_HINT_FRAMECHANGE;
     }
   } else if (aAttribute == nsGkAtoms::cols &&
              aNameSpaceID == kNameSpaceID_None) {
@@ -93,14 +93,14 @@ HTMLFrameSetElement::SetAttr(int32_t aNameSpaceID,
     ParseRowCol(aValue, mNumCols, &mColSpecs);
 
     if (mNumCols != oldCols) {
-      mCurrentRowColHint = nsChangeHint_ReconstructFrame;
+      mCurrentRowColHint = NS_STYLE_HINT_FRAMECHANGE;
     }
   }
-
+  
   rv = nsGenericHTMLElement::SetAttr(aNameSpaceID, aAttribute, aPrefix,
                                      aValue, aNotify);
   mCurrentRowColHint = NS_STYLE_HINT_REFLOW;
-
+  
   return rv;
 }
 

dom/html/HTMLImageElement.cpp

@@ -343,11 +343,11 @@ HTMLImageElement::GetAttributeChangeHint(const nsIAtom* aAttribute,
     nsGenericHTMLElement::GetAttributeChangeHint(aAttribute, aModType);
   if (aAttribute == nsGkAtoms::usemap ||
       aAttribute == nsGkAtoms::ismap) {
-    retval |= nsChangeHint_ReconstructFrame;
+    retval |= NS_STYLE_HINT_FRAMECHANGE;
   } else if (aAttribute == nsGkAtoms::alt) {
     if (aModType == nsIDOMMutationEvent::ADDITION ||
         aModType == nsIDOMMutationEvent::REMOVAL) {
-      retval |= nsChangeHint_ReconstructFrame;
+      retval |= NS_STYLE_HINT_FRAMECHANGE;
     }
   }
   return retval;

dom/html/HTMLInputElement.cpp

@@ -5682,20 +5682,20 @@ HTMLInputElement::GetAttributeChangeHint(const nsIAtom* aAttribute,
       // buttons we show for type=file.
       aAttribute == nsGkAtoms::directory ||
       aAttribute == nsGkAtoms::webkitdirectory) {
-    retval |= nsChangeHint_ReconstructFrame;
+    retval |= NS_STYLE_HINT_FRAMECHANGE;
   } else if (mType == NS_FORM_INPUT_IMAGE &&
              (aAttribute == nsGkAtoms::alt ||
               aAttribute == nsGkAtoms::value)) {
     // We might need to rebuild our alt text.  Just go ahead and
     // reconstruct our frame.  This should be quite rare..
-    retval |= nsChangeHint_ReconstructFrame;
+    retval |= NS_STYLE_HINT_FRAMECHANGE;
   } else if (aAttribute == nsGkAtoms::value) {
     retval |= NS_STYLE_HINT_REFLOW;
   } else if (aAttribute == nsGkAtoms::size &&
              IsSingleLineTextControl(false)) {
     retval |= NS_STYLE_HINT_REFLOW;
   } else if (PlaceholderApplies() && aAttribute == nsGkAtoms::placeholder) {
-    retval |= nsChangeHint_ReconstructFrame;
+    retval |= NS_STYLE_HINT_FRAMECHANGE;
   }
   return retval;
 }

dom/html/HTMLSelectElement.cpp

@@ -1413,7 +1413,7 @@ HTMLSelectElement::GetAttributeChangeHint(const nsIAtom* aAttribute,
       nsGenericHTMLFormElementWithState::GetAttributeChangeHint(aAttribute, aModType);
   if (aAttribute == nsGkAtoms::multiple ||
       aAttribute == nsGkAtoms::size) {
-    retval |= nsChangeHint_ReconstructFrame;
+    retval |= NS_STYLE_HINT_FRAMECHANGE;
   }
   return retval;
 }

dom/html/HTMLTextAreaElement.cpp

@@ -440,7 +440,7 @@ HTMLTextAreaElement::GetAttributeChangeHint(const nsIAtom* aAttribute,
   } else if (aAttribute == nsGkAtoms::wrap) {
     retval |= nsChangeHint_ReconstructFrame;
   } else if (aAttribute == nsGkAtoms::placeholder) {
-    retval |= nsChangeHint_ReconstructFrame;
+    retval |= NS_STYLE_HINT_FRAMECHANGE;
   }
   return retval;
 }

dom/xul/nsXULElement.cpp

@@ -1444,7 +1444,7 @@ nsXULElement::GetAttributeChangeHint(const nsIAtom* aAttribute,
         // value attribute is being added or removed, then we need to
         // return a hint of frame change.  (See bugzilla bug 95475 for
         // details.)
-        retval = nsChangeHint_ReconstructFrame;
+        retval = NS_STYLE_HINT_FRAMECHANGE;
     } else {
         // if left or top changes we reflow. This will happen in xul
         // containers that manage positioned children such as a stack.

layout/base/RestyleManager.cpp

@@ -4677,7 +4677,7 @@ ElementRestyler::RestyleUndisplayedNodes(nsRestyleHint    aChildRestyleHint,
     if (display->mDisplay != aDisplay) {
       NS_ASSERTION(element, "Must have undisplayed content");
       mChangeList->AppendChange(nullptr, element,
-                                nsChangeHint_ReconstructFrame);
+                                NS_STYLE_HINT_FRAMECHANGE);
       // The node should be removed from the undisplayed map when
       // we reframe it.
     } else {

layout/base/nsPresShell.cpp

@@ -9876,7 +9876,7 @@ ReframeImageBoxes(nsIFrame *aFrame, void *aClosure)
   nsStyleChangeList *list = static_cast<nsStyleChangeList*>(aClosure);
   if (aFrame->GetType() == nsGkAtoms::imageBoxFrame) {
     list->AppendChange(aFrame, aFrame->GetContent(),
-                       nsChangeHint_ReconstructFrame);
+                       NS_STYLE_HINT_FRAMECHANGE);
     return false; // don't walk descendants
   }
   return true; // walk descendants

layout/doc/adding-style-props.html

@@ -102,7 +102,7 @@ nsCSSPropList.h</a>
   Insert the property in the list alphabetically, using the existing
 property names as a template. The format of the entry you will create is:
 </p>
-  <pre>CSS_PROP(-moz-force-broken-image-icons, force_broken_image_icons, MozForceBrokenImageIcons, nsChangeHint_ReconstructFrame) // bug 58646</pre>
+  <pre>CSS_PROP(-moz-force-broken-image-icons, force_broken_image_icons, MozForceBrokenImageIcons, NS_STYLE_HINT_FRAMECHANGE) // bug 58646</pre>
 
 <p>The first value is the formal property name, in other words the property
 name as it is seen by the CSS parser.<br>
@@ -335,7 +335,7 @@ is the CalcDifference change for our example:<br>
     }
     return NS_STYLE_HINT_VISUAL;
   }
-  <b>return nsChangeHint_ReconstructFrame;
+  <b>return NS_STYLE_HINT_FRAMECHANGE;
 </b>}
 </pre>
   <h3>CSSStyleRule</h3>