Backed out changeset 59ae87416f96 (bug 488249 followup) to fix test orange.

--HG--
extra : rebase_source : 0108b501163d0114ef96a9059023fad69accd9e1

layout/base/nsCSSFrameConstructor.cpp

@@ -3672,7 +3672,7 @@ nsCSSFrameConstructor::FindHTMLData(nsIContent* aContent,
         aParentFrame->GetStyleContext()->GetPseudoType() !=
           nsCSSAnonBoxes::fieldsetContent) ||
        !aContent->GetParent() ||
-       !aContent->GetParent()->IsHTML() ||
+       !aContent->GetParent()->IsNodeOfType(nsINode::eHTML) ||
        aContent->GetParent()->Tag() != nsGkAtoms::fieldset ||
        aStyleContext->GetStyleDisplay()->IsFloating() ||
        aStyleContext->GetStyleDisplay()->IsAbsolutelyPositioned())) {

widget/src/cocoa/nsMenuBarX.mm

@@ -169,7 +169,7 @@ void nsMenuBarX::ConstructNativeMenus()
     nsIContent *menuContent = mContent->GetChildAt(i);
     if (menuContent &&
         menuContent->Tag() == nsWidgetAtoms::menu &&
-        menuContent->IsXUL()) {
+        menuContent->IsNodeOfType(nsINode::eXUL)) {
       nsMenuX* newMenu = new nsMenuX();
       if (newMenu) {
         nsresult rv = newMenu->Create(this, this, menuContent);

widget/src/cocoa/nsNativeThemeCocoa.mm

@@ -1692,7 +1692,8 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame
       // XUL textboxes set the native appearance on the containing box, while
       // concrete focus is set on the html:input element within it. We can
       // though, check the focused attribute of xul textboxes in this case.
-      if (aFrame->GetContent()->IsXUL() && IsFocused(aFrame)) {
+      if (aFrame->GetContent()->IsNodeOfType(nsINode::eXUL) &&
+          IsFocused(aFrame)) {
         eventState |= NS_EVENT_STATE_FOCUS;
       }