servo: Merge #20096 - Fix typo (from maekawatoshiki:master); r=emilio
authormaekawatoshiki <konndennsa@gmail.com>
Wed, 21 Feb 2018 04:22:43 -0500
changeset 404665 9bbac632c7d192d75dc0d81b723cfeffc19e35b7
parent 404664 1d5900e45d27101931b850b55d87bd388e7a125c
child 404666 0b55eb19edbc11c7fb340fdb1bee0ba9e1efea1a
push id100058
push userrgurzau@mozilla.com
push dateWed, 21 Feb 2018 17:32:49 +0000
treeherdermozilla-inbound@fa4bede5ed1f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #20096 - Fix typo (from maekawatoshiki:master); r=emilio <!-- Please describe your changes on the following line: --> I found some typo, so I fixed them. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because it's just a fix of typo. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 554b0c0d06a229e6635bcadcf60b9c477345664a
servo/components/layout/inline.rs
--- a/servo/components/layout/inline.rs
+++ b/servo/components/layout/inline.rs
@@ -106,17 +106,17 @@ pub struct Line {
     pub visual_runs: Option<Vec<(Range<FragmentIndex>, bidi::Level)>>,
 
     /// The bounds are the exact position and extents of the line with respect
     /// to the parent box.
     ///
     /// For example, for the HTML below...
     ///
     /// ~~~html
-    /// <div><span>I <span>like      truffles, <img></span></div>
+    /// <div><span>I like      truffles, <img></span></div>
     /// ~~~
     ///
     /// ...the bounds would be:
     ///
     /// ~~~text
     /// +-----------------------------------------------------------+
     /// |               ^                                           |
     /// |               |                                           |
@@ -1444,17 +1444,17 @@ impl Flow for InlineFlow {
 
             kid_base.block_container_inline_size = inline_size;
             kid_base.block_container_writing_mode = container_mode;
             kid_base.block_container_explicit_block_size = block_container_explicit_block_size;
         }
     }
 
     /// Calculate and set the block-size of this flow. See CSS 2.1 ยง 10.6.1.
-    /// Note that we do not need to do in-order traversal becase the children
+    /// Note that we do not need to do in-order traversal because the children
     /// are always block formatting context.
     fn assign_block_size(&mut self, layout_context: &LayoutContext) {
         let _scope = layout_debug_scope!("inline::assign_block_size {:x}",
                                          self.base.debug_id());
 
         // Divide the fragments into lines.
         //
         // TODO(pcwalton, #226): Get the CSS `line-height` property from the