Attachment 802681 Details for Bug 907396

[patch] Style system support for display:contents.

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

(hide)

Description:

Filename:

MIME Type:

Creator: Mats Palmgren (inactive)

Size: 5.80 KB

patch

obsolete

># HG changeset patch
># User Mats Palmgren <matspal@gmail.com>
># Date 1378857385 0
>#      Tue Sep 10 23:56:25 2013 +0000
># Node ID 64d3faf98c77ebefdf8aee5a424623630fa653d4
># Parent  d2fcc8dab0f84197dd9b610cbba5ec169744e083
>Bug 907396 - Style system support for display:contents.  r=dbaron
>
>diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h
>--- a/layout/style/nsCSSKeywordList.h
>+++ b/layout/style/nsCSSKeywordList.h
>@@ -218,16 +218,17 @@ CSS_KEY(color, color)
> CSS_KEY(color-burn, color_burn)
> CSS_KEY(color-dodge, color_dodge)
> CSS_KEY(common-ligatures, common_ligatures)
> CSS_KEY(column, column)
> CSS_KEY(column-reverse, column_reverse)
> CSS_KEY(condensed, condensed)
> CSS_KEY(contain, contain)
> CSS_KEY(content-box, content_box)
>+CSS_KEY(contents, contents)
> CSS_KEY(context-menu, context_menu)
> CSS_KEY(continuous, continuous)
> CSS_KEY(contrast, contrast)
> CSS_KEY(copy, copy)
> CSS_KEY(contextual, contextual)
> CSS_KEY(cover, cover)
> CSS_KEY(crop, crop)
> CSS_KEY(cross, cross)
>diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
>--- a/layout/style/nsCSSProps.cpp
>+++ b/layout/style/nsCSSProps.cpp
>@@ -955,16 +955,19 @@ int32_t nsCSSProps::kDisplayKTable[] = {
>   eCSSKeyword__moz_inline_stack,  NS_STYLE_DISPLAY_INLINE_STACK,
>   eCSSKeyword__moz_deck,          NS_STYLE_DISPLAY_DECK,
>   eCSSKeyword__moz_popup,         NS_STYLE_DISPLAY_POPUP,
>   eCSSKeyword__moz_groupbox,      NS_STYLE_DISPLAY_GROUPBOX,
> #endif
>   // The next two entries are controlled by the layout.css.flexbox.enabled pref.
>   eCSSKeyword_flex,               NS_STYLE_DISPLAY_FLEX,
>   eCSSKeyword_inline_flex,        NS_STYLE_DISPLAY_INLINE_FLEX,
>+  // The next entry is controlled by the layout.css.display_contents.enabled
>+  // pref.
>+  eCSSKeyword_contents,           NS_STYLE_DISPLAY_CONTENTS,
>   eCSSKeyword_UNKNOWN,-1
> };
> 
> const int32_t nsCSSProps::kEmptyCellsKTable[] = {
>   eCSSKeyword_show,                 NS_STYLE_TABLE_EMPTY_CELLS_SHOW,
>   eCSSKeyword_hide,                 NS_STYLE_TABLE_EMPTY_CELLS_HIDE,
>   eCSSKeyword__moz_show_background, NS_STYLE_TABLE_EMPTY_CELLS_SHOW_BACKGROUND,
>   eCSSKeyword_UNKNOWN,-1
>diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
>--- a/layout/style/nsRuleNode.cpp
>+++ b/layout/style/nsRuleNode.cpp
>@@ -5101,16 +5101,31 @@ nsRuleNode::ComputeDisplayData(void* aSt
>     NS_ABORT_IF_FALSE(false, "unrecognized clip unit");
>   }
> 
>   if (display->mDisplay != NS_STYLE_DISPLAY_NONE) {
>     // CSS2 9.7 specifies display type corrections dealing with 'float'
>     // and 'position'.  Since generated content can't be floated or
>     // positioned, we can deal with it here.
> 
>+    if (display->mDisplay == NS_STYLE_DISPLAY_CONTENTS &&
>+        aContext->GetPseudo()) {
>+      // We don't want to create frames for anonymous content using a parent
>+      // frame that is for content above the root of the anon tree.
>+      // (XXX what we realy should check here is not GetPseudo() but if there's
>+      //  a 'content' property value that implies anon content but we can't
>+      //  check that here since that's a different struct(?))
>+      // We might get display:contents to work for CSS_PSEUDO_ELEMENT_CONTAINS_ELEMENTS
>+      // pseudos (:first-letter etc) in the future, but those have a lot of
>+      // special handling in frame construction so they are also unsupported
>+      // for now.
>+      display->mOriginalDisplay = display->mDisplay = NS_STYLE_DISPLAY_INLINE;
>+      canStoreInRuleTree = false;
>+    }
>+
>     if (nsCSSPseudoElements::firstLetter == aContext->GetPseudo()) {
>       // a non-floating first-letter must be inline
>       // XXX this fix can go away once bug 103189 is fixed correctly
>       // Note that we reset mOriginalDisplay to enforce the invariant that it equals mDisplay if we're not positioned or floating.
>       display->mOriginalDisplay = display->mDisplay = NS_STYLE_DISPLAY_INLINE;
> 
>       // We can't cache the data in the rule tree since if a more specific
>       // rule has 'float: left' we'll end up with the wrong 'display'
>diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h
>--- a/layout/style/nsStyleConsts.h
>+++ b/layout/style/nsStyleConsts.h
>@@ -396,16 +396,17 @@ static inline mozilla::css::Side operato
> #define NS_STYLE_DISPLAY_STACK                  24
> #define NS_STYLE_DISPLAY_INLINE_STACK           25
> #define NS_STYLE_DISPLAY_DECK                   26
> #define NS_STYLE_DISPLAY_POPUP                  27
> #define NS_STYLE_DISPLAY_GROUPBOX               28
> #endif
> #define NS_STYLE_DISPLAY_FLEX                   29
> #define NS_STYLE_DISPLAY_INLINE_FLEX            30
>+#define NS_STYLE_DISPLAY_CONTENTS               31
> 
> // See nsStylePosition
> #define NS_STYLE_ALIGN_ITEMS_FLEX_START         0
> #define NS_STYLE_ALIGN_ITEMS_FLEX_END           1
> #define NS_STYLE_ALIGN_ITEMS_CENTER             2
> #define NS_STYLE_ALIGN_ITEMS_BASELINE           3
> #define NS_STYLE_ALIGN_ITEMS_STRETCH            4
> 
>diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
>--- a/layout/style/nsStyleStruct.h
>+++ b/layout/style/nsStyleStruct.h
>@@ -1762,17 +1762,18 @@ struct nsStyleDisplay {
> 
>   static bool IsDisplayTypeInlineOutside(uint8_t aDisplay) {
>     return NS_STYLE_DISPLAY_INLINE == aDisplay ||
>            NS_STYLE_DISPLAY_INLINE_BLOCK == aDisplay ||
>            NS_STYLE_DISPLAY_INLINE_TABLE == aDisplay ||
>            NS_STYLE_DISPLAY_INLINE_BOX == aDisplay ||
>            NS_STYLE_DISPLAY_INLINE_FLEX == aDisplay ||
>            NS_STYLE_DISPLAY_INLINE_GRID == aDisplay ||
>-           NS_STYLE_DISPLAY_INLINE_STACK == aDisplay;
>+           NS_STYLE_DISPLAY_INLINE_STACK == aDisplay ||
>+           NS_STYLE_DISPLAY_CONTENTS == aDisplay;
>   }
> 
>   bool IsInlineOutsideStyle() const {
>     return IsDisplayTypeInlineOutside(mDisplay);
>   }
> 
>   bool IsOriginalDisplayInlineOutsideStyle() const {
>     return IsDisplayTypeInlineOutside(mOriginalDisplay);

Flags:

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