Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-25 08:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6920 - Wafflespeanut:NIT, r=jdm

Browse source 
Removed an invalid FIXME and fixed some doc comments...

There are some bad module-level doc comments in `flow.rs` which has directly affected [Servo's docs](http://doc.servo.org/layout/flow/index.html) and so, this fixes that. Oh, and #6728 is having a hard time getting closed and so I've also removed the `FIXME` comment related to it.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6920)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-03 16:46:12 -06:00
commit ae3aadd656
2 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
components/layout/flow.rs
View file

@ -5,25 +5,25 @@
//! Servo's experimental layout system builds a tree of `Flow` and `Fragment` objects and solves //! Servo's experimental layout system builds a tree of `Flow` and `Fragment` objects and solves
//! layout constraints to obtain positions and display attributes of tree nodes. Positions are //! layout constraints to obtain positions and display attributes of tree nodes. Positions are
//! computed in several tree traversals driven by the fundamental data dependencies required by //! computed in several tree traversals driven by the fundamental data dependencies required by
/// inline and block layout. //! inline and block layout.
/// //!
/// Flows are interior nodes in the layout tree and correspond closely to *flow contexts* in the //! Flows are interior nodes in the layout tree and correspond closely to *flow contexts* in the
/// CSS specification. Flows are responsible for positioning their child flow contexts and //! CSS specification. Flows are responsible for positioning their child flow contexts and
/// fragments. Flows have purpose-specific fields, such as auxiliary line structs, out-of-flow //! fragments. Flows have purpose-specific fields, such as auxiliary line structs, out-of-flow
/// child lists, and so on. //! child lists, and so on.
/// //!
/// Currently, the important types of flows are: //! Currently, the important types of flows are:
/// //!
/// * `BlockFlow`: A flow that establishes a block context. It has several child flows, each of //! * `BlockFlow`: A flow that establishes a block context. It has several child flows, each of
/// which are positioned according to block formatting context rules (CSS block boxes). Block //! which are positioned according to block formatting context rules (CSS block boxes). Block
/// flows also contain a single box to represent their rendered borders, padding, etc. //! flows also contain a single box to represent their rendered borders, padding, etc.
/// The BlockFlow at the root of the tree has special behavior: it stretches to the boundaries of //! The BlockFlow at the root of the tree has special behavior: it stretches to the boundaries of
/// the viewport. //! the viewport.
/// //!
/// * `InlineFlow`: A flow that establishes an inline context. It has a flat list of child //! * `InlineFlow`: A flow that establishes an inline context. It has a flat list of child
/// fragments/flows that are subject to inline layout and line breaking and structs to represent //! fragments/flows that are subject to inline layout and line breaking and structs to represent
/// line breaks and mapping to CSS boxes, for the purpose of handling `getClientRects()` and //! line breaks and mapping to CSS boxes, for the purpose of handling `getClientRects()` and
/// similar methods. //! similar methods.
use block::BlockFlow; use block::BlockFlow;
use context::LayoutContext; use context::LayoutContext;
@ -1436,4 +1436,3 @@ impl OpaqueFlow {
OpaqueFlow(base_flow as *const BaseFlow as usize) OpaqueFlow(base_flow as *const BaseFlow as usize)
} }
} }

1
components/script/devtools.rs
View file

@ -43,7 +43,6 @@ pub fn handle_evaluate_js(global: &GlobalRef, eval: String, reply: IpcSender<Eva
} else if rval.ptr.is_null() { } else if rval.ptr.is_null() {
EvaluateJSReply::NullValue EvaluateJSReply::NullValue
} else { } else {
//FIXME: jsvals don't have an is_int32/is_number yet
assert!(rval.ptr.is_object()); assert!(rval.ptr.is_object());
panic!("object values unimplemented") panic!("object values unimplemented")
}).unwrap(); }).unwrap();