diff --git a/Cargo.lock b/Cargo.lock index c7ddb44d5b..9bd8b393b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,6 +105,11 @@ name = "bitflags" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "block" version = "0.1.6" @@ -1041,7 +1046,7 @@ dependencies = [ "angle 0.5.0 (git+https://github.com/servo/angle?branch=servo)", "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1075,7 +1080,7 @@ version = "0.52.1" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1165,6 +1170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88ceb0d16c4fd0e42876e298d7d3ce3780dd9ebdcbe4199816a32c77e08597ff" "checksum bincode 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b92615d57e4048e480bd7e3c2d7f6ec252819fffec95efbc30ec7c68744aa66c" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" +"checksum bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5cde24d1b2e2216a726368b2363a273739c91f4e3eb4e0dd12d672d396ad989" "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" "checksum byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8" "checksum bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d828f97b58cc5de3e40c421d0cf2132d6b2da4ee0e11b8632fa838f0f9333ad6" diff --git a/servo-tidy.toml b/servo-tidy.toml index 9c24924e8d..2149e04bd1 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -4,7 +4,7 @@ skip-check-licenses = false [ignore] # Ignored packages with duplicated versions -packages = ["yaml-rust"] +packages = ["yaml-rust", "bitflags"] # Files that are ignored for all tidy and lint checks. files = [ # servo-tidy does not properly support workspaces yet. diff --git a/webrender/Cargo.toml b/webrender/Cargo.toml index 072fc2f989..d286b81ec7 100644 --- a/webrender/Cargo.toml +++ b/webrender/Cargo.toml @@ -25,7 +25,7 @@ num-traits = "0.1.32" time = "0.1" rayon = "0.8" webrender_api = {path = "../webrender_api"} -bitflags = "0.9" +bitflags = "1.0" thread_profiler = "0.1.1" plane-split = "0.6" ws = { optional = true, version = "0.7.3" } diff --git a/webrender/examples/common/boilerplate.rs b/webrender/examples/common/boilerplate.rs index c1f30e227d..785f38d8d8 100644 --- a/webrender/examples/common/boilerplate.rs +++ b/webrender/examples/common/boilerplate.rs @@ -187,7 +187,7 @@ pub fn main_wrapper(example: &mut Example, options: Option { let mut flags = renderer.get_debug_flags(); - flags.toggle(webrender::PROFILER_DBG); + flags.toggle(webrender::DebugFlags::PROFILER_DBG); renderer.set_debug_flags(flags); } glutin::Event::KeyboardInput( @@ -196,7 +196,7 @@ pub fn main_wrapper(example: &mut Example, options: Option { let mut flags = renderer.get_debug_flags(); - flags.toggle(webrender::RENDER_TARGET_DBG); + flags.toggle(webrender::DebugFlags::RENDER_TARGET_DBG); renderer.set_debug_flags(flags); } glutin::Event::KeyboardInput( @@ -205,7 +205,7 @@ pub fn main_wrapper(example: &mut Example, options: Option { let mut flags = renderer.get_debug_flags(); - flags.toggle(webrender::TEXTURE_CACHE_DBG); + flags.toggle(webrender::DebugFlags::TEXTURE_CACHE_DBG); renderer.set_debug_flags(flags); } glutin::Event::KeyboardInput( @@ -214,7 +214,7 @@ pub fn main_wrapper(example: &mut Example, options: Option { let mut flags = renderer.get_debug_flags(); - flags.toggle(webrender::ALPHA_PRIM_DBG); + flags.toggle(webrender::DebugFlags::ALPHA_PRIM_DBG); renderer.set_debug_flags(flags); } glutin::Event::KeyboardInput( diff --git a/webrender/src/frame_builder.rs b/webrender/src/frame_builder.rs index b6cc52f284..7c76fec75f 100644 --- a/webrender/src/frame_builder.rs +++ b/webrender/src/frame_builder.rs @@ -5,11 +5,11 @@ use api::{BorderDetails, BorderDisplayItem, BorderRadius, BoxShadowClipMode, BuiltDisplayList}; use api::{ClipAndScrollInfo, ClipId, ColorF}; use api::{DeviceIntPoint, DeviceIntRect, DeviceIntSize, DeviceUintRect, DeviceUintSize}; -use api::{ExtendMode, FIND_ALL, FilterOp, FontInstance, FontRenderMode}; +use api::{ExtendMode, FilterOp, FontInstance, FontRenderMode}; use api::{GlyphInstance, GlyphOptions, GradientStop, HitTestFlags, HitTestItem, HitTestResult}; use api::{ImageKey, ImageRendering, ItemRange, ItemTag, LayerPoint, LayerPrimitiveInfo, LayerRect}; use api::{LayerPixel, LayerSize, LayerToScrollTransform, LayerVector2D, LayoutVector2D, LineOrientation}; -use api::{LineStyle, LocalClip, POINT_RELATIVE_TO_PIPELINE_VIEWPORT, PipelineId, RepeatMode}; +use api::{LineStyle, LocalClip, PipelineId, RepeatMode}; use api::{ScrollSensitivity, Shadow, TileOffset, TransformStyle}; use api::{WorldPixel, WorldPoint, YuvColorSpace, YuvData, device_length}; use app_units::Au; @@ -1575,7 +1575,7 @@ impl FrameBuilder { point: WorldPoint, flags: HitTestFlags ) -> HitTestResult { - let point = if flags.contains(POINT_RELATIVE_TO_PIPELINE_VIEWPORT) { + let point = if flags.contains(HitTestFlags::POINT_RELATIVE_TO_PIPELINE_VIEWPORT) { let point = LayerPoint::new(point.x, point.y); clip_scroll_tree.make_node_relative_point_absolute(pipeline_id, &point) } else { @@ -1626,7 +1626,7 @@ impl FrameBuilder { tag: item.tag, point_in_viewport, }); - if !flags.contains(FIND_ALL) { + if !flags.contains(HitTestFlags::FIND_ALL) { return result; } } diff --git a/webrender/src/lib.rs b/webrender/src/lib.rs index 1517d53bb7..1bfdb8af56 100644 --- a/webrender/src/lib.rs +++ b/webrender/src/lib.rs @@ -150,7 +150,6 @@ extern crate gamma_lut; #[doc(hidden)] pub use device::build_shader_strings; -pub use renderer::{ALPHA_PRIM_DBG, PROFILER_DBG, RENDER_TARGET_DBG, TEXTURE_CACHE_DBG}; pub use renderer::{CpuProfile, DebugFlags, GpuProfile, OutputImageHandler, RendererKind}; pub use renderer::{ExternalImage, ExternalImageHandler, ExternalImageSource}; pub use renderer::{GraphicsApi, GraphicsApiInfo, ReadPixelsFormat, Renderer, RendererOptions}; diff --git a/webrender/src/renderer.rs b/webrender/src/renderer.rs index f35e0e9c9b..1a199b6318 100644 --- a/webrender/src/renderer.rs +++ b/webrender/src/renderer.rs @@ -2011,24 +2011,24 @@ impl Renderer { fn handle_debug_command(&mut self, command: DebugCommand) { match command { DebugCommand::EnableProfiler(enable) => if enable { - self.debug_flags.insert(PROFILER_DBG); + self.debug_flags.insert(DebugFlags::PROFILER_DBG); } else { - self.debug_flags.remove(PROFILER_DBG); + self.debug_flags.remove(DebugFlags::PROFILER_DBG); }, DebugCommand::EnableTextureCacheDebug(enable) => if enable { - self.debug_flags.insert(TEXTURE_CACHE_DBG); + self.debug_flags.insert(DebugFlags::TEXTURE_CACHE_DBG); } else { - self.debug_flags.remove(TEXTURE_CACHE_DBG); + self.debug_flags.remove(DebugFlags::TEXTURE_CACHE_DBG); }, DebugCommand::EnableRenderTargetDebug(enable) => if enable { - self.debug_flags.insert(RENDER_TARGET_DBG); + self.debug_flags.insert(DebugFlags::RENDER_TARGET_DBG); } else { - self.debug_flags.remove(RENDER_TARGET_DBG); + self.debug_flags.remove(DebugFlags::RENDER_TARGET_DBG); }, DebugCommand::EnableAlphaRectsDebug(enable) => if enable { - self.debug_flags.insert(ALPHA_PRIM_DBG); + self.debug_flags.insert(DebugFlags::ALPHA_PRIM_DBG); } else { - self.debug_flags.remove(ALPHA_PRIM_DBG); + self.debug_flags.remove(DebugFlags::ALPHA_PRIM_DBG); }, DebugCommand::FetchDocuments => {} DebugCommand::FetchClipScrollTree => {} @@ -2133,7 +2133,7 @@ impl Renderer { self.cpu_profiles.push_back(cpu_profile); } - if self.debug_flags.contains(PROFILER_DBG) { + if self.debug_flags.contains(DebugFlags::PROFILER_DBG) { let screen_fraction = 1.0 / //TODO: take device/pixel ratio into equation? (framebuffer_size.width as f32 * framebuffer_size.height as f32); self.profiler.draw_profile( @@ -2734,7 +2734,7 @@ impl Renderer { self.gpu_profile.add_sampler(GPU_SAMPLER_TAG_TRANSPARENT); for batch in &target.alpha_batcher.batch_list.alpha_batch_list.batches { - if self.debug_flags.contains(ALPHA_PRIM_DBG) { + if self.debug_flags.contains(DebugFlags::ALPHA_PRIM_DBG) { let color = match batch.key.blend_mode { BlendMode::None => ColorF::new(0.3, 0.3, 0.3, 1.0), BlendMode::Alpha => ColorF::new(0.0, 0.9, 0.1, 1.0), @@ -3330,7 +3330,7 @@ impl Renderer { } fn draw_render_target_debug(&mut self, framebuffer_size: DeviceUintSize) { - if !self.debug_flags.contains(RENDER_TARGET_DBG) { + if !self.debug_flags.contains(DebugFlags::RENDER_TARGET_DBG) { return; } @@ -3370,7 +3370,7 @@ impl Renderer { } fn draw_texture_cache_debug(&mut self, framebuffer_size: DeviceUintSize) { - if !self.debug_flags.contains(TEXTURE_CACHE_DBG) { + if !self.debug_flags.contains(DebugFlags::TEXTURE_CACHE_DBG) { return; } @@ -3391,7 +3391,7 @@ impl Renderer { let mut i = 0; for texture in &self.texture_resolver.cache_texture_map { - let y = spacing + if self.debug_flags.contains(RENDER_TARGET_DBG) { + let y = spacing + if self.debug_flags.contains(DebugFlags::RENDER_TARGET_DBG) { 528 } else { 0 diff --git a/webrender_api/Cargo.toml b/webrender_api/Cargo.toml index a0239344d9..34975fb41d 100644 --- a/webrender_api/Cargo.toml +++ b/webrender_api/Cargo.toml @@ -11,8 +11,8 @@ ipc = ["ipc-channel"] [dependencies] app_units = "0.5.6" +bitflags = "1.0" bincode = "0.9" -bitflags = "0.9" byteorder = "1.0" euclid = "0.15" heapsize = ">= 0.3.6, < 0.5" diff --git a/wrench/src/main.rs b/wrench/src/main.rs index 3edd8e3595..5278c78ce1 100644 --- a/wrench/src/main.rs +++ b/wrench/src/main.rs @@ -546,22 +546,22 @@ fn main() { } VirtualKeyCode::P => { let mut flags = wrench.renderer.get_debug_flags(); - flags.toggle(webrender::PROFILER_DBG); + flags.toggle(webrender::DebugFlags::PROFILER_DBG); wrench.renderer.set_debug_flags(flags); } VirtualKeyCode::O => { let mut flags = wrench.renderer.get_debug_flags(); - flags.toggle(webrender::RENDER_TARGET_DBG); + flags.toggle(webrender::DebugFlags::RENDER_TARGET_DBG); wrench.renderer.set_debug_flags(flags); } VirtualKeyCode::I => { let mut flags = wrench.renderer.get_debug_flags(); - flags.toggle(webrender::TEXTURE_CACHE_DBG); + flags.toggle(webrender::DebugFlags::TEXTURE_CACHE_DBG); wrench.renderer.set_debug_flags(flags); } VirtualKeyCode::B => { let mut flags = wrench.renderer.get_debug_flags(); - flags.toggle(webrender::ALPHA_PRIM_DBG); + flags.toggle(webrender::DebugFlags::ALPHA_PRIM_DBG); wrench.renderer.set_debug_flags(flags); } VirtualKeyCode::M => {