servo: Merge #1208 - Use Any for the layout data (from pcwalton:any…

…-layout-data); r=metajack

Breaks the dependency between `gfx` and `script`, which is nice.

This exposed some performance issues with Rust's `Any` type, which I've filed:

rust-lang/rust#10382

Source-Repo: https://github.com/servo/servo
Source-Revision: 4eb84496211bb48d2804a0ddcd16849536546103

UltraBlame original commit: 307ff07f5dc6474afb4176fcf3c599315d4408f2

servo/Makefile.in

@@ -2004,16 +2004,6 @@ src
 /
 components
 /
-gfx
--
-L
-(
-B
-)
-src
-/
-components
-/
 msg
 WEBIDL_script
 =
@@ -2118,9 +2108,6 @@ DONE_style
 DONE_net
 )
 (
-DONE_gfx
-)
-(
 DONE_msg
 )
 RFLAGS_style

servo/src/components/main/css/matching.rs

@@ -68,6 +68,15 @@ layout
 incremental
 ;
 use
+layout
+:
+:
+util
+:
+:
+LayoutDataAccess
+;
+use
 script
 :
 :
@@ -229,36 +238,18 @@ None
 )
 }
 ;
-let
-cell
-=
-Cell
-:
-:
-new
-(
-applicable_declarations
-)
-;
-do
 self
 .
-write_layout_data
-|
-data
-|
-{
-data
+layout_data
+(
+)
 .
 applicable_declarations
-=
-cell
 .
-take
+set
 (
+applicable_declarations
 )
-;
-}
 }
 fn
 match_subtree
@@ -542,57 +533,48 @@ None
 }
 ;
 let
-computed_values
+layout_data
 =
-do
 self
 .
-read_layout_data
-|
-data
-|
-{
-cascade
+layout_data
 (
-data
-.
-applicable_declarations
-parent_style
 )
-}
 ;
 let
-cell
+computed_values
 =
-Cell
-:
-:
-new
+cascade
+(
+*
+layout_data
+.
+applicable_declarations
+.
+borrow
 (
-computed_values
 )
-;
-do
-self
 .
-write_layout_data
-|
-data
-|
-{
+ptr
+parent_style
+)
+;
 let
 style
 =
-cell
+layout_data
 .
-take
+style
+.
+mutate
 (
 )
 ;
 match
-data
-.
+*
 style
+.
+ptr
 {
 None
 =
@@ -606,6 +588,7 @@ previous_style
 )
 =
 >
+{
 self
 .
 set_restyle_damage
@@ -617,20 +600,20 @@ compute_damage
 (
 previous_style
 &
-style
+computed_values
 )
 )
 }
-data
-.
+}
+*
 style
+.
+ptr
 =
 Some
 (
-style
+computed_values
 )
-;
-}
 }
 fn
 cascade_subtree