Attachment 8392920 Details for Bug 907396

[patch] Don't assert about restyling non-elements directly when they are display:contents children.

907396-display-contents-tweak-non-element-restyle-assertion (text/plain), 2.19 KB, created by Mats Palmgren (inactive)

(hide)

Description:

Filename:

MIME Type:

Creator: Mats Palmgren (inactive)

Size: 2.19 KB

patch

obsolete

># HG changeset patch
># Parent bda94b77425d68b0fc197c7bfbd89708024f48f9
># User Mats Palmgren <matspal@gmail.com>
>Bug 907396 - Don't assert about restyling non-elements directly when they are display:contents children.  r=bzbarsky
>
>diff --git a/layout/base/nsStyleChangeList.cpp b/layout/base/nsStyleChangeList.cpp
>--- a/layout/base/nsStyleChangeList.cpp
>+++ b/layout/base/nsStyleChangeList.cpp
>@@ -5,16 +5,18 @@
> 
> /*
>  * a list of the recomputation that needs to be done in response to a
>  * style change
>  */
> 
> #include "nsStyleChangeList.h"
> #include "nsIContent.h"
>+#include "nsIFrame.h"
>+#include "nsFrameManager.h"
> 
> static const uint32_t kGrowArrayBy = 10;
> 
> nsStyleChangeList::nsStyleChangeList()
>   : mArray(mBuffer),
>     mArraySize(kStyleChangeBufferSize),
>     mCount(0)
> {
>@@ -53,18 +55,22 @@ nsStyleChangeList::ChangeAt(int32_t aInd
> nsresult 
> nsStyleChangeList::AppendChange(nsIFrame* aFrame, nsIContent* aContent, nsChangeHint aHint)
> {
>   NS_ASSERTION(aFrame || (aHint & nsChangeHint_ReconstructFrame),
>                "must have frame");
>   NS_ASSERTION(aContent || !(aHint & nsChangeHint_ReconstructFrame),
>                "must have content");
>   // XXXbz we should make this take Element instead of nsIContent
>-  NS_ASSERTION(!aContent || aContent->IsElement(),
>-               "Shouldn't be trying to restyle non-elements directly");
>+  NS_ASSERTION(!aContent || aContent->IsElement() ||
>+               // display:contents elements posts the changes for their children:
>+               (aFrame && aContent->GetParent() &&
>+                aFrame->PresContext()->FrameManager()->GetDisplayContents(aContent->GetParent())),
>+               "Shouldn't be trying to restyle non-elements directly, "
>+               "except if it's a display:contents child");
>   NS_ASSERTION(!(aHint & nsChangeHint_AllReflowHints) ||
>                (aHint & nsChangeHint_NeedReflow),
>                "Reflow hint bits set without actually asking for a reflow");
> 
>   if ((0 < mCount) && (aHint & nsChangeHint_ReconstructFrame)) { // filter out all other changes for same content
>     if (aContent) {
>       for (int32_t index = mCount - 1; index >= 0; --index) {
>         if (aContent == mArray[index].mContent) { // remove this change

Flags:

MatsPalmgren_bugz: 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