Start implementing text in layout 2020 #24822

nox · 2019-11-21T16:32:27Z

No description provided.

highfive · 2019-11-21T16:32:33Z

Heads up! This PR modifies the following files:

@emilio: components/style/properties/longhands/inherited_text.mako.rs

highfive · 2019-11-21T16:32:35Z

Warning

These commits modify style and gfx code, but no tests are modified. Please consider adding a test!

nox · 2019-11-21T18:22:22Z

Forgot to git add file, a classic.

jdm · 2019-11-21T18:42:27Z

./components/layout_2020/text.rs:1: incorrect license

nox · 2019-11-21T18:48:43Z

Fixed now, and I ran test-tidy again to make sure.

nox · 2019-11-22T09:10:34Z

r? @SimonSapin

CYBAI · 2019-11-22T10:25:00Z

👀

Diff in /repo/components/layout_2020/flow/inline.rs at line 291:
 impl TextRun {
     fn layout(&self, layout_context: &LayoutContext, ifc: &mut InlineFormattingContextState) {
         use gfx::font::{ShapingFlags, ShapingOptions};
-        use style::values::generics::text::LineHeight;
         use style::computed_values::text_rendering::T as TextRendering;
         use style::computed_values::word_break::T as WordBreak;
+        use style::values::generics::text::LineHeight;
 
         let font_style = self.parent_style.clone_font();
         let inherited_text_style = self.parent_style.get_inherited_text();
Diff in /repo/components/layout_2020/flow/inline.rs at line 336:
                     &mut None,
                 );
 
-                (font.metrics.ascent, font.metrics.line_gap, font.font_key, glyph_runs)
+                (
+                    font.metrics.ascent,
+                    font.metrics.line_gap,
+                    font.font_key,
+                    glyph_runs,
+                )
             });
 
         let font_size = self.parent_style.get_font().font_size.size.0;
clang-format not installed. Skipping CPP formatting.
Run `./mach fmt` to fix the formatting

nox · 2019-11-22T10:34:49Z

Oops. Fixed.

components/layout_2020/context.rs

components/gfx/text/glyph.rs

components/style/properties/longhands/box.mako.rs

components/style/properties/longhands/font.mako.rs

SimonSapin · 2019-11-22T20:47:32Z

components/layout_2020/text.rs

