aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglrenderingcontext.rs
diff options
context:
space:
mode:
authorBrandon Fairchild <csbit32@gmail.com>2015-09-17 17:55:01 -0400
committerBrandon Fairchild <csbit32@gmail.com>2015-09-19 12:50:14 -0400
commitde3547e401a0ace8b6bfb4b488ed0be9d5b3d79c (patch)
tree1dd3e40e5a554466dfb4575758ad15967927d44d /components/script/dom/webglrenderingcontext.rs
parente924393be8cce6cb16d3af5a13ed9f634670f843 (diff)
downloadservo-de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c.tar.gz
servo-de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c.zip
Fix reported test-tidy errors for unmerged import blocks
This merges import blocks that were reported by tidy as unmerged.
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r--components/script/dom/webglrenderingcontext.rs6
1 files changed, 1 insertions, 5 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 64e59cd4ee7..da77c58a565 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -10,7 +10,6 @@ use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::{WebGLRender
use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::{self, WebGLContextAttributes};
use dom::bindings::codegen::InheritTypes::NodeCast;
use dom::bindings::codegen::UnionTypes::ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement;
-
use dom::bindings::conversions::ToJSValConvertible;
use dom::bindings::global::{GlobalRef, GlobalField};
use dom::bindings::js::{JS, LayoutJS, Root};
@@ -30,11 +29,10 @@ use ipc_channel::ipc::{self, IpcSender};
use js::jsapi::{JSContext, JSObject, RootedValue};
use js::jsapi::{JS_GetFloat32ArrayData, JS_GetObjectAsArrayBufferView};
use js::jsval::{JSVal, UndefinedValue, NullValue, Int32Value, BooleanValue};
-
use msg::constellation_msg::Msg as ConstellationMsg;
use net_traits::image::base::PixelFormat;
use net_traits::image_cache_task::ImageResponse;
-
+use offscreen_gl_context::GLContextAttributes;
use std::cell::Cell;
use std::mem;
use std::ptr;
@@ -43,8 +41,6 @@ use std::sync::mpsc::channel;
use util::str::DOMString;
use util::vec::byte_swap;
-use offscreen_gl_context::GLContextAttributes;
-
pub const MAX_UNIFORM_AND_ATTRIBUTE_LEN: usize = 256;
macro_rules! handle_potential_webgl_error {