@@ -2489,11 +2489,10 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(RightAlignParagraph)) {
2489
2489
ASSERT_TRUE (paragraph->records_ [0 ].style ().equals (text_style));
2490
2490
ASSERT_DOUBLE_EQ (paragraph->records_ [0 ].offset ().y (), expected_y);
2491
2491
expected_y += 30 ;
2492
- ASSERT_NEAR (
2493
- paragraph->records_ [0 ].offset ().x (),
2494
- paragraph->width_ -
2495
- paragraph->breaker_ .getWidths ()[paragraph->records_ [0 ].line ()],
2496
- 2.0 );
2492
+ ASSERT_NEAR (paragraph->records_ [0 ].offset ().x (),
2493
+ paragraph->width_ -
2494
+ paragraph->line_widths_ [paragraph->records_ [0 ].line ()],
2495
+ 2.0 );
2497
2496
2498
2497
// width_ takes the full available space, while longest_line_ wraps the glyphs
2499
2498
// as tightly as possible. Even though this text is more than one line long,
@@ -2506,37 +2505,33 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(RightAlignParagraph)) {
2506
2505
ASSERT_TRUE (paragraph->records_ [2 ].style ().equals (text_style));
2507
2506
ASSERT_DOUBLE_EQ (paragraph->records_ [2 ].offset ().y (), expected_y);
2508
2507
expected_y += 30 ;
2509
- ASSERT_NEAR (
2510
- paragraph->records_ [2 ].offset ().x (),
2511
- paragraph->width_ -
2512
- paragraph->breaker_ .getWidths ()[paragraph->records_ [2 ].line ()],
2513
- 2.0 );
2508
+ ASSERT_NEAR (paragraph->records_ [2 ].offset ().x (),
2509
+ paragraph->width_ -
2510
+ paragraph->line_widths_ [paragraph->records_ [2 ].line ()],
2511
+ 2.0 );
2514
2512
2515
2513
ASSERT_TRUE (paragraph->records_ [4 ].style ().equals (text_style));
2516
2514
ASSERT_DOUBLE_EQ (paragraph->records_ [4 ].offset ().y (), expected_y);
2517
2515
expected_y += 30 ;
2518
- ASSERT_NEAR (
2519
- paragraph->records_ [4 ].offset ().x (),
2520
- paragraph->width_ -
2521
- paragraph->breaker_ .getWidths ()[paragraph->records_ [4 ].line ()],
2522
- 2.0 );
2516
+ ASSERT_NEAR (paragraph->records_ [4 ].offset ().x (),
2517
+ paragraph->width_ -
2518
+ paragraph->line_widths_ [paragraph->records_ [4 ].line ()],
2519
+ 2.0 );
2523
2520
2524
2521
ASSERT_TRUE (paragraph->records_ [6 ].style ().equals (text_style));
2525
2522
ASSERT_DOUBLE_EQ (paragraph->records_ [6 ].offset ().y (), expected_y);
2526
2523
expected_y += 30 * 10 ;
2527
- ASSERT_NEAR (
2528
- paragraph->records_ [6 ].offset ().x (),
2529
- paragraph->width_ -
2530
- paragraph->breaker_ .getWidths ()[paragraph->records_ [6 ].line ()],
2531
- 2.0 );
2524
+ ASSERT_NEAR (paragraph->records_ [6 ].offset ().x (),
2525
+ paragraph->width_ -
2526
+ paragraph->line_widths_ [paragraph->records_ [6 ].line ()],
2527
+ 2.0 );
2532
2528
2533
2529
ASSERT_TRUE (paragraph->records_ [26 ].style ().equals (text_style));
2534
2530
ASSERT_DOUBLE_EQ (paragraph->records_ [26 ].offset ().y (), expected_y);
2535
- ASSERT_NEAR (
2536
- paragraph->records_ [26 ].offset ().x (),
2537
- paragraph->width_ -
2538
- paragraph->breaker_ .getWidths ()[paragraph->records_ [26 ].line ()],
2539
- 2.0 );
2531
+ ASSERT_NEAR (paragraph->records_ [26 ].offset ().x (),
2532
+ paragraph->width_ -
2533
+ paragraph->line_widths_ [paragraph->records_ [26 ].line ()],
2534
+ 2.0 );
2540
2535
2541
2536
ASSERT_EQ (paragraph_style.text_align ,
2542
2537
paragraph->GetParagraphStyle ().text_align );
@@ -2609,7 +2604,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(CenterAlignParagraph)) {
2609
2604
expected_y += 30 ;
2610
2605
ASSERT_NEAR (paragraph->records_ [0 ].offset ().x (),
2611
2606
(paragraph->width_ -
2612
- paragraph->breaker_ . getWidths () [paragraph->records_ [0 ].line ()]) /
2607
+ paragraph->line_widths_ [paragraph->records_ [0 ].line ()]) /
2613
2608
2 ,
2614
2609
2.0 );
2615
2610
@@ -2618,7 +2613,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(CenterAlignParagraph)) {
2618
2613
expected_y += 30 ;
2619
2614
ASSERT_NEAR (paragraph->records_ [2 ].offset ().x (),
2620
2615
(paragraph->width_ -
2621
- paragraph->breaker_ . getWidths () [paragraph->records_ [2 ].line ()]) /
2616
+ paragraph->line_widths_ [paragraph->records_ [2 ].line ()]) /
2622
2617
2 ,
2623
2618
2.0 );
2624
2619
@@ -2627,7 +2622,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(CenterAlignParagraph)) {
2627
2622
expected_y += 30 ;
2628
2623
ASSERT_NEAR (paragraph->records_ [4 ].offset ().x (),
2629
2624
(paragraph->width_ -
2630
- paragraph->breaker_ . getWidths () [paragraph->records_ [4 ].line ()]) /
2625
+ paragraph->line_widths_ [paragraph->records_ [4 ].line ()]) /
2631
2626
2 ,
2632
2627
2.0 );
2633
2628
@@ -2636,18 +2631,17 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(CenterAlignParagraph)) {
2636
2631
expected_y += 30 * 10 ;
2637
2632
ASSERT_NEAR (paragraph->records_ [6 ].offset ().x (),
2638
2633
(paragraph->width_ -
2639
- paragraph->breaker_ . getWidths () [paragraph->records_ [6 ].line ()]) /
2634
+ paragraph->line_widths_ [paragraph->records_ [6 ].line ()]) /
2640
2635
2 ,
2641
2636
2.0 );
2642
2637
2643
2638
ASSERT_TRUE (paragraph->records_ [26 ].style ().equals (text_style));
2644
2639
ASSERT_DOUBLE_EQ (paragraph->records_ [26 ].offset ().y (), expected_y);
2645
- ASSERT_NEAR (
2646
- paragraph->records_ [26 ].offset ().x (),
2647
- (paragraph->width_ -
2648
- paragraph->breaker_ .getWidths ()[paragraph->records_ [26 ].line ()]) /
2649
- 2 ,
2650
- 2.0 );
2640
+ ASSERT_NEAR (paragraph->records_ [26 ].offset ().x (),
2641
+ (paragraph->width_ -
2642
+ paragraph->line_widths_ [paragraph->records_ [26 ].line ()]) /
2643
+ 2 ,
2644
+ 2.0 );
2651
2645
2652
2646
ASSERT_EQ (paragraph_style.text_align ,
2653
2647
paragraph->GetParagraphStyle ().text_align );
0 commit comments