aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-03-18 02:14:22 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-03-18 02:14:22 +0530
commitce2da28a00036e614cee211f4b279dc8e7eac9c1 (patch)
tree6b71f9e816e965ab0ed5fe080d3d70de3d9ee69c
parent0008c07dc343d911be042516b32c994fc18e3900 (diff)
parent57df260f9d5ce998991bfc2cee665db7f5abf353 (diff)
downloadservo-ce2da28a00036e614cee211f4b279dc8e7eac9c1.tar.gz
servo-ce2da28a00036e614cee211f4b279dc8e7eac9c1.zip
Auto merge of #10061 - DavidBM:clean_code_removing_overflow_in_assign_bsizes, r=Manishearth
Remove overflow references on AssignBSizesAndStoreOverflow code <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10061) <!-- Reviewable:end -->
-rw-r--r--components/layout/parallel.rs6
-rw-r--r--components/layout/sequential.rs6
-rw-r--r--components/layout/traversal.rs9
3 files changed, 10 insertions, 11 deletions
diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs
index 39986d86580..628f0c4e07e 100644
--- a/components/layout/parallel.rs
+++ b/components/layout/parallel.rs
@@ -17,7 +17,7 @@ use std::sync::atomic::{AtomicIsize, Ordering};
use style::dom::{TNode, UnsafeNode};
use style::parallel::{CHUNK_SIZE, WorkQueueData};
use style::parallel::{run_queue_with_custom_work_data_type};
-use traversal::AssignBSizesAndStoreOverflow;
+use traversal::AssignBSizes;
use traversal::{AssignISizes, BubbleISizes, PostorderNodeMutTraversal};
use util::opts;
use util::workqueue::{WorkQueue, WorkUnit, WorkerProxy};
@@ -198,7 +198,7 @@ impl<'a> ParallelPreorderFlowTraversal for AssignISizes<'a> {
}
}
-impl<'a> ParallelPostorderFlowTraversal for AssignBSizesAndStoreOverflow<'a> {}
+impl<'a> ParallelPostorderFlowTraversal for AssignBSizes<'a> {}
fn assign_inline_sizes(unsafe_flows: UnsafeFlowList,
proxy: &mut WorkerProxy<SharedLayoutContext, UnsafeFlowList>) {
@@ -214,7 +214,7 @@ fn assign_block_sizes_and_store_overflow(
unsafe_flow: UnsafeFlow,
shared_layout_context: &SharedLayoutContext) {
let layout_context = LayoutContext::new(shared_layout_context);
- let assign_block_sizes_traversal = AssignBSizesAndStoreOverflow {
+ let assign_block_sizes_traversal = AssignBSizes {
layout_context: &layout_context,
};
assign_block_sizes_traversal.run_parallel(unsafe_flow)
diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs
index a54d46848ca..a10637b75fb 100644
--- a/components/layout/sequential.rs
+++ b/components/layout/sequential.rs
@@ -16,7 +16,7 @@ use generated_content::ResolveGeneratedContent;
use gfx::display_list::{DisplayListEntry, StackingContext};
use style::dom::TNode;
use style::traversal::DomTraversalContext;
-use traversal::{AssignBSizesAndStoreOverflow, AssignISizes};
+use traversal::{AssignBSizes, AssignISizes};
use traversal::{BubbleISizes, BuildDisplayList, ComputeAbsolutePositions, PostorderNodeMutTraversal};
use util::opts;
@@ -44,7 +44,7 @@ pub fn traverse_flow_tree_preorder(root: &mut FlowRef,
shared_layout_context: &SharedLayoutContext) {
fn doit(flow: &mut Flow,
assign_inline_sizes: AssignISizes,
- assign_block_sizes: AssignBSizesAndStoreOverflow) {
+ assign_block_sizes: AssignBSizes) {
if assign_inline_sizes.should_process(flow) {
assign_inline_sizes.process(flow);
}
@@ -71,7 +71,7 @@ pub fn traverse_flow_tree_preorder(root: &mut FlowRef,
}
let assign_inline_sizes = AssignISizes { layout_context: &layout_context };
- let assign_block_sizes = AssignBSizesAndStoreOverflow { layout_context: &layout_context };
+ let assign_block_sizes = AssignBSizes { layout_context: &layout_context };
doit(root, assign_inline_sizes, assign_block_sizes);
}
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs
index 0fa45ff67b7..f9ecf833cdd 100644
--- a/components/layout/traversal.rs
+++ b/components/layout/traversal.rs
@@ -172,15 +172,14 @@ impl<'a> PreorderFlowTraversal for AssignISizes<'a> {
}
/// The assign-block-sizes-and-store-overflow traversal, the last (and most expensive) part of
-/// layout computation. Determines the final block-sizes for all layout objects, computes
-/// positions, and computes overflow regions. In Gecko this corresponds to `Reflow` and
-/// `FinishAndStoreOverflow`.
+/// layout computation. Determines the final block-sizes for all layout objects and computes
+/// positions. In Gecko this corresponds to `Reflow`.
#[derive(Copy, Clone)]
-pub struct AssignBSizesAndStoreOverflow<'a> {
+pub struct AssignBSizes<'a> {
pub layout_context: &'a LayoutContext<'a>,
}
-impl<'a> PostorderFlowTraversal for AssignBSizesAndStoreOverflow<'a> {
+impl<'a> PostorderFlowTraversal for AssignBSizes<'a> {
#[inline]
fn process(&self, flow: &mut Flow) {
// Can't do anything with flows impacted by floats until we reach their inorder parent.