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

Auto merge of #16406 - Manishearth:stylo-hide-font-metrics, r=heycam

Browse source 
stylo: Disable font metrics

r=heycam https://bugzilla.mozilla.org/show_bug.cgi?id=1356105

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16406)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-13 01:09:49 -05:00 • committed by GitHub
commit f312891ace
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
components/style/gecko/wrapper.rs
View file

@ -22,7 +22,7 @@ use dom::{self, AnimationRules, DescendantsBit, LayoutIterator, NodeInfo, TEleme
use dom::{OpaqueNode, PresentationalHintsSynthetizer}; use dom::{OpaqueNode, PresentationalHintsSynthetizer};
use element_state::ElementState; use element_state::ElementState;
use error_reporting::StdoutErrorReporter; use error_reporting::StdoutErrorReporter;
use font_metrics::{FontMetrics, FontMetricsProvider, FontMetricsQueryResult}; use font_metrics::{FontMetricsProvider, FontMetricsQueryResult};
use gecko::global_style_data::GLOBAL_STYLE_DATA; use gecko::global_style_data::GLOBAL_STYLE_DATA;
use gecko::selector_parser::{SelectorImpl, NonTSPseudoClass, PseudoElement}; use gecko::selector_parser::{SelectorImpl, NonTSPseudoClass, PseudoElement};
use gecko::snapshot_helpers; use gecko::snapshot_helpers;
@ -472,22 +472,25 @@ impl FontMetricsProvider for GeckoFontMetricsProvider {
sizes.size_for_generic(font_family) sizes.size_for_generic(font_family)
} }
fn query(&self, font: &Font, font_size: Au, wm: WritingMode, fn query(&self, _font: &Font, _font_size: Au, _wm: WritingMode,
in_media_query: bool, device: &Device) -> FontMetricsQueryResult { _in_media_query: bool, _device: &Device) -> FontMetricsQueryResult {
use gecko_bindings::bindings::Gecko_GetFontMetrics; // Disabled until we can make font metrics thread safe (bug 1356105)
let gecko_metrics = unsafe { //
Gecko_GetFontMetrics(&*device.pres_context, // use gecko_bindings::bindings::Gecko_GetFontMetrics;
wm.is_vertical() && !wm.is_sideways(), // let gecko_metrics = unsafe {
font.gecko(), // Gecko_GetFontMetrics(&*device.pres_context,
font_size.0, // wm.is_vertical() && !wm.is_sideways(),
// we don't use the user font set in a media query // font.gecko(),
!in_media_query) // font_size.0,
}; // // we don't use the user font set in a media query
let metrics = FontMetrics { // !in_media_query)
x_height: Au(gecko_metrics.mXSize), // };
zero_advance_measure: Au(gecko_metrics.mChSize), // let metrics = FontMetrics {
}; // x_height: Au(gecko_metrics.mXSize),
FontMetricsQueryResult::Available(metrics) // zero_advance_measure: Au(gecko_metrics.mChSize),
// };
// FontMetricsQueryResult::Available(metrics)
FontMetricsQueryResult::NotAvailable
} }
} }