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

Side by Side Diff: third_party/WebKit/Source/core/layout/ng/ng_line_builder.cc

Issue 2723023003: Revert of [LayoutNG] Move remaining ng_units structs to their own files (Closed)
Patch Set: Created 3 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/layout/ng/ng_line_builder.h" 5 #include "core/layout/ng/ng_line_builder.h"
6 6
7 #include "core/layout/BidiRun.h" 7 #include "core/layout/BidiRun.h"
8 #include "core/layout/LayoutBlockFlow.h" 8 #include "core/layout/LayoutBlockFlow.h"
9 #include "core/layout/line/LineInfo.h" 9 #include "core/layout/line/LineInfo.h"
10 #include "core/layout/line/RootInlineBox.h" 10 #include "core/layout/line/RootInlineBox.h"
11 #include "core/layout/ng/ng_bidi_paragraph.h" 11 #include "core/layout/ng/ng_bidi_paragraph.h"
12 #include "core/layout/ng/ng_constraint_space.h" 12 #include "core/layout/ng/ng_constraint_space.h"
13 #include "core/layout/ng/ng_fragment_builder.h" 13 #include "core/layout/ng/ng_fragment_builder.h"
14 #include "core/layout/ng/ng_inline_node.h" 14 #include "core/layout/ng/ng_inline_node.h"
15 #include "core/layout/ng/ng_length_utils.h" 15 #include "core/layout/ng/ng_length_utils.h"
16 #include "core/layout/ng/ng_text_fragment.h" 16 #include "core/layout/ng/ng_text_fragment.h"
17 #include "core/layout/ng/ng_units.h"
17 #include "core/style/ComputedStyle.h" 18 #include "core/style/ComputedStyle.h"
18 #include "platform/text/BidiRunList.h" 19 #include "platform/text/BidiRunList.h"
19 20
20 namespace blink { 21 namespace blink {
21 22
22 NGLineBuilder::NGLineBuilder(NGInlineNode* inline_box, 23 NGLineBuilder::NGLineBuilder(NGInlineNode* inline_box,
23 const NGConstraintSpace* constraint_space) 24 const NGConstraintSpace* constraint_space)
24 : inline_box_(inline_box), 25 : inline_box_(inline_box),
25 constraint_space_(constraint_space), 26 constraint_space_(constraint_space),
26 baseline_type_(constraint_space->WritingMode() == 27 baseline_type_(constraint_space->WritingMode() ==
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 baseline_position + LayoutUnit(line_box_data.max_descent), 404 baseline_position + LayoutUnit(line_box_data.max_descent),
404 line_box_data.top_with_leading, 405 line_box_data.top_with_leading,
405 baseline_position + LayoutUnit(line_box_data.max_descent_and_leading)); 406 baseline_position + LayoutUnit(line_box_data.max_descent_and_leading));
406 407
407 bidi_runs.deleteRuns(); 408 bidi_runs.deleteRuns();
408 fragments_for_bidi_runs.clear(); 409 fragments_for_bidi_runs.clear();
409 } 410 }
410 } 411 }
411 412
412 } // namespace blink 413 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698