auto merge of #2585 : ebalint/servo/2530, r=jdm

This commit is contained in:
bors-servo 2014-06-13 14:04:45 -04:00
commit c0576108c5
8 changed files with 455 additions and 418 deletions

View file

@ -4339,7 +4339,7 @@ class CGBindingRoot(CGThing):
'dom::bindings::proxyhandler::{FillPropertyDescriptor, GetExpandoObject}',
'dom::bindings::proxyhandler::{getPropertyDescriptor}',
'dom::bindings::str::ByteString',
'script_task::JSPageInfo',
'page::JSPageInfo',
'libc',
'servo_util::str::DOMString',
'std::mem',
@ -5214,7 +5214,7 @@ class GlobalGenRoots():
'dom::bindings::codegen',
'dom::bindings::js::{JS, JSRef}',
'dom::window::Window',
'script_task::JSPageInfo',
'page::JSPageInfo',
])
@staticmethod