Attachment 8455281 Details for Bug 907396

[patch] Frame constructor support for multiple ::before/::after per frame; deal with them when display:contents is involved.

907396-display-contents-multiple-before-after-frames (text/plain), 5.30 KB, created by Mats Palmgren (inactive)

(hide)

Description:

Filename:

MIME Type:

Creator: Mats Palmgren (inactive)

Size: 5.30 KB

patch

obsolete

># HG changeset patch
># Parent e24e76b8c0e15d4eb498e135ea14de757d7ee324
># User Mats Palmgren <matspal@gmail.com>
>Bug 907396 - Frame constructor support for multiple ::before/::after per frame; deal with them when display:contents is involved.  r=bzbarsky
>
>diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
>--- a/layout/base/nsCSSFrameConstructor.cpp
>+++ b/layout/base/nsCSSFrameConstructor.cpp
>@@ -5643,34 +5643,50 @@ nsCSSFrameConstructor::AddFrameConstruct
>       ((bits & FCDATA_DISALLOW_OUT_OF_FLOW) ||
>        !aState.GetGeometricParent(display, nullptr))) {
>     item->mIsLineParticipant = true;
>     aItems.LineParticipantItemAdded();
>   }
> }
> 
> static void
>-DestroyContent(void* aPropertyValue)
>-{
>-  nsIContent* content = static_cast<nsIContent*>(aPropertyValue);
>-  content->UnbindFromTree();
>-  NS_RELEASE(content);
>-}
>-
>-NS_DECLARE_FRAME_PROPERTY(BeforeProperty, DestroyContent)
>-NS_DECLARE_FRAME_PROPERTY(AfterProperty, DestroyContent)
>-
>-static const FramePropertyDescriptor*
>-GenConPseudoToProperty(nsIAtom* aPseudo)
>-{
>-  NS_ASSERTION(aPseudo == nsCSSPseudoElements::before ||
>-               aPseudo == nsCSSPseudoElements::after,
>-               "Bad gen-con pseudo");
>-  return aPseudo == nsCSSPseudoElements::before ? BeforeProperty()
>-      : AfterProperty();
>+DestroyContentArray(void* aPropertyValue)
>+{
>+  typedef nsAutoTArray<nsIContent*, 2> T;
>+  T* arr = static_cast<T*>(aPropertyValue);
>+  for (T::size_type i = 0; i < arr->Length(); ++i) {
>+    nsIContent* content = (*arr)[i];
>+    content->UnbindFromTree();
>+    NS_RELEASE(content);
>+  }
>+  delete arr;
>+}
>+
>+NS_DECLARE_FRAME_PROPERTY(GenConProperty, DestroyContentArray)
>+
>+static void
>+AddGenConPseudoToFrame(nsIFrame* aOwnerFrame, nsIContent* aContent)
>+{
>+  typedef nsAutoTArray<nsIContent*, 2> T;
>+  const FramePropertyDescriptor* prop = GenConProperty();
>+  FrameProperties props = aOwnerFrame->Properties();
>+  T* value = static_cast<T*>(props.Get(prop));
>+  if (!value) {
>+    value = new T;
>+    props.Set(prop, value);
>+  }
>+  value->AppendElement(aContent);
>+}
>+
>+static nsTArray<nsIContent*>*
>+GetGenConPseudos(nsIFrame* aOwnerFrame)
>+{
>+  const FramePropertyDescriptor* prop = GenConProperty();
>+  FrameProperties props = aOwnerFrame->Properties();
>+  return static_cast<nsTArray<nsIContent*>*>(props.Get(prop));
> }
> 
> /**
>  * Return true if the frame construction item pointed to by aIter will
>  * create a frame adjacent to a line boundary in the frame tree, and that
>  * line boundary is induced by a content node adjacent to the frame's
>  * content node in the content tree. The latter condition is necessary so
>  * that ContentAppended/ContentInserted/ContentRemoved can easily find any
>@@ -5764,18 +5780,17 @@ nsCSSFrameConstructor::ConstructFramesFr
>     // NS_FRAME_GENERATED_CONTENT.
>     aState.mAdditionalStateBits |= NS_FRAME_GENERATED_CONTENT;
> 
>     // Note that we're not necessarily setting this property on the primary
>     // frame for the content for which this is generated content.  We might be
>     // setting it on a table pseudo-frame inserted under that instead.  That's
>     // OK, though; we just need to do the property set so that the content will
>     // get cleaned up when the frame is destroyed.
>-    aParentFrame->Properties().Set(GenConPseudoToProperty(styleContext->GetPseudo()),
>-                                   item.mContent);
>+    ::AddGenConPseudoToFrame(aParentFrame, item.mContent);
> 
>     // Now that we've passed ownership of item.mContent to the frame, unset
>     // our generated content flag so we don't release or unbind it ourselves.
>     item.mIsGeneratedContent = false;
>   }
> 
>   // XXXbz maybe just inline ConstructFrameFromItemInternal here or something?
>   ConstructFrameFromItemInternal(item, aState, adjParentFrame, aFrameItems);
>@@ -7750,16 +7765,37 @@ nsCSSFrameConstructor::ContentRemoved(ns
>   if (!childFrame || childFrame->GetContent() != aChild) {
>     // XXXbz the GetContent() != aChild check is needed due to bug 135040.
>     // Remove it once that's fixed.
>     ClearUndisplayedContentIn(aChild, aContainer);
>   }
>   MOZ_ASSERT(!childFrame || !GetDisplayContents(aChild),
>              "display:contents nodes shouldn't have a frame");
>   if (!childFrame && GetDisplayContents(aChild)) {
>+    nsIFrame* ancestorFrame = nullptr;
>+    nsIContent* ancestor = aContainer;
>+    for (; ancestor; ancestor = ancestor->GetParent()) {
>+      ancestorFrame = ancestor->GetPrimaryFrame();
>+      if (ancestorFrame) {
>+        break;
>+      }
>+    }
>+    if (ancestorFrame) {
>+      nsTArray<nsIContent*>* generated = GetGenConPseudos(ancestorFrame);
>+      if (generated) {
>+        LAYOUT_PHASE_TEMP_EXIT();
>+        // XXXmats Can we recreate frames only for the ::after/::before content?
>+        // XXX Perhaps even only those that belong to the aChild sub-tree?
>+        RecreateFramesForContent(ancestor, false);
>+        LAYOUT_PHASE_TEMP_REENTER();
>+        *aDidReconstruct = true;
>+        return NS_OK;
>+      }
>+    }
>+
>     FlattenedChildIterator iter(aChild);
>     for (nsIContent* c = iter.GetNextChild(); c; c = iter.GetNextChild()) {
>       if (c->GetPrimaryFrame() || GetDisplayContents(c)) {
>         LAYOUT_PHASE_TEMP_EXIT();
>         rv = ContentRemoved(aChild, c, nullptr, aFlags, aDidReconstruct);
>         LAYOUT_PHASE_TEMP_REENTER();
>         NS_ENSURE_SUCCESS(rv, rv);
>         if (*aDidReconstruct) {

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