Attachment 8509095 Details for Bug 907396

[patch] Replace GetParentStyleContextFrame with GetParentStyleContext which can return frame-less display:contents style contexts.

907396-display-contents-StyleParent (text/plain), 29.25 KB, created by Mats Palmgren (inactive)

(hide)

Description:

Filename:

MIME Type:

Creator: Mats Palmgren (inactive)

Size: 29.25 KB

patch

obsolete

># HG changeset patch
># Parent 388b379301e13040ee2be38fb1ea1ca56c3b4da2
># User Mats Palmgren <matspal@gmail.com>
>Bug 907396 - Replace GetParentStyleContextFrame with GetParentStyleContext which can return frame-less display:contents style contexts.  r=bzbarsky
>
>diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp
>--- a/layout/base/RestyleManager.cpp
>+++ b/layout/base/RestyleManager.cpp
>@@ -1759,24 +1759,18 @@ VerifyContextParent(nsPresContext* aPres
>                     nsStyleContext* aContext, nsStyleContext* aParentContext)
> {
>   // get the contexts not provided
>   if (!aContext) {
>     aContext = aFrame->StyleContext();
>   }
> 
>   if (!aParentContext) {
>-    // Get the correct parent context from the frame
>-    //  - if the frame is a placeholder, we get the out of flow frame's context
>-    //    as the parent context instead of asking the frame
>-
>-    // get the parent context from the frame (indirectly)
>-    nsIFrame* providerFrame = aFrame->GetParentStyleContextFrame();
>-    if (providerFrame)
>-      aParentContext = providerFrame->StyleContext();
>+    nsIFrame* providerFrame;
>+    aParentContext = aFrame->GetParentStyleContext(&providerFrame);
>     // aParentContext could still be null
>   }
> 
>   NS_ASSERTION(aContext, "Failure to get required contexts");
>   nsStyleContext* actualParentContext = aContext->GetParent();
> 
>   if (aParentContext) {
>     if (aParentContext != actualParentContext) {
>@@ -2098,30 +2092,29 @@ RestyleManager::ReparentStyleContext(nsI
>     } while ((outOfFlow = outOfFlow->GetNextContinuation()));
>   }
> 
>   // DO NOT verify the style tree before reparenting.  The frame
>   // tree has already been changed, so this check would just fail.
>   nsStyleContext* oldContext = aFrame->StyleContext();
> 
>   nsRefPtr<nsStyleContext> newContext;
>-  nsIFrame* providerFrame = aFrame->GetParentStyleContextFrame();
>+  nsIFrame* providerFrame;
>+  nsStyleContext* newParentContext = aFrame->GetParentStyleContext(&providerFrame);
>   bool isChild = providerFrame && providerFrame->GetParent() == aFrame;
>-  nsStyleContext* newParentContext = nullptr;
>   nsIFrame* providerChild = nullptr;
>   if (isChild) {
>     ReparentStyleContext(providerFrame);
>+    // Get the style context again after ReparentStyleContext() which might have
>+    // changed it.
>     newParentContext = providerFrame->StyleContext();
>     providerChild = providerFrame;
>-  } else if (providerFrame) {
>-    newParentContext = providerFrame->StyleContext();
>-  } else {
>-    NS_NOTREACHED("Reparenting something that has no usable parent? "
>-                  "Shouldn't happen!");
>   }
>+  NS_ASSERTION(newParentContext, "Reparenting something that has no usable"
>+               " parent? Shouldn't happen!");
>   // XXX need to do something here to produce the correct style context for
>   // an IB split whose first inline part is inside a first-line frame.
>   // Currently the first IB anonymous block's style context takes the first
>   // part's style context as parent, which is wrong since first-line style
>   // should not apply to the anonymous block.
> 
> #ifdef DEBUG
>   {
>@@ -2473,16 +2466,19 @@ ElementRestyler::Restyle(nsRestyleHint a
>                "frame must have content (unless at the top of the tree)");
> 
>   NS_ASSERTION(!GetPrevContinuationWithSameStyle(mFrame),
>                "should not be trying to restyle this frame separately");
> 
>   MOZ_ASSERT(!(aRestyleHint & eRestyle_LaterSiblings),
>              "eRestyle_LaterSiblings must not be part of aRestyleHint");
> 
>+  AutoDisplayContentsAncestorPusher adcp(mTreeMatchContext, mFrame->PresContext(),
>+      mFrame->GetContent() ? mFrame->GetContent()->GetParent() : nullptr);
>+
>   // List of descendant elements of mContent we know we will eventually need to
>   // restyle.  Before we return from this function, we call
>   // RestyleTracker::AddRestyleRootsIfAwaitingRestyle to ensure they get
>   // restyled in RestyleTracker::DoProcessRestyles.
>   nsTArray<nsRefPtr<Element>> descendants;
> 
>   nsRestyleHint hintToRestore = nsRestyleHint(0);
>   if (mContent && mContent->IsElement() &&
>@@ -2564,19 +2560,18 @@ ElementRestyler::Restyle(nsRestyleHint a
>     mRestyleTracker.AddPendingRestyleToTable(mContent->AsElement(),
>                                              hintToRestore, nsChangeHint(0));
>   }
> 
>   if (result == eRestyleResult_Stop) {
>     MOZ_ASSERT(mFrame->StyleContext() == oldContext,
>                "frame should have been left with its old style context");
> 
>-    nsStyleContext* newParent =
>-      mFrame->GetParentStyleContextFrame()->StyleContext();
>-
>+    nsIFrame* unused;
>+    nsStyleContext* newParent = mFrame->GetParentStyleContext(&unused);
>     if (oldContext->GetParent() != newParent) {
>       // If we received eRestyleResult_Stop, then the old style context was
>       // left on mFrame.  Since we ended up restyling our parent, change
>       // this old style context to point to its new parent.
>       LOG_RESTYLE("moving style context %p from old parent %p to new parent %p",
>                   oldContext.get(), oldContext->GetParent(), newParent);
>       oldContext->MoveTo(newParent);
>     }
>@@ -2805,30 +2800,24 @@ ElementRestyler::RestyleSelf(nsIFrame* a
> #ifdef ACCESSIBILITY
>   mWasFrameVisible = nsIPresShell::IsAccessibilityActive() ?
>     oldContext->StyleVisibility()->IsVisible() : false;
> #endif
> 
>   nsIAtom* const pseudoTag = oldContext->GetPseudo();
>   const nsCSSPseudoElements::Type pseudoType = oldContext->GetPseudoType();
> 
>-  nsStyleContext* parentContext;
>   // Get the frame providing the parent style context.  If it is a
>   // child, then resolve the provider first.
>-  nsIFrame* providerFrame = aSelf->GetParentStyleContextFrame();
>+  nsIFrame* providerFrame;
>+  nsStyleContext* parentContext = aSelf->GetParentStyleContext(&providerFrame);
>   bool isChild = providerFrame && providerFrame->GetParent() == aSelf;
>-  if (!isChild) {
>-    if (providerFrame)
>-      parentContext = providerFrame->StyleContext();
>-    else
>-      parentContext = nullptr;
>-  }
>-  else {
>+  if (isChild) {
>     MOZ_ASSERT(providerFrame->GetContent() == aSelf->GetContent(),
>-               "Postcondition for GetParentStyleContextFrame() violated. "
>+               "Postcondition for GetParentStyleContext() violated. "
>                "That means we need to add the current element to the "
>                "ancestor filter.");
> 
>     // resolve the provider here (before aSelf below).
>     LOG_RESTYLE("resolving child provider frame");
> 
>     // assumeDifferenceHint forces the parent's change to be also
>     // applied to this frame, no matter what
>@@ -3540,17 +3529,17 @@ ElementRestyler::RestyleContentChildren(
>         if (nsGkAtoms::placeholderFrame == child->GetType()) { // placeholder
>           // get out of flow frame and recur there
>           nsIFrame* outOfFlowFrame =
>             nsPlaceholderFrame::GetRealFrameForPlaceholder(child);
>           NS_ASSERTION(outOfFlowFrame, "no out-of-flow frame");
>           NS_ASSERTION(outOfFlowFrame != mResolvedChild,
>                        "out-of-flow frame not a true descendant");
> 
>-          // |nsFrame::GetParentStyleContextFrame| checks being out
>+          // |nsFrame::GetParentStyleContext| checks being out
>           // of flow so that this works correctly.
>           do {
>             if (GetPrevContinuationWithSameStyle(outOfFlowFrame)) {
>               // Later continuations are likely restyled as a result of
>               // the restyling of the previous continuation.
>               // (Currently that's always true, but it's likely to
>               // change if we implement overflow:fragments or similar.)
>               continue;
>diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
>--- a/layout/base/nsCSSFrameConstructor.cpp
>+++ b/layout/base/nsCSSFrameConstructor.cpp
>@@ -2588,17 +2588,17 @@ nsCSSFrameConstructor::ConstructDocEleme
>   NS_ASSERTION(processChildren ? !mRootElementFrame :
>                  mRootElementFrame == contentFrame,
>                "unexpected mRootElementFrame");
>   mRootElementFrame = contentFrame;
> 
>   // Figure out which frame has the main style for the document element,
>   // assigning it to mRootElementStyleFrame.
>   // Backgrounds should be propagated from that frame to the viewport.
>-  mRootElementStyleFrame = contentFrame->GetParentStyleContextFrame();
>+  contentFrame->GetParentStyleContext(&mRootElementStyleFrame);
>   bool isChild = mRootElementStyleFrame &&
>                  mRootElementStyleFrame->GetParent() == contentFrame;
>   if (!isChild) {
>     mRootElementStyleFrame = mRootElementFrame;
>   }
> 
>   if (processChildren) {
>     // Still need to process the child content
>@@ -6292,25 +6292,29 @@ nsCSSFrameConstructor::IsValidSibling(ns
>       (NS_STYLE_DISPLAY_TABLE_COLUMN       == siblingDisplay) ||
>       (NS_STYLE_DISPLAY_TABLE_CAPTION      == siblingDisplay) ||
>       (NS_STYLE_DISPLAY_TABLE_HEADER_GROUP == siblingDisplay) ||
>       (NS_STYLE_DISPLAY_TABLE_ROW_GROUP    == siblingDisplay) ||
>       (NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP == siblingDisplay) ||
>       nsGkAtoms::menuFrame == parentType) {
>     // if we haven't already, construct a style context to find the display type of aContent
>     if (UNSET_DISPLAY == aDisplay) {
>-      nsRefPtr<nsStyleContext> styleContext;
>-      nsIFrame* styleParent = aSibling->GetParentStyleContextFrame();
>+      nsIFrame* styleParent;
>+      aSibling->GetParentStyleContext(&styleParent);
>+      if (!styleParent) {
>+        styleParent = aSibling->GetParent();
>+      }
>       if (!styleParent) {
>         NS_NOTREACHED("Shouldn't happen");
>         return false;
>       }
>       // XXXbz when this code is killed, the state argument to
>       // ResolveStyleContext can be made non-optional.
>-      styleContext = ResolveStyleContext(styleParent, aContent, nullptr);
>+      nsRefPtr<nsStyleContext> styleContext =
>+        ResolveStyleContext(styleParent, aContent, nullptr);
>       const nsStyleDisplay* display = styleContext->StyleDisplay();
>       aDisplay = display->mDisplay;
>     }
>     if (nsGkAtoms::menuFrame == parentType) {
>       return
>         (NS_STYLE_DISPLAY_POPUP == aDisplay) ==
>         (NS_STYLE_DISPLAY_POPUP == siblingDisplay);
>     }
>diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
>--- a/layout/base/nsDisplayList.cpp
>+++ b/layout/base/nsDisplayList.cpp
>@@ -4622,21 +4622,28 @@ nsDisplayTransform::GetDeltaToPerspectiv
> 
>   /* For both of the coordinates, if the value of -moz-perspective-origin is a
>    * percentage, it's relative to the size of the frame.  Otherwise, if it's
>    * a distance, it's already computed for us!
>    */
> 
>   //TODO: Should this be using our bounds or the parent's bounds?
>   // How do we handle aBoundsOverride in the latter case?
>-  nsIFrame* parent = aFrame->GetParentStyleContextFrame();
>+  nsIFrame* parent;
>+  nsStyleContext* psc = aFrame->GetParentStyleContext(&parent);
>+  if (!psc) {
>+    return Point3D();
>+  }
>   if (!parent) {
>-    return Point3D();
>-  }
>-  const nsStyleDisplay* display = parent->StyleDisplay();
>+    parent = aFrame->GetParent();
>+    if (!parent) {
>+      return Point3D();
>+    }
>+  }
>+  const nsStyleDisplay* display = psc->StyleDisplay();
>   nsRect boundingRect = nsDisplayTransform::GetFrameBoundsForTransform(parent);
> 
>   /* Allows us to access named variables by index. */
>   Point3D result;
>   result.z = 0.0f;
>   gfx::Float* coords[2] = {&result.x, &result.y};
>   const nscoord* dimensions[2] =
>     {&boundingRect.width, &boundingRect.height};
>diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
>--- a/layout/generic/nsFrame.cpp
>+++ b/layout/generic/nsFrame.cpp
>@@ -7689,54 +7689,73 @@ nsFrame::CorrectStyleParentFrame(nsIFram
>   // We can get here if the root element is absolutely positioned.
>   // We can't test for this very accurately, but it can only happen
>   // when the prospective parent is a canvas frame.
>   NS_ASSERTION(aProspectiveParent->GetType() == nsGkAtoms::canvasFrame,
>                "Should have found a parent before this");
>   return nullptr;
> }
> 
>-nsIFrame*
>-nsFrame::DoGetParentStyleContextFrame() const
>-{
>-  if (mContent && !mContent->GetParent() &&
>-      !StyleContext()->GetPseudo()) {
>-    // we're a frame for the root.  We have no style context parent.
>-    return nullptr;
>-  }
>-  
>+nsStyleContext*
>+nsFrame::DoGetParentStyleContext(nsIFrame** aProviderFrame) const
>+{
>+  *aProviderFrame = nullptr;
>+  nsFrameManager* fm = PresContext()->FrameManager();
>+  if (MOZ_LIKELY(mContent)) {
>+    nsIContent* parentContent = mContent->GetFlattenedTreeParent();
>+    if (MOZ_LIKELY(parentContent)) {
>+      nsIAtom* pseudo = StyleContext()->GetPseudo();
>+      if (!pseudo || !mContent->IsElement() ||
>+          !nsCSSAnonBoxes::IsAnonBox(pseudo) ||
>+          /* if next is true then it's really a request for the table frame's
>+             parent context, see nsTable[Outer]Frame::GetParentStyleContext. */
>+          pseudo == nsCSSAnonBoxes::tableOuter) {
>+        nsStyleContext* sc = fm->GetDisplayContentsStyleFor(parentContent);
>+        if (MOZ_UNLIKELY(sc)) {
>+          return sc;
>+        }
>+      }
>+    } else {
>+      if (!StyleContext()->GetPseudo()) {
>+        // we're a frame for the root.  We have no style context parent.
>+        return nullptr;
>+      }
>+    }
>+  }
>+
>   if (!(mState & NS_FRAME_OUT_OF_FLOW)) {
>     /*
>      * If this frame is an anonymous block created when an inline with a block
>      * inside it got split, then the parent style context is on its preceding
>      * inline. We can get to it using GetIBSplitSiblingForAnonymousBlock.
>      */
>     if (mState & NS_FRAME_PART_OF_IBSPLIT) {
>       nsIFrame* ibSplitSibling = GetIBSplitSiblingForAnonymousBlock(this);
>       if (ibSplitSibling) {
>-        return ibSplitSibling;
>+        return (*aProviderFrame = ibSplitSibling)->StyleContext();
>       }
>     }
> 
>     // If this frame is one of the blocks that split an inline, we must
>     // return the "special" inline parent, i.e., the parent that this
>     // frame would have if we didn't mangle the frame structure.
>-    return GetCorrectedParent(this);
>+    *aProviderFrame = GetCorrectedParent(this);
>+    return *aProviderFrame ? (*aProviderFrame)->StyleContext() : nullptr;
>   }
> 
>   // We're an out-of-flow frame.  For out-of-flow frames, we must
>   // resolve underneath the placeholder's parent.  The placeholder is
>   // reached from the first-in-flow.
>-  nsIFrame* placeholder = PresContext()->FrameManager()->
>-                            GetPlaceholderFrameFor(FirstInFlow());
>+  nsIFrame* placeholder = fm->GetPlaceholderFrameFor(FirstInFlow());
>   if (!placeholder) {
>     NS_NOTREACHED("no placeholder frame for out-of-flow frame");
>-    return GetCorrectedParent(this);
>-  }
>-  return placeholder->GetParentStyleContextFrame();
>+    *aProviderFrame = GetCorrectedParent(this);
>+    return *aProviderFrame ? (*aProviderFrame)->StyleContext() : nullptr;
>+  }
>+  return placeholder->GetParentStyleContext(aProviderFrame);
> }
> 
> void
> nsFrame::GetLastLeaf(nsPresContext* aPresContext, nsIFrame **aFrame)
> {
>   if (!aFrame || !*aFrame)
>     return;
>   nsIFrame *child = *aFrame;
>diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h
>--- a/layout/generic/nsFrame.h
>+++ b/layout/generic/nsFrame.h
>@@ -216,28 +216,34 @@ public:
> 
>   virtual nsresult  GetOffsets(int32_t &aStart, int32_t &aEnd) const MOZ_OVERRIDE;
>   virtual void ChildIsDirty(nsIFrame* aChild) MOZ_OVERRIDE;
> 
> #ifdef ACCESSIBILITY
>   virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;
> #endif
> 
>-  virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE {
>-    return DoGetParentStyleContextFrame();
>+  virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const MOZ_OVERRIDE {
>+    return DoGetParentStyleContext(aProviderFrame);
>   }
> 
>   /**
>    * Do the work for getting the parent style context frame so that
>-   * other frame's |GetParentStyleContextFrame| methods can call this
>+   * other frame's |GetParentStyleContext| methods can call this
>    * method on *another* frame.  (This function handles out-of-flow
>    * frames by using the frame manager's placeholder map and it also
>    * handles block-within-inline and generated content wrappers.)
>+   *
>+   * @param aProviderFrame (out) the frame associated with the returned value
>+   *     or null if the style context is for display:contents content.
>+   * @return The style context that should be the parent of this frame's
>+   *         style context.  Null is permitted, and means that this frame's
>+   *         style context should be the root of the style context tree.
>    */
>-  nsIFrame* DoGetParentStyleContextFrame() const;
>+  nsStyleContext* DoGetParentStyleContext(nsIFrame** aProviderFrame) const;
> 
>   virtual bool IsEmpty() MOZ_OVERRIDE;
>   virtual bool IsSelfEmpty() MOZ_OVERRIDE;
> 
>   virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
>   virtual nscoord GetMinISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
>   virtual nscoord GetPrefISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
>   virtual void AddInlineMinISize(nsRenderingContext *aRenderingContext,
>diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
>--- a/layout/generic/nsIFrame.h
>+++ b/layout/generic/nsIFrame.h
>@@ -2459,21 +2459,23 @@ public:
>   /**
>    * Get the frame whose style context should be the parent of this
>    * frame's style context (i.e., provide the parent style context).
>    * This frame must either be an ancestor of this frame or a child.  If
>    * this returns a child frame, then the child frame must be sure to
>    * return a grandparent or higher!  Furthermore, if a child frame is
>    * returned it must have the same GetContent() as this frame.
>    *
>-   * @return The frame whose style context should be the parent of this frame's
>+   * @param aProviderFrame (out) the frame associated with the returned value
>+   *     or nullptr if the style context is for display:contents content.
>+   * @return The style context that should be the parent of this frame's
>    *         style context.  Null is permitted, and means that this frame's
>    *         style context should be the root of the style context tree.
>    */
>-  virtual nsIFrame* GetParentStyleContextFrame() const = 0;
>+  virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const = 0;
> 
>   /**
>    * Determines whether a frame is visible for painting;
>    * taking into account whether it is painting a selection or printing.
>    */
>   bool IsVisibleForPainting(nsDisplayListBuilder* aBuilder);
>   /**
>    * Determines whether a frame is visible for painting or collapsed;
>diff --git a/layout/generic/nsPlaceholderFrame.cpp b/layout/generic/nsPlaceholderFrame.cpp
>--- a/layout/generic/nsPlaceholderFrame.cpp
>+++ b/layout/generic/nsPlaceholderFrame.cpp
>@@ -179,25 +179,36 @@ nsPlaceholderFrame::CanContinueTextRun()
>   if (!mOutOfFlowFrame) {
>     return false;
>   }
>   // first-letter frames can continue text runs, and placeholders for floated
>   // first-letter frames can too
>   return mOutOfFlowFrame->CanContinueTextRun();
> }
> 
>-nsIFrame*
>-nsPlaceholderFrame::GetParentStyleContextFrame() const
>+nsStyleContext*
>+nsPlaceholderFrame::GetParentStyleContext(nsIFrame** aProviderFrame) const
> {
>   NS_PRECONDITION(GetParent(), "How can we not have a parent here?");
> 
>+  nsIContent* parentContent = mContent ? mContent->GetParent() : nullptr;
>+  if (parentContent) {
>+    nsStyleContext* sc =
>+      PresContext()->FrameManager()->GetDisplayContentsStyleFor(parentContent);
>+    if (sc) {
>+      *aProviderFrame = nullptr;
>+      return sc;
>+    }
>+  }
>+
>   // Lie about our pseudo so we can step out of all anon boxes and
>   // pseudo-elements.  The other option would be to reimplement the
>   // {ib} split gunk here.
>-  return CorrectStyleParentFrame(GetParent(), nsGkAtoms::placeholderFrame);
>+  *aProviderFrame = CorrectStyleParentFrame(GetParent(), nsGkAtoms::placeholderFrame);
>+  return *aProviderFrame ? (*aProviderFrame)->StyleContext() : nullptr;
> }
> 
> 
> #ifdef DEBUG
> static void
> PaintDebugPlaceholder(nsIFrame* aFrame, nsRenderingContext* aCtx,
>                       const nsRect& aDirtyRect, nsPoint aPt)
> {
>diff --git a/layout/generic/nsPlaceholderFrame.h b/layout/generic/nsPlaceholderFrame.h
>--- a/layout/generic/nsPlaceholderFrame.h
>+++ b/layout/generic/nsPlaceholderFrame.h
>@@ -130,17 +130,17 @@ public:
>   virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE
>   {
>     nsIFrame* realFrame = GetRealFrameForPlaceholder(this);
>     return realFrame ? realFrame->AccessibleType() :
>                        nsFrame::AccessibleType();
>   }
> #endif
> 
>-  virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
>+  virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const MOZ_OVERRIDE;
> 
>   /**
>    * @return the out-of-flow for aFrame if aFrame is a placeholder; otherwise
>    * aFrame
>    */
>   static nsIFrame* GetRealFrameFor(nsIFrame* aFrame) {
>     NS_PRECONDITION(aFrame, "Must have a frame to work with");
>     if (aFrame->GetType() == nsGkAtoms::placeholderFrame) {
>diff --git a/layout/tables/nsTableColGroupFrame.cpp b/layout/tables/nsTableColGroupFrame.cpp
>--- a/layout/tables/nsTableColGroupFrame.cpp
>+++ b/layout/tables/nsTableColGroupFrame.cpp
>@@ -290,19 +290,19 @@ nsTableColGroupFrame::RemoveFrame(ChildL
>     nsTableColFrame* colFrame = (nsTableColFrame*)aOldFrame;
>     if (colFrame->GetColType() == eColContent) {
>       contentRemoval = true;
>       // Remove any anonymous column frames this <col> produced via a colspan
>       nsTableColFrame* col = colFrame->GetNextCol();
>       nsTableColFrame* nextCol;
>       while (col && col->GetColType() == eColAnonymousCol) {
> #ifdef DEBUG
>-        nsIFrame* providerFrame = colFrame->GetParentStyleContextFrame();
>-        if (colFrame->StyleContext()->GetParent() ==
>-            providerFrame->StyleContext()) {
>+        nsIFrame* providerFrame;
>+        nsStyleContext* psc = colFrame->GetParentStyleContext(&providerFrame);
>+        if (colFrame->StyleContext()->GetParent() == psc) {
>           NS_ASSERTION(col->StyleContext() == colFrame->StyleContext() &&
>                        col->GetContent() == colFrame->GetContent(),
>                        "How did that happen??");
>         }
>         // else colFrame is being removed because of a frame
>         // reconstruct on it, and its style context is still the old
>         // one, so we can't assert anything about how it compares to
>         // col's style context.
>diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
>--- a/layout/tables/nsTableFrame.cpp
>+++ b/layout/tables/nsTableFrame.cpp
>@@ -129,29 +129,30 @@ struct BCPropertyData
>   BCPixelSize mTopBorderWidth;
>   BCPixelSize mRightBorderWidth;
>   BCPixelSize mBottomBorderWidth;
>   BCPixelSize mLeftBorderWidth;
>   BCPixelSize mLeftCellBorderWidth;
>   BCPixelSize mRightCellBorderWidth;
> };
> 
>-nsIFrame*
>-nsTableFrame::GetParentStyleContextFrame() const
>+nsStyleContext*
>+nsTableFrame::GetParentStyleContext(nsIFrame** aProviderFrame) const
> {
>   // Since our parent, the table outer frame, returned this frame, we
>   // must return whatever our parent would normally have returned.
> 
>   NS_PRECONDITION(GetParent(), "table constructed without outer table");
>   if (!mContent->GetParent() && !StyleContext()->GetPseudo()) {
>     // We're the root.  We have no style context parent.
>+    *aProviderFrame = nullptr;
>     return nullptr;
>   }
> 
>-  return GetParent()->DoGetParentStyleContextFrame();
>+  return GetParent()->DoGetParentStyleContext(aProviderFrame);
> }
> 
> 
> nsIAtom*
> nsTableFrame::GetType() const
> {
>   return nsGkAtoms::tableFrame;
> }
>diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h
>--- a/layout/tables/nsTableFrame.h
>+++ b/layout/tables/nsTableFrame.h
>@@ -353,17 +353,18 @@ public:
>   void ReflowTable(nsHTMLReflowMetrics&     aDesiredSize,
>                    const nsHTMLReflowState& aReflowState,
>                    nscoord                  aAvailHeight,
>                    nsIFrame*&               aLastChildReflowed,
>                    nsReflowStatus&          aStatus);
> 
>   nsFrameList& GetColGroups();
> 
>-  virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
>+  virtual nsStyleContext*
>+  GetParentStyleContext(nsIFrame** aProviderFrame) const MOZ_OVERRIDE;
> 
>   /**
>    * Get the "type" of the frame
>    *
>    * @see nsGkAtoms::tableFrame
>    */
>   virtual nsIAtom* GetType() const MOZ_OVERRIDE;
> 
>diff --git a/layout/tables/nsTableOuterFrame.cpp b/layout/tables/nsTableOuterFrame.cpp
>--- a/layout/tables/nsTableOuterFrame.cpp
>+++ b/layout/tables/nsTableOuterFrame.cpp
>@@ -1,13 +1,16 @@
> /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
> /* This Source Code Form is subject to the terms of the Mozilla Public
>  * License, v. 2.0. If a copy of the MPL was not distributed with this
>  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
>+
> #include "nsTableOuterFrame.h"
>+
>+#include "nsFrameManager.h"
> #include "nsTableFrame.h"
> #include "nsTableCellFrame.h"
> #include "nsStyleContext.h"
> #include "nsStyleConsts.h"
> #include "nsPresContext.h"
> #include "nsCSSRendering.h"
> #include "nsIContent.h"
> #include "prinrval.h"
>@@ -97,35 +100,42 @@ nsTableCaptionFrame::ComputeAutoSize(nsR
>     }
>     if (min > result.ISize(aWM)) {
>       result.ISize(aWM) = min;
>     }
>   }
>   return result;
> }
> 
>-nsIFrame*
>-nsTableCaptionFrame::GetParentStyleContextFrame() const
>+nsStyleContext*
>+nsTableCaptionFrame::GetParentStyleContext(nsIFrame** aProviderFrame) const
> {
>-  NS_PRECONDITION(mContent->GetParent(),
>-                  "How could we not have a parent here?");
>+  MOZ_ASSERT(GetContent()->GetParent(), "How could we not have a parent here?");
>     
>+  nsStyleContext* sc =
>+    PresContext()->FrameManager()->GetDisplayContentsStyleFor(GetContent()->GetParent());
>+  if (sc) {
>+    *aProviderFrame = nullptr;
>+    return sc;
>+  }
>+
>   // The caption's style context parent is the inner frame, unless
>   // it's anonymous.
>   nsIFrame* outerFrame = GetParent();
>   if (outerFrame && outerFrame->GetType() == nsGkAtoms::tableOuterFrame) {
>     nsIFrame* innerFrame = outerFrame->GetFirstPrincipalChild();
>     if (innerFrame) {
>-      return nsFrame::CorrectStyleParentFrame(innerFrame,
>-                                              StyleContext()->GetPseudo());
>+      *aProviderFrame = nsFrame::CorrectStyleParentFrame(innerFrame,
>+                                   StyleContext()->GetPseudo());
>+      return *aProviderFrame ? (*aProviderFrame)->StyleContext() : nullptr;
>     }
>   }
> 
>   NS_NOTREACHED("Where is our inner table frame?");
>-  return nsBlockFrame::GetParentStyleContextFrame();
>+  return nsBlockFrame::GetParentStyleContext(aProviderFrame);
> }
> 
> #ifdef ACCESSIBILITY
> a11y::AccType
> nsTableCaptionFrame::AccessibleType()
> {
>   if (!GetRect().IsEmpty()) {
>     return a11y::eHTMLCaptionType;
>@@ -319,30 +329,30 @@ nsTableOuterFrame::BuildDisplayListForIn
>   nsIFrame* kid = mFrames.FirstChild();
>   // The children should be in content order
>   while (kid) {
>     BuildDisplayListForChild(aBuilder, kid, aDirtyRect, aLists);
>     kid = kid->GetNextSibling();
>   }
> }
> 
>-nsIFrame*
>-nsTableOuterFrame::GetParentStyleContextFrame() const
>+nsStyleContext*
>+nsTableOuterFrame::GetParentStyleContext(nsIFrame** aProviderFrame) const
> {
>   // The table outer frame and the (inner) table frame split the style
>   // data by giving the table frame the style context associated with
>   // the table content node and creating a style context for the outer
>   // frame that is a *child* of the table frame's style context,
>   // matching the ::-moz-table-outer pseudo-element.  html.css has a
>   // rule that causes that pseudo-element (and thus the outer table)
>   // to inherit *some* style properties from the table frame.  The
>   // children of the table inherit directly from the inner table, and
>   // the outer table's style context is a leaf.
> 
>-  return InnerTableFrame();
>+  return (*aProviderFrame = InnerTableFrame())->StyleContext();
> }
> 
> // INCREMENTAL REFLOW HELPER FUNCTIONS 
> 
> void
> nsTableOuterFrame::InitChildReflowState(nsPresContext&    aPresContext,                     
>                                         nsHTMLReflowState& aReflowState)
>                                     
>diff --git a/layout/tables/nsTableOuterFrame.h b/layout/tables/nsTableOuterFrame.h
>--- a/layout/tables/nsTableOuterFrame.h
>+++ b/layout/tables/nsTableOuterFrame.h
>@@ -27,17 +27,17 @@ public:
>                   mozilla::WritingMode aWritingMode,
>                   const mozilla::LogicalSize& aCBSize,
>                   nscoord aAvailableISize,
>                   const mozilla::LogicalSize& aMargin,
>                   const mozilla::LogicalSize& aBorder,
>                   const mozilla::LogicalSize& aPadding,
>                   bool aShrinkWrap) MOZ_OVERRIDE;
> 
>-  virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
>+  virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const MOZ_OVERRIDE;
> 
> #ifdef ACCESSIBILITY
>   virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;
> #endif
> 
> #ifdef DEBUG_FRAME_DUMP
>   virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
> #endif
>@@ -131,17 +131,17 @@ public:
>    * @see nsGkAtoms::tableOuterFrame
>    */
>   virtual nsIAtom* GetType() const MOZ_OVERRIDE;
> 
> #ifdef DEBUG_FRAME_DUMP
>   virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
> #endif
> 
>-  virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
>+  virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const MOZ_OVERRIDE;
> 
>   /**
>    * Return the content for the cell at the given row and column.
>    */
>   nsIContent* GetCellAt(uint32_t aRowIdx, uint32_t aColIdx) const;
> 
>   /**
>    * Return the number of rows in the table.

Flags:

bzbarsky: review+

Actions: View | Diff | Review

Attachments on bug 907396: 802681 | 802684 | 802685 | 802686 | 802687 | 802688 | 802689 | 802691 | 802692 | 802694 | 802695 | 805961 | 805966 | 805978 | 805980 | 805982 | 806000 | 806002 | 806173 | 806174 | 806177 | 8392917 | 8392920 | 8392929 | 8392932 | 8392934 | 8392953 | 8392954 | 8408496 | 8442107 | 8442117 | 8442176 | 8442192 | 8455264 | 8455266 | 8455274 | 8455281 | 8455290 | 8455386 | 8455502 | 8455503 | 8457452 | 8492588 | 8492589 | 8492590 | 8492591 | 8492593 | 8492594 | 8492595 | 8492596 | 8492597 | 8492598 | 8492600 | 8492601 | 8492602 | 8492603 | 8493349 | 8493408 | 8493412 | 8493953 | 8493956 | 8493957 | 8493977 | 8498158 | 8498173 | 8498181 | 8498189 | 8498191 | 8498197 | 8507588 | 8509088 | 8509092 | 8509095 | 8509098 | 8521591 | 8521869 | 8521871 | 8521873