Index: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h |
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h |
index 58040acb597a553a45bf8647c26a26e971e7c871..45ffd525f81b39a38666b1865c5fbd5236300c82 100644 |
--- a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h |
+++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h |
@@ -16,10 +16,10 @@ |
namespace blink { |
typedef const NGConstraintSpace NGLayoutOpportunity; |
Gleb Lanbin
2016/10/21 21:06:58
change
typedef const NGConstraintSpace NGLayoutOpp
ikilpatrick
2016/10/21 21:45:27
Done.
|
-typedef HeapVector<Member<const NGLayoutOpportunity>> NGLayoutOpportunities; |
+typedef Vector<NGLogicalRect> NGLayoutOpportunities; |
Gleb Lanbin
2016/10/21 21:06:58
typedef Vector<const NGLayoutOpportunity> NGLayout
ikilpatrick
2016/10/21 21:45:27
Done.
|
class CORE_EXPORT NGLayoutOpportunityIterator final |
- : public GarbageCollected<NGLayoutOpportunityIterator> { |
+ : public GarbageCollectedFinalized<NGLayoutOpportunityIterator> { |
public: |
NGLayoutOpportunityIterator(NGConstraintSpace* space, |
unsigned clear, |
@@ -27,11 +27,10 @@ class CORE_EXPORT NGLayoutOpportunityIterator final |
// Gets the next Layout Opportunity or nullptr if the search is exhausted. |
// TODO(chrome-layout-team): Refactor with using C++ <iterator> library. |
- NGLayoutOpportunity* Next(); |
+ const NGLogicalRect* Next(); |
DEFINE_INLINE_VIRTUAL_TRACE() { |
visitor->trace(constraint_space_); |
- visitor->trace(opportunities_); |
visitor->trace(opportunity_tree_root_); |
} |
@@ -39,7 +38,7 @@ class CORE_EXPORT NGLayoutOpportunityIterator final |
Member<NGConstraintSpace> constraint_space_; |
NGLayoutOpportunities opportunities_; |
- Vector<Member<NGLayoutOpportunity>>::const_iterator opportunity_iter_; |
+ NGLayoutOpportunities::const_iterator opportunity_iter_; |
Member<NGLayoutOpportunityTreeNode> opportunity_tree_root_; |
}; |