Changeset 234500 in webkit


Ignore:
Timestamp:
Aug 2, 2018 8:01:48 AM (6 years ago)
Author:
Alan Bujtas
Message:

[LFC][Floating] Do not pass formatting root to FloatingContext
https://bugs.webkit.org/show_bug.cgi?id=188257

Reviewed by Antti Koivisto.

If we ever need it, we can get it from FloatingState.

  • layout/FloatingContext.cpp:

(WebCore::Layout::FloatingContext::FloatingContext):

  • layout/FloatingContext.h:
  • layout/blockformatting/BlockFormattingContext.cpp:

(WebCore::Layout::BlockFormattingContext::layout const):

Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r234499 r234500  
     12018-08-02  Zalan Bujtas  <zalan@apple.com>
     2
     3        [LFC][Floating] Do not pass formatting root to FloatingContext
     4        https://bugs.webkit.org/show_bug.cgi?id=188257
     5
     6        Reviewed by Antti Koivisto.
     7
     8        If we ever need it, we can get it from FloatingState.
     9
     10        * layout/FloatingContext.cpp:
     11        (WebCore::Layout::FloatingContext::FloatingContext):
     12        * layout/FloatingContext.h:
     13        * layout/blockformatting/BlockFormattingContext.cpp:
     14        (WebCore::Layout::BlockFormattingContext::layout const):
     15
    1162018-08-01  Zalan Bujtas  <zalan@apple.com>
    217
  • trunk/Source/WebCore/layout/FloatingContext.cpp

    r234499 r234500  
    111111}
    112112
    113 FloatingContext::FloatingContext(const Container& formattingContextRoot, FloatingState& floatingState)
    114     : m_formattingContextRoot(formattingContextRoot)
    115     , m_floatingState(floatingState)
    116 {
    117     ASSERT(m_formattingContextRoot.establishesFormattingContext());
     113FloatingContext::FloatingContext(FloatingState& floatingState)
     114    : m_floatingState(floatingState)
     115{
    118116}
    119117
  • trunk/Source/WebCore/layout/FloatingContext.h

    r234499 r234500  
    4646    WTF_MAKE_ISO_ALLOCATED(FloatingContext);
    4747public:
    48     FloatingContext(const Container& formattingContextRoot, FloatingState&);
     48    FloatingContext(FloatingState&);
    4949
    5050    FloatingState& floatingState() const { return m_floatingState; }
     
    6262    Position toContainingBlock(const FloatingState::FloatItem&, Position) const;
    6363
    64     const Container& m_formattingContextRoot;
    6564    FloatingState& m_floatingState;
    6665};
  • trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp

    r234423 r234500  
    6363    auto& formattingRoot = downcast<Container>(root());
    6464    LayoutQueue layoutQueue;
    65     FloatingContext floatingContext(formattingRoot, formattingState.floatingState());
     65    FloatingContext floatingContext(formattingState.floatingState());
    6666    // This is a post-order tree traversal layout.
    6767    // The root container layout is done in the formatting context it lives in, not that one it creates, so let's start with the first child.
Note: See TracChangeset for help on using the changeset viewer.