Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17915 - upsuper:media-features, r=emilio

Browse source 
Remove Gecko_GetMediaFeatures and access nsMediaFeatures::features directly

This is the Servo side change of [bug 1385529](https://bugzilla.mozilla.org/show_bug.cgi?id=1385529).
This commit is contained in:
bors-servo 2017-07-29 05:22:20 -05:00 • committed by GitHub
commit 03223be66b
2 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/gecko/generated/bindings.rs
View file

@ -78,7 +78,6 @@ use gecko_bindings::structs::nsFont;
use gecko_bindings::structs::nsIAtom; use gecko_bindings::structs::nsIAtom;
use gecko_bindings::structs::nsIURI; use gecko_bindings::structs::nsIURI;
use gecko_bindings::structs::nsCompatibility; use gecko_bindings::structs::nsCompatibility;
use gecko_bindings::structs::nsMediaFeature;
use gecko_bindings::structs::nsRestyleHint; use gecko_bindings::structs::nsRestyleHint;
use gecko_bindings::structs::nsStyleBackground; use gecko_bindings::structs::nsStyleBackground;
unsafe impl Send for nsStyleBackground {} unsafe impl Send for nsStyleBackground {}
@ -1485,9 +1484,6 @@ extern "C" {
extern "C" { extern "C" {
pub fn Gecko_StyleSheet_Release(aSheet: *const ServoStyleSheet); pub fn Gecko_StyleSheet_Release(aSheet: *const ServoStyleSheet);
} }
extern "C" {
pub fn Gecko_GetMediaFeatures() -> *const nsMediaFeature;
}
extern "C" { extern "C" {
pub fn Gecko_LookupCSSKeyword(string: *const u8, len: u32) pub fn Gecko_LookupCSSKeyword(string: *const u8, len: u32)
-> nsCSSKeyword; -> nsCSSKeyword;

9
components/style/gecko/media_queries.rs
View file

@ -13,6 +13,7 @@ use euclid::Size2D;
use font_metrics::get_metrics_provider_for_product; use font_metrics::get_metrics_provider_for_product;
use gecko::values::convert_nscolor_to_rgba; use gecko::values::convert_nscolor_to_rgba;
use gecko_bindings::bindings; use gecko_bindings::bindings;
use gecko_bindings::structs;
use gecko_bindings::structs::{nsCSSKeyword, nsCSSProps_KTableEntry, nsCSSValue, nsCSSUnit, nsStringBuffer}; use gecko_bindings::structs::{nsCSSKeyword, nsCSSProps_KTableEntry, nsCSSValue, nsCSSUnit, nsStringBuffer};
use gecko_bindings::structs::{nsMediaExpression_Range, nsMediaFeature}; use gecko_bindings::structs::{nsMediaExpression_Range, nsMediaFeature};
use gecko_bindings::structs::{nsMediaFeature_ValueType, nsMediaFeature_RangeType, nsMediaFeature_RequirementFlags}; use gecko_bindings::structs::{nsMediaFeature_ValueType, nsMediaFeature_RangeType, nsMediaFeature_RequirementFlags};
@ -425,13 +426,8 @@ impl MediaExpressionValue {
fn find_feature<F>(mut f: F) -> Option<&'static nsMediaFeature> fn find_feature<F>(mut f: F) -> Option<&'static nsMediaFeature>
where F: FnMut(&'static nsMediaFeature) -> bool, where F: FnMut(&'static nsMediaFeature) -> bool,
{ {
// FIXME(emilio): With build-time bindgen, we would be able to use
// structs::nsMediaFeatures_features. That would unfortunately break MSVC
// builds, or require one bindings file per platform.
//
// I'm not into any of those, so meanwhile let's use a FFI function.
unsafe { unsafe {
let mut features = bindings::Gecko_GetMediaFeatures(); let mut features = structs::nsMediaFeatures_features.as_ptr();
while !(*features).mName.is_null() { while !(*features).mName.is_null() {
if f(&*features) { if f(&*features) {
return Some(&*features); return Some(&*features);
@ -439,7 +435,6 @@ fn find_feature<F>(mut f: F) -> Option<&'static nsMediaFeature>
features = features.offset(1); features = features.offset(1);
} }
} }
None None
} }