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

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h

Issue 2668183003: [LayoutNG] Make NG algorithms non-oilpan. (Closed)
Patch Set: fix win compile 2? Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
index daf2b69724259af6471cea58bdf145119e1ae215..f3d104037a26411a5a8b11b4c076d49ab2c74e48 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
@@ -8,6 +8,8 @@
#include "core/CoreExport.h"
#include "core/layout/ng/ng_block_node.h"
#include "core/layout/ng/ng_box_fragment.h"
+#include "core/layout/ng/ng_break_token.h"
+#include "core/layout/ng/ng_column_mapper.h"
#include "core/layout/ng/ng_layout_algorithm.h"
#include "core/layout/ng/ng_units.h"
#include "wtf/RefPtr.h"
@@ -16,8 +18,6 @@ namespace blink {
class ComputedStyle;
class NGBlockBreakToken;
-class NGBreakToken;
-class NGColumnMapper;
class NGConstraintSpace;
class NGConstraintSpaceBuilder;
class NGFragment;
@@ -44,8 +44,6 @@ class CORE_EXPORT NGBlockLayoutAlgorithm : public NGLayoutAlgorithm {
bool ComputeMinAndMaxContentSizes(MinAndMaxContentSizes*) const override;
NGPhysicalFragment* Layout() override;
- DECLARE_VIRTUAL_TRACE();
-
private:
NGBoxStrut CalculateMargins(const NGConstraintSpace& space,
const ComputedStyle& style);
@@ -123,21 +121,21 @@ class CORE_EXPORT NGBlockLayoutAlgorithm : public NGLayoutAlgorithm {
RefPtr<const ComputedStyle> style_;
- Member<NGBlockNode> first_child_;
- Member<NGConstraintSpace> constraint_space_;
+ Persistent<NGBlockNode> first_child_;
+ Persistent<NGConstraintSpace> constraint_space_;
// The break token from which we are currently resuming layout.
- Member<NGBreakToken> break_token_;
+ Persistent<NGBreakToken> break_token_;
- Member<NGFragmentBuilder> builder_;
- Member<NGConstraintSpaceBuilder> space_builder_;
- Member<NGConstraintSpace> space_for_current_child_;
- Member<NGBlockNode> current_child_;
+ Persistent<NGFragmentBuilder> builder_;
+ Persistent<NGConstraintSpaceBuilder> space_builder_;
+ Persistent<NGConstraintSpace> space_for_current_child_;
+ Persistent<NGBlockNode> current_child_;
// Mapper from the fragmented flow coordinate space coordinates to visual
// coordinates. Only set on fragmentation context roots, such as multicol
// containers. Keeps track of the current fragmentainer.
- Member<NGColumnMapper> fragmentainer_mapper_;
+ Persistent<NGColumnMapper> fragmentainer_mapper_;
NGBoxStrut border_and_padding_;
LayoutUnit content_size_;
« no previous file with comments | « third_party/WebKit/Source/core/layout/BUILD.gn ('k') | third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698