Attachment 808137 Details for Bug 917313

[patch] Additional changes to implement the 'box' property.

917313-css-box-prop-Layout-2 (text/plain), 3.90 KB, created by Mats Palmgren (inactive)

(hide)

Description:

Filename:

MIME Type:

Creator: Mats Palmgren (inactive)

Size: 3.90 KB

patch

obsolete

># HG changeset patch
># Parent 6047434681fe482b2d77df3b0e1085f1c74aa25d
># User Mats Palmgren <matspal@gmail.com>
>Bug 917313 - Implement CSS 'box' property.  Additional changes to implement the 'box' property.  r=bzbarsky
>
>diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp
>--- a/editor/libeditor/base/nsEditor.cpp
>+++ b/editor/libeditor/base/nsEditor.cpp
>@@ -3531,24 +3531,24 @@ IsElementVisible(dom::Element* aElement)
> 
>       // Otherwise, we might end up with a frame when that lazy bit is
>       // processed.  Figure out our actual style.
>       break;
>     }
>   }
> 
>   // Now it might be that we have no frame because we're in a
>-  // display:none subtree, or it might be that we're just dealing with
>+  // box:none subtree, or it might be that we're just dealing with
>   // lazy frame construction and it hasn't happened yet.  Check which
>   // one it is.
>   nsRefPtr<nsStyleContext> styleContext =
>     nsComputedDOMStyle::GetStyleContextForElementNoFlush(aElement,
>                                                          nullptr, nullptr);
>   if (styleContext) {
>-    return styleContext->StyleDisplay()->mDisplay != NS_STYLE_DISPLAY_NONE;
>+    return styleContext->StyleDisplay()->mBox != NS_STYLE_BOX_NONE;
>   }
>   return false;
> }
> 
> bool 
> nsEditor::IsEditable(nsIDOMNode *aNode)
> {
>   nsCOMPtr<nsIContent> content = do_QueryInterface(aNode);
>diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
>--- a/layout/base/nsCSSFrameConstructor.cpp
>+++ b/layout/base/nsCSSFrameConstructor.cpp
>@@ -2282,17 +2282,17 @@ nsCSSFrameConstructor::ConstructDocEleme
> 
> #ifdef DEBUG
>   NS_ASSERTION(!display->IsScrollableOverflow() || 
>                state.mPresContext->IsPaginated() ||
>                propagatedScrollFrom == aDocElement,
>                "Scrollbars should have been propagated to the viewport");
> #endif
> 
>-  if (MOZ_UNLIKELY(display->mDisplay == NS_STYLE_DISPLAY_NONE)) {
>+  if (MOZ_UNLIKELY(display->mBox == NS_STYLE_BOX_NONE)) {
>     SetUndisplayedContent(aDocElement, styleContext);
>     return nullptr;
>   }
> 
>   TreeMatchContext::AutoAncestorPusher
>     ancestorPusher(true, state.mTreeMatchContext, aDocElement);
> 
>   // Make sure to start any background image loads for the root element now.
>@@ -5152,19 +5152,18 @@ nsCSSFrameConstructor::AddFrameConstruct
>       aStyleContext = styleContext;
>     }
> 
>     aTag = mDocument->BindingManager()->ResolveTag(aContent, &aNameSpaceID);
>   }
> 
>   bool isGeneratedContent = ((aFlags & ITEM_IS_GENERATED_CONTENT) != 0);
> 
>-  // Pre-check for display "none" - if we find that, don't create
>-  // any frame at all
>-  if (NS_STYLE_DISPLAY_NONE == display->mDisplay) {
>+  // Pre-check for box:none - if we find that, don't create any frame at all.
>+  if (NS_STYLE_BOX_NONE == display->mBox) {
>     SetAsUndisplayedContent(aItems, aContent, styleContext, isGeneratedContent);
>     return;
>   }
> 
>   bool isText = !aContent->IsElement();
> 
>   // never create frames for non-option/optgroup kids of <select> and
>   // non-option kids of <optgroup> inside a <select>.
>@@ -10192,21 +10191,19 @@ nsCSSFrameConstructor::CreateListBoxCont
>                                   mTempFrameTreeState);
> 
>     // If we ever initialize the ancestor filter on |state|, make sure
>     // to push the right parent!
> 
>     nsRefPtr<nsStyleContext> styleContext;
>     styleContext = ResolveStyleContext(aParentFrame, aChild, &state);
> 
>-    // Pre-check for display "none" - only if we find that, do we create
>-    // any frame at all
>+    // Pre-check for box:none - if we find that, don't create any frame at all.
>     const nsStyleDisplay* display = styleContext->StyleDisplay();
>-
>-    if (NS_STYLE_DISPLAY_NONE == display->mDisplay) {
>+    if (NS_STYLE_BOX_NONE == display->mBox) {
>       *aNewFrame = nullptr;
>       return NS_OK;
>     }
> 
>     BeginUpdate();
> 
>     FrameConstructionItemList items;
>     AddFrameConstructionItemsInternal(state, aChild, aParentFrame,

Flags:

bzbarsky: review+

Actions: View | Diff | Review

Attachments on bug 917313: 808133 | 808134 | 808135 | 808136 | 808137 | 808138 | 808139 | 808140 | 808141 | 8392956 | 8392961 | 8392963 | 8392965 | 8392966 | 8392967 | 8392971 | 8392972 | 8392973 | 8392975