+#[derive(Clone)]
+pub struct ShapedSegment {
+    pub(crate) font_key: FontInstanceKey,
+    pub(crate) glyph_runs: Vec<Arc<GlyphStore>>,


"Segment" and "run" are somewhat interchangeable in my mind. What’s the terminology here? What does it mean to have multiple runs per segment? Since there is only one font key per segment, I assume we also have multiple segments per DOM text node.

multiple segments per DOM text node

Though maybe not yet if we don’t do font fallback? Either way, could we unify the segment and (glyph) run concepts with each other? (And maybe with flow::inline::TextRun?)

I kinda want to remove ShapedSegment altogether, yeah.

Removing an unnecessary abstraction sounds great! 👍

components/layout_2020/flow/inline.rs

nox

I addressed all the comments. ShapedSegment and its containing module are both gone now.

components/gfx/text/glyph.rs

components/layout_2020/context.rs

components/layout_2020/flow/inline.rs

nox · 2019-11-25T09:22:27Z

components/layout_2020/text.rs

+#[derive(Clone)]
+pub struct ShapedSegment {
+    pub(crate) font_key: FontInstanceKey,
+    pub(crate) glyph_runs: Vec<Arc<GlyphStore>>,


I kinda want to remove ShapedSegment altogether, yeah.

components/style/properties/longhands/box.mako.rs

components/style/properties/longhands/font.mako.rs

SimonSapin · 2019-11-25T09:52:44Z

components/layout_2020/text.rs

+#[derive(Clone)]
+pub struct ShapedSegment {
+    pub(crate) font_key: FontInstanceKey,
+    pub(crate) glyph_runs: Vec<Arc<GlyphStore>>,


Removing an unnecessary abstraction sounds great! 👍


        Pass a LayoutContext to TextRun::layout in 2020


        Properly use STYLE_THREAD_POOL in layout 2020


        Introduce GlyphStore::total_advance


        Make floats not parse on layout 2020


        Start implementing text in layout 2020


        Support line_height better in layout 2020

SimonSapin · 2019-11-25T09:59:13Z

@bors-servo r+

SimonSapin · 2019-11-25T12:08:49Z

@bors-servo retry #24726

bors-servo · 2019-11-25T12:08:54Z

⌛ Testing commit 85b2a4d with merge fa37d21...


        Auto merge of #24822 - servo:fontcontext, r=SimonSapin

Start implementing text in layout 2020

bors-servo · 2019-11-25T12:29:56Z

💔 Test failed - status-taskcluster

SimonSapin · 2019-11-25T12:39:59Z

@bors-servo retry

  ▶ CRASH [expected OK] /xhr/send-entity-body-document.htm

  │ 
  │ 
  │ 
  │ 
  │ Failed to receive a response from live font cache (thread LayoutThread PipelineId { namespace_id: PipelineNamespaceId(2), index: PipelineIndex(9) }, at components/gfx/font_cache_thread.rs:516)
  │ stack backtrace:
  │    0: servo::main::{{closure}}
  │    1: std::panicking::rust_panic_with_hook
  │              at src/libstd/panicking.rs:468
  │    2: std::panicking::begin_panic
  │    3: <gfx::font_cache_thread::FontCacheThread as gfx::font_context::FontSource>::get_font_instance
  │    4: gfx::font_context::FontContext<S>::font
  │    5: core::ops::function::impls::<impl core::ops::function::FnMut<A> for &mut F>::call_mut
  │    6: <core::iter::adapters::chain::Chain<A,B> as core::iter::traits::iterator::Iterator>::try_fold
  │    7: gfx::font::FontGroup::find_by_codepoint
  │    8: layout::text::TextRunScanner::scan_for_runs
  │    9: std::thread::local::LocalKey<T>::with
  │   10: layout::construct::FlowConstructor<ConcreteThreadSafeLayoutNode>::build_flow_for_block_starting_with_fragments
  │   11: layout::construct::FlowConstructor<ConcreteThreadSafeLayoutNode>::build_flow_for_block_like
  │   12: layout::construct::FlowConstructor<ConcreteThreadSafeLayoutNode>::build_flow_for_block
  │   13: <layout::construct::FlowConstructor<ConcreteThreadSafeLayoutNode> as layout::traversal::PostorderNodeMutTraversal<ConcreteThreadSafeLayoutNode>>::process
  │   14: style::traversal::DomTraversal::handle_postorder_traversal
  │   15: style::driver::traverse_dom
  │   16: profile_traits::time::profile
  │   17: layout_thread::LayoutThread::handle_reflow
  │   18: profile_traits::time::profile
  │   19: layout_thread::LayoutThread::handle_request_helper
  │   20: layout_thread::LayoutThread::start
  │   21: profile_traits::mem::ProfilerChan::run_with_memory_reporting
  │   22: std::sys_common::backtrace::__rust_begin_short_backtrace
  │   23: _ZN3std9panicking3try7do_call17h310e2d87e8030445E.llvm.4992153416396273530
  │   24: __rust_maybe_catch_panic
  │              at src/libpanic_unwind/lib.rs:81
  │   25: core::ops::function::FnOnce::call_once{{vtable.shim}}
  │   26: <alloc::boxed::Box<F> as core::ops::function::FnOnce<A>>::call_once
  │              at /rustc/1bd30ce2aac40c7698aa4a1b9520aa649ff2d1c5/src/liballoc/boxed.rs:942

bors-servo · 2019-11-25T12:40:04Z

⌛ Testing commit 85b2a4d with merge b69e414...


        Auto merge of #24822 - servo:fontcontext, r=SimonSapin

Start implementing text in layout 2020

bors-servo · 2019-11-25T13:01:30Z

💔 Test failed - status-taskcluster

CYBAI · 2019-11-25T13:06:59Z

@bors-servo retry

#24855

bors-servo · 2019-11-25T13:07:04Z

⌛ Testing commit 85b2a4d with merge a562808...


        Auto merge of #24822 - servo:fontcontext, r=SimonSapin

Start implementing text in layout 2020

bors-servo · 2019-11-25T13:28:59Z

☀️ Test successful - status-taskcluster
Approved by: SimonSapin
Pushing a562808 to master...

highfive assigned asajeffrey Nov 21, 2019

highfive added the S-awaiting-review label Nov 21, 2019

nox force-pushed the fontcontext branch from 63a0a0f to 5e3597e Nov 21, 2019

nox force-pushed the fontcontext branch from 5e3597e to 322c79d Nov 21, 2019

nox force-pushed the fontcontext branch from 322c79d to ae56351 Nov 22, 2019

highfive assigned SimonSapin and unassigned asajeffrey Nov 22, 2019

nox force-pushed the fontcontext branch from ab555bc to 7a6b137 Nov 22, 2019

SimonSapin approved these changes Nov 22, 2019

View changes

nox force-pushed the fontcontext branch from 7a6b137 to bf0320c Nov 25, 2019

nox reviewed Nov 25, 2019

View changes

nox force-pushed the fontcontext branch from bf0320c to 9f8d659 Nov 25, 2019

SimonSapin reviewed Nov 25, 2019

View changes

SimonSapin approved these changes Nov 25, 2019

View changes

nox added 6 commits Nov 12, 2019

Pass a LayoutContext to TextRun::layout in 2020

1446756

Properly use STYLE_THREAD_POOL in layout 2020

6f49dc2

Introduce GlyphStore::total_advance

a5e55dd

Make floats not parse on layout 2020

7e143c7

Start implementing text in layout 2020

b3d30d2

Support line_height better in layout 2020

Loading status checks…

85b2a4d

nox force-pushed the fontcontext branch from 9f8d659 to 85b2a4d Nov 25, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Nov 25, 2019

highfive added S-awaiting-merge and removed S-tests-failed labels Nov 25, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Nov 25, 2019

highfive added S-awaiting-merge and removed S-tests-failed labels Nov 25, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Nov 25, 2019

highfive added S-awaiting-merge and removed S-tests-failed labels Nov 25, 2019

bors-servo merged commit 85b2a4d into master Nov 25, 2019
2 checks passed

2 checks passed

Community-TC (pull_request) TaskGroup: success
Details

homu Test successful
Details

bors-servo deleted the fontcontext branch Nov 25, 2019

highfive removed the S-awaiting-merge label Nov 25, 2019

SimonSapin mentioned this pull request Dec 3, 2019

Meta: https://servo.org in Layout 2020 #25041

Closed

3 of 8 tasks complete

SimonSapin added the A-layout/2020 label Dec 6, 2019

SimonSapin added this to Done / resolved in Layout 2020 Dec 6, 2019

servo / servo

Start implementing text in layout 2020 #24822

Start implementing text in layout 2020 #24822

nox commented Nov 21, 2019

highfive commented Nov 21, 2019

highfive commented Nov 21, 2019

nox commented Nov 21, 2019

jdm commented Nov 21, 2019

nox commented Nov 21, 2019

nox commented Nov 22, 2019

CYBAI commented Nov 22, 2019 •

edited

nox commented Nov 22, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

nox left a comment

This comment has been minimized.

This comment has been minimized.

SimonSapin commented Nov 25, 2019

SimonSapin commented Nov 25, 2019

bors-servo commented Nov 25, 2019

bors-servo commented Nov 25, 2019

SimonSapin commented Nov 25, 2019

bors-servo commented Nov 25, 2019

bors-servo commented Nov 25, 2019

CYBAI commented Nov 25, 2019

bors-servo commented Nov 25, 2019

bors-servo commented Nov 25, 2019

servo / servo

Join GitHub today

Start implementing text in layout 2020 #24822

Start implementing text in layout 2020 #24822

Conversation

nox commented Nov 21, 2019

highfive commented Nov 21, 2019

highfive commented Nov 21, 2019

nox commented Nov 21, 2019

jdm commented Nov 21, 2019

nox commented Nov 21, 2019

nox commented Nov 22, 2019

CYBAI commented Nov 22, 2019 • edited

nox commented Nov 22, 2019

This comment has been minimized.

SimonSapin Nov 22, 2019

This comment has been minimized.

SimonSapin Nov 22, 2019

This comment has been minimized.

nox Nov 25, 2019

This comment has been minimized.

SimonSapin Nov 25, 2019 • edited

nox left a comment

This comment has been minimized.

nox Nov 25, 2019

This comment has been minimized.

SimonSapin Nov 25, 2019 • edited

SimonSapin commented Nov 25, 2019

SimonSapin commented Nov 25, 2019

bors-servo commented Nov 25, 2019

bors-servo commented Nov 25, 2019

SimonSapin commented Nov 25, 2019

bors-servo commented Nov 25, 2019

bors-servo commented Nov 25, 2019

CYBAI commented Nov 25, 2019

bors-servo commented Nov 25, 2019

bors-servo commented Nov 25, 2019

CYBAI commented Nov 22, 2019 •

edited

SimonSapin Nov 25, 2019 •

edited

SimonSapin Nov 25, 2019 •

edited