Bug 1384542: Remove the use of GetParentAllowServo in nsFirstLetterFrame. r=heycam

MozReview-Commit-ID: Gt9MX8t3vUh

layout/generic/nsFirstLetterFrame.cpp

@@ -59,13 +59,13 @@ nsFirstLetterFrame::Init(nsIContent*       aContent,
   if (aPrevInFlow) {
     // Get proper style context for ourselves.  We're creating the frame
     // that represents everything *except* the first letter, so just create
-    // a style context like we would for a text node.
+    // a style context that inherits from our style parent, with no extra rules.
-    nsStyleContext* parentStyleContext = mStyleContext->GetParentAllowServo();
+    nsIFrame* styleParent =
-    if (parentStyleContext) {
+      CorrectStyleParentFrame(aParent, nsCSSPseudoElements::firstLetter);
-      newSC = PresContext()->StyleSet()->
+    nsStyleContext* parentStyleContext = styleParent->StyleContext();
-        ResolveStyleForFirstLetterContinuation(parentStyleContext);
+    newSC = PresContext()->StyleSet()->
-      SetStyleContextWithoutNotification(newSC);
+      ResolveStyleForFirstLetterContinuation(parentStyleContext);
-    }
+    SetStyleContextWithoutNotification(newSC);
   }
 
   nsContainerFrame::Init(aContent, aParent, aPrevInFlow);
@@ -378,14 +378,23 @@ nsFirstLetterFrame::DrainOverflowFrames(nsPresContext* aPresContext)
   // are reflowed)
   nsIFrame* kid = mFrames.FirstChild();
   if (kid) {
-    RefPtr<nsStyleContext> sc;
     nsIContent* kidContent = kid->GetContent();
     if (kidContent) {
       NS_ASSERTION(kidContent->IsNodeOfType(nsINode::eTEXT),
                    "should contain only text nodes");
-      nsStyleContext* parentSC = prevInFlow ? mStyleContext->GetParentAllowServo() :
+      nsStyleContext* parentSC;
-                                              mStyleContext;
+      if (prevInFlow) {
-      sc = aPresContext->StyleSet()->ResolveStyleForText(kidContent, parentSC);
+        // This is for the rest of the content not in the first-letter.
+        nsIFrame* styleParent =
+          CorrectStyleParentFrame(GetParent(),
+                                  nsCSSPseudoElements::firstLetter);
+        parentSC = styleParent->StyleContext();
+      } else {
+        // And this for the first-letter style.
+        parentSC = mStyleContext;
+      }
+      RefPtr<nsStyleContext> sc =
+        aPresContext->StyleSet()->ResolveStyleForText(kidContent, parentSC);
       kid->SetStyleContext(sc);
       nsLayoutUtils::MarkDescendantsDirty(kid);
     }