Attachment #805980 for bug #907396

Attachment #805980: Frame constructor support for multiple ::before/::after per frame; deal with them when display:contents is involved. for bug #907396

View | Details | Raw Unified | Return to bug 907396
Collapse All | Expand All





      ((bits & FCDATA_DISALLOW_OUT_OF_FLOW) ||
       !aState.GetGeometricParent(display, nullptr))) {
    item->mIsLineParticipant = true;
    aItems.LineParticipantItemAdded();
  }
}

static void
DestroyContentArray(void* aPropertyValue)
{
  typedef nsTArray<nsIContent*> 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, nsIAtom* aPseudo,
                       nsIContent* aContent)
{
  typedef nsTArray<nsIContent*> T;
  const FramePropertyDescriptor* prop = GenConProperty();
  FrameProperties props = aOwnerFrame->Properties();
  T* value = static_cast<T*>(props.Get(prop));
  if (!value) {
    value = new T(2);
    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

    // 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.
    ::AddGenConPseudoToFrame(aParentFrame, styleContext->GetPseudo(),
                             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);

  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;
    for (nsIContent* p = aContainer; p && !ancestorFrame; p = p->GetParent()) {
      ancestorFrame = p->GetPrimaryFrame();
    }
    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(ancestorFrame->GetContent(), 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) {

Return to bug 907396