Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(978)

Side by Side Diff: Source/core/layout/LayoutState.h

Issue 1021143004: [New Multicolumn] Don't return the wrong flow thread from locateFlowThreadContainingBlock(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutListItem.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 LayoutUnit pageLogicalHeight() const { return m_pageLogicalHeight; } 68 LayoutUnit pageLogicalHeight() const { return m_pageLogicalHeight; }
69 bool pageLogicalHeightChanged() const { return m_pageLogicalHeightChanged; } 69 bool pageLogicalHeightChanged() const { return m_pageLogicalHeightChanged; }
70 bool containingBlockLogicalWidthChanged() const { return m_containingBlockLo gicalWidthChanged; } 70 bool containingBlockLogicalWidthChanged() const { return m_containingBlockLo gicalWidthChanged; }
71 71
72 LayoutState* next() const { return m_next; } 72 LayoutState* next() const { return m_next; }
73 73
74 bool needsBlockDirectionLocationSetBeforeLayout() const { return m_isPaginat ed && m_pageLogicalHeight; } 74 bool needsBlockDirectionLocationSetBeforeLayout() const { return m_isPaginat ed && m_pageLogicalHeight; }
75 75
76 LayoutFlowThread* flowThread() const { return m_flowThread; } 76 LayoutFlowThread* flowThread() const { return m_flowThread; }
77 77
78 // Used to temporarily set m_flowThread to nullptr. Needed because of crbug. com/370461 (list item markers).
79 void setFlowThread(LayoutFlowThread* flowThread) { m_flowThread = flowThread ; }
80
78 ColumnInfo* columnInfo() const { return m_columnInfo; } 81 ColumnInfo* columnInfo() const { return m_columnInfo; }
79 82
80 LayoutObject& layoutObject() const { return m_renderer; } 83 LayoutObject& layoutObject() const { return m_renderer; }
81 84
82 private: 85 private:
83 friend class ForceHorriblySlowRectMapping; 86 friend class ForceHorriblySlowRectMapping;
84 87
85 // Do not add anything apart from bitfields until after m_columnInfo. See ht tps://bugs.webkit.org/show_bug.cgi?id=100173 88 // Do not add anything apart from bitfields until after m_columnInfo. See ht tps://bugs.webkit.org/show_bug.cgi?id=100173
86 bool m_isPaginated : 1; 89 bool m_isPaginated : 1;
87 // If our page height has changed, this will force all blocks to relayout. 90 // If our page height has changed, this will force all blocks to relayout.
(...skipping 13 matching lines...) Expand all
101 LayoutUnit m_pageLogicalHeight; 104 LayoutUnit m_pageLogicalHeight;
102 // The offset of the start of the first page in the nearest enclosing pagina tion model. 105 // The offset of the start of the first page in the nearest enclosing pagina tion model.
103 LayoutSize m_pageOffset; 106 LayoutSize m_pageOffset;
104 107
105 LayoutObject& m_renderer; 108 LayoutObject& m_renderer;
106 }; 109 };
107 110
108 } // namespace blink 111 } // namespace blink
109 112
110 #endif // LayoutState_h 113 #endif // LayoutState_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutListItem.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698