diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-19 12:35:17 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-19 12:35:17 -0400 |
| commit | f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8 (patch) | |
| tree | 7e7fbd7976c3da12ff463d6ffbeb1a3a336ae7d3 /src/components/script/dom/htmliframeelement.rs | |
| parent | caf1ed94468da3c134cc8e8f4a1b934bb353dc19 (diff) | |
| parent | a6100563a6e43471ae43fb155113bc2026992f78 (diff) | |
| download | servo-f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8.tar.gz servo-f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8.zip | |
auto merge of #1934 : larsbergstrom/servo/rust_20140224_squashed, r=jdm
For review only - don't approve yet (need to squash and land submodule updates first).
critic? @metajack
Diffstat (limited to 'src/components/script/dom/htmliframeelement.rs')
| -rw-r--r-- | src/components/script/dom/htmliframeelement.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/script/dom/htmliframeelement.rs b/src/components/script/dom/htmliframeelement.rs index 79f5282539c..5098972ec15 100644 --- a/src/components/script/dom/htmliframeelement.rs +++ b/src/components/script/dom/htmliframeelement.rs @@ -15,9 +15,9 @@ use dom::windowproxy::WindowProxy; use servo_util::str::DOMString; use extra::url::Url; +use serialize::{Encoder, Encodable}; use servo_msg::constellation_msg::{PipelineId, SubpageId}; use std::ascii::StrAsciiExt; -use extra::serialize::{Encoder, Encodable}; enum SandboxAllowance { AllowNothing = 0x00, |