Changeset 234500 in webkit
- Timestamp:
- Aug 2, 2018 8:01:48 AM (6 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r234499 r234500 1 2018-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 1 16 2018-08-01 Zalan Bujtas <zalan@apple.com> 2 17 -
trunk/Source/WebCore/layout/FloatingContext.cpp
r234499 r234500 111 111 } 112 112 113 FloatingContext::FloatingContext(const Container& formattingContextRoot, FloatingState& floatingState) 114 : m_formattingContextRoot(formattingContextRoot) 115 , m_floatingState(floatingState) 116 { 117 ASSERT(m_formattingContextRoot.establishesFormattingContext()); 113 FloatingContext::FloatingContext(FloatingState& floatingState) 114 : m_floatingState(floatingState) 115 { 118 116 } 119 117 -
trunk/Source/WebCore/layout/FloatingContext.h
r234499 r234500 46 46 WTF_MAKE_ISO_ALLOCATED(FloatingContext); 47 47 public: 48 FloatingContext( const Container& formattingContextRoot,FloatingState&);48 FloatingContext(FloatingState&); 49 49 50 50 FloatingState& floatingState() const { return m_floatingState; } … … 62 62 Position toContainingBlock(const FloatingState::FloatItem&, Position) const; 63 63 64 const Container& m_formattingContextRoot;65 64 FloatingState& m_floatingState; 66 65 }; -
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
r234423 r234500 63 63 auto& formattingRoot = downcast<Container>(root()); 64 64 LayoutQueue layoutQueue; 65 FloatingContext floatingContext(formatting Root, formattingState.floatingState());65 FloatingContext floatingContext(formattingState.floatingState()); 66 66 // This is a post-order tree traversal layout. 67 67 // 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.