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

auto merge of #4198 : Manishearth/servo/hyper-droid, r=Manishearth

Browse source 
This is the Hyper pull request, plus the set up for OpenSSL on Android to make it merge.

Sean's commits have been reviewed in #4065 (My Android changes were reviewed by Glenn)
This commit is contained in:
bors-servo 2014-12-05 04:16:11 -07:00
commit 6bd9bf979b
38 changed files with 927 additions and 477 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/bindings/trace.rs
View file

@ -34,9 +34,8 @@ use dom::node::{Node, TrustedNodeAddress};
use collections::hash::{Hash, Hasher};
use geom::rect::Rect;
use html5ever::tree_builder::QuirksMode;
use http::headers::request::HeaderCollection as RequestHeaderCollection;
use http::headers::response::HeaderCollection as ResponseHeaderCollection;
use http::method::Method;
use hyper::header::Headers;
use hyper::method::Method;
use js::jsapi::{JSObject, JSTracer, JS_CallTracer, JSTRACE_OBJECT};
use js::jsval::JSVal;
use js::rust::Cx;
@ -209,7 +208,7 @@ no_jsmanaged_fields!(PropertyDeclarationBlock)
no_jsmanaged_fields!(SubpageId, WindowSizeData, PipelineId)
no_jsmanaged_fields!(QuirksMode)
no_jsmanaged_fields!(Cx)
no_jsmanaged_fields!(ResponseHeaderCollection, RequestHeaderCollection, Method)
no_jsmanaged_fields!(Headers, Method)
no_jsmanaged_fields!(ConstellationChan)
no_jsmanaged_fields!(LayoutChan)
no_jsmanaged_fields!(WindowProxyHandler)