Bug 565569. Set primary frame for anonymous text in buttons. r=mats

layout/base/nsCSSFrameConstructor.cpp

@@ -3912,9 +3912,8 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsFrameConstructorState& aState,
 
     nsIFrame* newFrame = creator->CreateFrameFor(content);
     if (newFrame) {
-// See bug 565569
-//      NS_ASSERTION(content->GetPrimaryFrame(),
-//                   "Content must have a primary frame now");
+      NS_ASSERTION(content->GetPrimaryFrame(),
+                   "Content must have a primary frame now");
       aChildItems.AddChild(newFrame);
     }
     else {

layout/forms/nsGfxButtonControlFrame.cpp

@@ -157,8 +157,7 @@ nsGfxButtonControlFrame::CreateFrameFor(nsIContent*      aContent)
       if (newFrame) {
         // initialize the text frame
         newFrame->Init(mTextContent, parentFrame, nsnull);
-// See bug 565569
-//      mTextContent->SetPrimaryFrame(newFrame);
+        mTextContent->SetPrimaryFrame(newFrame);
       }
     }
   }