Backed out changeset e64e659c077d: servo PR #18809 and revendor for r…

…eftest failures, e.g. in layout/reftests/bugs/392435-1.html. r=backout on a CLOSED TREE

Backs out #18809

components/bluetooth/Cargo.toml

@@ -10,7 +10,7 @@ name = "bluetooth"
 path = "lib.rs"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "0.7"
 bluetooth_traits = {path = "../bluetooth_traits"}
 device = {git = "https://github.com/servo/devices", features = ["bluetooth-test"]}
 ipc-channel = "0.9"

components/bluetooth/lib.rs

@@ -47,16 +47,16 @@ const DIALOG_COLUMN_ID: &'static str = "Id";
 const DIALOG_COLUMN_NAME: &'static str = "Name";
 
 bitflags! {
-    struct Flags: u32 {
-        const BROADCAST                   = 0b000000001;
-        const READ                        = 0b000000010;
-        const WRITE_WITHOUT_RESPONSE      = 0b000000100;
-        const WRITE                       = 0b000001000;
-        const NOTIFY                      = 0b000010000;
-        const INDICATE                    = 0b000100000;
-        const AUTHENTICATED_SIGNED_WRITES = 0b001000000;
-        const RELIABLE_WRITE              = 0b010000000;
-        const WRITABLE_AUXILIARIES        = 0b100000000;
+    flags Flags: u32 {
+        const BROADCAST                   = 0b000000001,
+        const READ                        = 0b000000010,
+        const WRITE_WITHOUT_RESPONSE      = 0b000000100,
+        const WRITE                       = 0b000001000,
+        const NOTIFY                      = 0b000010000,
+        const INDICATE                    = 0b000100000,
+        const AUTHENTICATED_SIGNED_WRITES = 0b001000000,
+        const RELIABLE_WRITE              = 0b010000000,
+        const WRITABLE_AUXILIARIES        = 0b100000000,
     }
 }
 
@@ -522,15 +522,15 @@ impl BluetoothManager {
         let flags = characteristic.get_flags().unwrap_or(vec!());
         for flag in flags {
             match flag.as_ref() {
-                "broadcast" => props.insert(Flags::BROADCAST),
-                "read" => props.insert(Flags::READ),
-                "write-without-response" => props.insert(Flags::WRITE_WITHOUT_RESPONSE),
-                "write" => props.insert(Flags::WRITE),
-                "notify" => props.insert(Flags::NOTIFY),
-                "indicate" => props.insert(Flags::INDICATE),
-                "authenticated-signed-writes" => props.insert(Flags::AUTHENTICATED_SIGNED_WRITES),
-                "reliable-write" => props.insert(Flags::RELIABLE_WRITE),
-                "writable-auxiliaries" => props.insert(Flags::WRITABLE_AUXILIARIES),
+                "broadcast" => props.insert(BROADCAST),
+                "read" => props.insert(READ),
+                "write-without-response" => props.insert(WRITE_WITHOUT_RESPONSE),
+                "write" => props.insert(WRITE),
+                "notify" => props.insert(NOTIFY),
+                "indicate" => props.insert(INDICATE),
+                "authenticated-signed-writes" => props.insert(AUTHENTICATED_SIGNED_WRITES),
+                "reliable-write" => props.insert(RELIABLE_WRITE),
+                "writable-auxiliaries" => props.insert(WRITABLE_AUXILIARIES),
                 _ => (),
             }
         }
@@ -747,15 +747,15 @@ impl BluetoothManager {
                             BluetoothCharacteristicMsg {
                                 uuid: uuid,
                                 instance_id: characteristic.get_id(),
-                                broadcast: properties.contains(Flags::BROADCAST),
-                                read: properties.contains(Flags::READ),
-                                write_without_response: properties.contains(Flags::WRITE_WITHOUT_RESPONSE),
-                                write: properties.contains(Flags::WRITE),
-                                notify: properties.contains(Flags::NOTIFY),
-                                indicate: properties.contains(Flags::INDICATE),
-                                authenticated_signed_writes: properties.contains(Flags::AUTHENTICATED_SIGNED_WRITES),
-                                reliable_write: properties.contains(Flags::RELIABLE_WRITE),
-                                writable_auxiliaries: properties.contains(Flags::WRITABLE_AUXILIARIES),
+                                broadcast: properties.contains(BROADCAST),
+                                read: properties.contains(READ),
+                                write_without_response: properties.contains(WRITE_WITHOUT_RESPONSE),
+                                write: properties.contains(WRITE),
+                                notify: properties.contains(NOTIFY),
+                                indicate: properties.contains(INDICATE),
+                                authenticated_signed_writes: properties.contains(AUTHENTICATED_SIGNED_WRITES),
+                                reliable_write: properties.contains(RELIABLE_WRITE),
+                                writable_auxiliaries: properties.contains(WRITABLE_AUXILIARIES),
                             }
                         );
                     }

components/devtools/actors/console.rs

@@ -9,7 +9,7 @@
 
 use actor::{Actor, ActorMessageStatus, ActorRegistry};
 use actors::object::ObjectActor;
-use devtools_traits::{CachedConsoleMessageTypes, DevtoolScriptControlMsg};
+use devtools_traits::{CONSOLE_API, CachedConsoleMessageTypes, DevtoolScriptControlMsg, PAGE_ERROR};
 use devtools_traits::CachedConsoleMessage;
 use devtools_traits::EvaluateJSReply::{ActorValue, BooleanValue, StringValue};
 use devtools_traits::EvaluateJSReply::{NullValue, NumberValue, VoidValue};
@@ -107,8 +107,8 @@ impl Actor for ConsoleActor {
                 let mut message_types = CachedConsoleMessageTypes::empty();
                 for str_type in str_types {
                     match str_type {
-                        "PageError" => message_types.insert(CachedConsoleMessageTypes::PAGE_ERROR),
-                        "ConsoleAPI" => message_types.insert(CachedConsoleMessageTypes::CONSOLE_API),
+                        "PageError" => message_types.insert(PAGE_ERROR),
+                        "ConsoleAPI" => message_types.insert(CONSOLE_API),
                         s => debug!("unrecognized message type requested: \"{}\"", s),
                     };
                 };

components/devtools_traits/Cargo.toml

@@ -10,7 +10,7 @@ name = "devtools_traits"
 path = "lib.rs"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "0.7"
 hyper = "0.10"
 hyper_serde = "0.7"
 ipc-channel = "0.9"

components/devtools_traits/lib.rs

@@ -243,9 +243,9 @@ pub struct ConsoleMessage {
 
 bitflags! {
     #[derive(Deserialize, Serialize)]
-    pub struct CachedConsoleMessageTypes: u8 {
-        const PAGE_ERROR  = 1 << 0;
-        const CONSOLE_API = 1 << 1;
+    pub flags CachedConsoleMessageTypes: u8 {
+        const PAGE_ERROR  = 1 << 0,
+        const CONSOLE_API = 1 << 1,
     }
 }
 

components/gfx/Cargo.toml

@@ -15,7 +15,7 @@ unstable = ["simd"]
 
 [dependencies]
 app_units = "0.5"
-bitflags = "1.0"
+bitflags = "0.7"
 euclid = "0.15"
 fnv = "1.0"
 fontsan = {git = "https://github.com/servo/fontsan"}

components/gfx/font.rs

@@ -139,17 +139,17 @@ impl Font {
 }
 
 bitflags! {
-    pub struct ShapingFlags: u8 {
+    pub flags ShapingFlags: u8 {
         #[doc = "Set if the text is entirely whitespace."]
-        const IS_WHITESPACE_SHAPING_FLAG = 0x01;
+        const IS_WHITESPACE_SHAPING_FLAG = 0x01,
         #[doc = "Set if we are to ignore ligatures."]
-        const IGNORE_LIGATURES_SHAPING_FLAG = 0x02;
+        const IGNORE_LIGATURES_SHAPING_FLAG = 0x02,
         #[doc = "Set if we are to disable kerning."]
-        const DISABLE_KERNING_SHAPING_FLAG = 0x04;
+        const DISABLE_KERNING_SHAPING_FLAG = 0x04,
         #[doc = "Text direction is right-to-left."]
-        const RTL_FLAG = 0x08;
+        const RTL_FLAG = 0x08,
         #[doc = "Set if word-break is set to keep-all."]
-        const KEEP_ALL_FLAG = 0x10;
+        const KEEP_ALL_FLAG = 0x10,
     }
 }
 
@@ -186,8 +186,8 @@ impl Font {
         let result = self.shape_cache.borrow_mut().entry(lookup_key).or_insert_with(|| {
             let start_time = time::precise_time_ns();
             let mut glyphs = GlyphStore::new(text.len(),
-                                             options.flags.contains(ShapingFlags::IS_WHITESPACE_SHAPING_FLAG),
-                                             options.flags.contains(ShapingFlags::RTL_FLAG));
+                                             options.flags.contains(IS_WHITESPACE_SHAPING_FLAG),
+                                             options.flags.contains(RTL_FLAG));
 
             if self.can_do_fast_shaping(text, options) {
                 debug!("shape_text: Using ASCII fast path.");
@@ -211,7 +211,7 @@ impl Font {
 
     fn can_do_fast_shaping(&self, text: &str, options: &ShapingOptions) -> bool {
         options.script == Script::Latin &&
-            !options.flags.contains(ShapingFlags::RTL_FLAG) &&
+            !options.flags.contains(RTL_FLAG) &&
             self.handle.can_do_fast_shaping() &&
             text.is_ascii()
     }

components/gfx/text/shaping/harfbuzz.rs

@@ -6,7 +6,8 @@
 
 use app_units::Au;
 use euclid::Point2D;
-use font::{ShapingFlags, Font, FontTableMethods, FontTableTag, ShapingOptions, KERN};
+use font::{DISABLE_KERNING_SHAPING_FLAG, Font, FontTableMethods, FontTableTag};
+use font::{IGNORE_LIGATURES_SHAPING_FLAG, KERN, RTL_FLAG, ShapingOptions};
 use harfbuzz::{HB_DIRECTION_LTR, HB_DIRECTION_RTL, HB_MEMORY_MODE_READONLY};
 use harfbuzz::{hb_blob_create, hb_face_create_for_tables};
 use harfbuzz::{hb_buffer_create, hb_font_destroy};
@@ -188,7 +189,7 @@ impl ShaperMethods for Shaper {
     fn shape_text(&self, text: &str, options: &ShapingOptions, glyphs: &mut GlyphStore) {
         unsafe {
             let hb_buffer: *mut hb_buffer_t = hb_buffer_create();
-            hb_buffer_set_direction(hb_buffer, if options.flags.contains(ShapingFlags::RTL_FLAG) {
+            hb_buffer_set_direction(hb_buffer, if options.flags.contains(RTL_FLAG) {
                 HB_DIRECTION_RTL
             } else {
                 HB_DIRECTION_LTR
@@ -203,15 +204,15 @@ impl ShaperMethods for Shaper {
                                text.len() as c_int);
 
             let mut features = Vec::new();
-            if options.flags.contains(ShapingFlags::IGNORE_LIGATURES_SHAPING_FLAG) {
+            if options.flags.contains(IGNORE_LIGATURES_SHAPING_FLAG) {
                 features.push(hb_feature_t {
                     tag: LIGA,
                     value: 0,
                     start: 0,
                     end: hb_buffer_get_length(hb_buffer),
                 })
             }
-            if options.flags.contains(ShapingFlags::DISABLE_KERNING_SHAPING_FLAG) {
+            if options.flags.contains(DISABLE_KERNING_SHAPING_FLAG) {
                 features.push(hb_feature_t {
                     tag: KERN,
                     value: 0,

components/gfx/text/text_run.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use app_units::Au;
-use font::{Font, FontHandleMethods, FontMetrics, ShapingFlags};
+use font::{Font, FontHandleMethods, FontMetrics, IS_WHITESPACE_SHAPING_FLAG, KEEP_ALL_FLAG};
 use font::{RunMetrics, ShapingOptions};
 use platform::font_template::FontTemplateData;
 use range::Range;
@@ -210,7 +210,7 @@ impl<'a> TextRun {
                 .take_while(|&(_, c)| char_is_whitespace(c)).last() {
                     whitespace.start = slice.start + i;
                     slice.end = whitespace.start;
-                } else if idx != text.len() && options.flags.contains(ShapingFlags::KEEP_ALL_FLAG) {
+                } else if idx != text.len() && options.flags.contains(KEEP_ALL_FLAG) {
                     // If there's no whitespace and word-break is set to
                     // keep-all, try increasing the slice.
                     continue;
@@ -224,7 +224,7 @@ impl<'a> TextRun {
             }
             if whitespace.len() > 0 {
                 let mut options = options.clone();
-                options.flags.insert(ShapingFlags::IS_WHITESPACE_SHAPING_FLAG);
+                options.flags.insert(IS_WHITESPACE_SHAPING_FLAG);
                 glyphs.push(GlyphRun {
                     glyph_store: font.shape_text(&text[whitespace.clone()], &options),
                     range: Range::new(ByteIndex(whitespace.start as isize),

components/layout/Cargo.toml

@@ -12,7 +12,7 @@ path = "lib.rs"
 [dependencies]
 app_units = "0.5"
 atomic_refcell = "0.1"
-bitflags = "1.0"
+bitflags = "0.8"
 canvas_traits = {path = "../canvas_traits"}
 euclid = "0.15"
 fnv = "1.0"