diff --git a/Cargo.lock b/Cargo.lock index 3b172d243b3..ee9a720f575 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -263,7 +263,7 @@ name = "blurz" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "dbus 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "dbus 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "dbus" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -971,7 +971,7 @@ dependencies = [ "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "nsstring_vendor 0.1.0", "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.18.0", + "selectors 0.19.0", "style 0.0.1", "style_traits 0.0.1", "stylo_tests 0.0.1", @@ -1398,7 +1398,7 @@ dependencies = [ "rayon 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "script_layout_interface 0.0.1", "script_traits 0.0.1", - "selectors 0.18.0", + "selectors 0.19.0", "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1446,7 +1446,7 @@ dependencies = [ "script 0.0.1", "script_layout_interface 0.0.1", "script_traits 0.0.1", - "selectors 0.18.0", + "selectors 0.19.0", "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", @@ -2369,7 +2369,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_plugins 0.0.1", "script_traits 0.0.1", - "selectors 0.18.0", + "selectors 0.19.0", "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "servo_atoms 0.0.1", @@ -2413,7 +2413,7 @@ dependencies = [ "profile_traits 0.0.1", "range 0.0.1", "script_traits 0.0.1", - "selectors 0.18.0", + "selectors 0.19.0", "servo_url 0.0.1", "style 0.0.1", "webrender_traits 0.39.0 (git+https://github.com/servo/webrender)", @@ -2466,7 +2466,7 @@ dependencies = [ [[package]] name = "selectors" -version = "0.18.0" +version = "0.19.0" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2869,7 +2869,7 @@ dependencies = [ "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.18.0", + "selectors 0.19.0", "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", "servo_atoms 0.0.1", @@ -2906,7 +2906,7 @@ dependencies = [ "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.18.0", + "selectors 0.19.0", "servo_atoms 0.0.1", "servo_config 0.0.1", "servo_url 0.0.1", @@ -2939,7 +2939,7 @@ dependencies = [ "geckoservo 0.0.1", "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.18.0", + "selectors 0.19.0", "size_of_test 0.0.1", "style 0.0.1", "style_traits 0.0.1", @@ -3508,7 +3508,7 @@ dependencies = [ "checksum cssparser 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "88dc7bd2a41b9c6c66456ac709d9efead1deb390d2c252c59e0ddfff9cdf0c94" "checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df" "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850" -"checksum dbus 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47f881971824401c27bc1ff9f641d54ac66e0f409631806fa7be8cad8e6be450" +"checksum dbus 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4aee01fb76ada3e5e7ca642ea6664ebf7308a810739ca2aca44909a1191ac254" "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3" "checksum deflate 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ebb02aaf4b775afc96684b8402510a338086974e38570a1f65bea8c202eb77a7" "checksum deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1614659040e711785ed8ea24219140654da1729f3ec8a47a9719d041112fe7bf" diff --git a/cargo-commit-hash b/cargo-commit-hash index ab91ab90564..78b19407e07 100644 --- a/cargo-commit-hash +++ b/cargo-commit-hash @@ -1 +1 @@ -994e552f1f9515c84ec2ed66012bf3bd1684c206 \ No newline at end of file +2233f515b1e8281841ceaed802f74fe2f9e54701 diff --git a/components/script/dom/webidls/HTMLFormElement.webidl b/components/script/dom/webidls/HTMLFormElement.webidl index fba10d25509..c9232cc6d6c 100644 --- a/components/script/dom/webidls/HTMLFormElement.webidl +++ b/components/script/dom/webidls/HTMLFormElement.webidl @@ -24,6 +24,4 @@ interface HTMLFormElement : HTMLElement { void reset(); //boolean checkValidity(); //boolean reportValidity(); - - //void requestAutocomplete(); }; diff --git a/components/selectors/Cargo.toml b/components/selectors/Cargo.toml index 4ca9a240c67..f0c48ad4f8d 100644 --- a/components/selectors/Cargo.toml +++ b/components/selectors/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "selectors" -version = "0.18.0" # Not yet published +version = "0.19.0" # Not yet published authors = ["Simon Sapin ", "Alan Jeffrey "] documentation = "https://docs.rs/selectors/" diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs index 8b8eedd7451..59f3dff96ff 100644 --- a/components/style/properties/longhand/box.mako.rs +++ b/components/style/properties/longhand/box.mako.rs @@ -1596,28 +1596,28 @@ ${helpers.predefined_type("scroll-snap-coordinate", }, "rotate" => { try!(input.parse_nested_block(|input| { - let theta = try!(specified::Angle::parse_with_unitless(context,input)); + let theta = try!(specified::Angle::parse_with_unitless(context, input)); result.push(SpecifiedOperation::Rotate(theta)); Ok(()) })) }, "rotatex" => { try!(input.parse_nested_block(|input| { - let theta = try!(specified::Angle::parse_with_unitless(context,input)); + let theta = try!(specified::Angle::parse_with_unitless(context, input)); result.push(SpecifiedOperation::RotateX(theta)); Ok(()) })) }, "rotatey" => { try!(input.parse_nested_block(|input| { - let theta = try!(specified::Angle::parse_with_unitless(context,input)); + let theta = try!(specified::Angle::parse_with_unitless(context, input)); result.push(SpecifiedOperation::RotateY(theta)); Ok(()) })) }, "rotatez" => { try!(input.parse_nested_block(|input| { - let theta = try!(specified::Angle::parse_with_unitless(context,input)); + let theta = try!(specified::Angle::parse_with_unitless(context, input)); result.push(SpecifiedOperation::RotateZ(theta)); Ok(()) })) @@ -1630,7 +1630,7 @@ ${helpers.predefined_type("scroll-snap-coordinate", try!(input.expect_comma()); let az = try!(specified::parse_number(context, input)); try!(input.expect_comma()); - let theta = try!(specified::Angle::parse_with_unitless(context,input)); + let theta = try!(specified::Angle::parse_with_unitless(context, input)); // TODO(gw): Check the axis can be normalized!! result.push(SpecifiedOperation::Rotate3D(ax, ay, az, theta)); Ok(()) @@ -1650,14 +1650,14 @@ ${helpers.predefined_type("scroll-snap-coordinate", }, "skewx" => { try!(input.parse_nested_block(|input| { - let theta_x = try!(specified::Angle::parse_with_unitless(context,input)); + let theta_x = try!(specified::Angle::parse_with_unitless(context, input)); result.push(SpecifiedOperation::SkewX(theta_x)); Ok(()) })) }, "skewy" => { try!(input.parse_nested_block(|input| { - let theta_y = try!(specified::Angle::parse_with_unitless(context,input)); + let theta_y = try!(specified::Angle::parse_with_unitless(context, input)); result.push(SpecifiedOperation::SkewY(theta_y)); Ok(()) })) diff --git a/components/style/values/specified/calc.rs b/components/style/values/specified/calc.rs index dc6f5cf2f81..d8c66e29a51 100644 --- a/components/style/values/specified/calc.rs +++ b/components/style/values/specified/calc.rs @@ -235,9 +235,9 @@ impl CalcNode { /// /// This should parse correctly: /// - /// * `2` - /// * `2 * 2` - /// * `2 * 2 + 2` (but will leave the `+ 2` unparsed). + /// * `2` + /// * `2 * 2` + /// * `2 * 2 + 2` (but will leave the `+ 2` unparsed). /// fn parse_product( context: &ParserContext, diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index a7b332b3479..96913fd482c 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -2497,16 +2497,18 @@ fn append_computed_property_value(keyframe: *mut structs::Keyframe, } } +enum Offset { + Zero, + One +} + fn fill_in_missing_keyframe_values(all_properties: &[TransitionProperty], timing_function: nsTimingFunctionBorrowed, style: &ComputedValues, properties_set_at_offset: &LonghandIdSet, - offset: f32, + offset: Offset, keyframes: RawGeckoKeyframeListBorrowedMut, shared_lock: &SharedRwLock) { - debug_assert!(offset == 0. || offset == 1., - "offset should be 0. or 1."); - let needs_filling = all_properties.iter().any(|ref property| { !properties_set_at_offset.has_transition_property_bit(property) }); @@ -2517,13 +2519,12 @@ fn fill_in_missing_keyframe_values(all_properties: &[TransitionProperty], } let keyframe = match offset { - 0. => unsafe { + Offset::Zero => unsafe { Gecko_GetOrCreateInitialKeyframe(keyframes, timing_function) }, - 1. => unsafe { + Offset::One => unsafe { Gecko_GetOrCreateFinalKeyframe(keyframes, timing_function) }, - _ => unreachable!("offset should be 0. or 1."), }; // Append properties that have not been set at this offset. @@ -2652,7 +2653,7 @@ pub extern "C" fn Servo_StyleSet_GetKeyframesForName(raw_data: RawServoStyleSetB inherited_timing_function, style, &properties_set_at_start, - 0., + Offset::Zero, keyframes, &global_style_data.shared_lock); } @@ -2661,7 +2662,7 @@ pub extern "C" fn Servo_StyleSet_GetKeyframesForName(raw_data: RawServoStyleSetB inherited_timing_function, style, &properties_set_at_end, - 1., + Offset::One, keyframes, &global_style_data.shared_lock); } diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index 610ac20d624..8d7e6c07b72 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -1072,34 +1072,6 @@ def run_lint_scripts(only_changed_files=False, progress=True, stylo=False): yield error -def check_commits(path='.'): - """ Checks if the test is being run under Travis CI environment - This is necessary since, after travis clones the branch for a PR, it merges - the branch against master, creating a merge commit. Hence, as a workaround, - we have to check if the second last merge commit is done by the author of - the pull request. - """ - is_travis = os.environ.get('TRAVIS') == 'true' - number_commits = '-n2' if is_travis else '-n1' - - """Gets all commits since the last merge.""" - args = ['git', 'log', number_commits, '--merges', '--format=%H:%an'] - # last_merge stores both the commit hash and the author name of the last merge in the output - last_merge_hash, last_merge_author = subprocess.check_output(args, cwd=path).strip().splitlines()[-1].split(':') - args = ['git', 'log', '{}..HEAD'.format(last_merge_hash), '--format=%s'] - commits = subprocess.check_output(args, cwd=path).lower().splitlines() - - for commit in commits: - # .split() to only match entire words - if 'wip' in commit.split(): - yield (':', ':', 'no commits should contain WIP') - - if last_merge_author != 'bors-servo': - yield (':', ':', 'no merge commits allowed, please rebase your commits over the upstream master branch') - - raise StopIteration - - def scan(only_changed_files=False, progress=True, stylo=False): # check config file for errors config_errors = check_config_file(CONFIG_FILE_PATH) @@ -1115,11 +1087,9 @@ def scan(only_changed_files=False, progress=True, stylo=False): dep_license_errors = check_dep_license_errors(get_dep_toml_files(only_changed_files), progress) # other lint checks lint_errors = run_lint_scripts(only_changed_files, progress, stylo=stylo) - # check commits for WIP - commit_errors = [] if stylo else check_commits() # chain all the iterators errors = itertools.chain(config_errors, directory_errors, lint_errors, - file_errors, dep_license_errors, commit_errors) + file_errors, dep_license_errors) error = None for error in errors: