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

Auto merge of #16551 - glennw:update-wr-mostly-borders, r=jdm

Browse source 
Update WR (improved double border quality, minor API changes).

<!-- 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/16551)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-23 17:50:08 -05:00 • committed by GitHub
commit 0f6c883658
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Cargo.lock generated
View file

@ -3168,7 +3168,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender" name = "webrender"
version = "0.35.0" version = "0.35.0"
source = "git+https://github.com/servo/webrender#04eeee4593c11a0d9c934722896c67aa5ddd9554" source = "git+https://github.com/servo/webrender#861fb7b5570d69de37d8a1f364f42f38c87cb2d3"
dependencies = [ dependencies = [
"app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3196,10 +3196,11 @@ dependencies = [
[[package]] [[package]]
name = "webrender_traits" name = "webrender_traits"
version = "0.35.0" version = "0.35.0"
source = "git+https://github.com/servo/webrender#04eeee4593c11a0d9c934722896c67aa5ddd9554" source = "git+https://github.com/servo/webrender#861fb7b5570d69de37d8a1f364f42f38c87cb2d3"
dependencies = [ dependencies = [
"app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 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.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",

5
components/gfx/platform/macos/font_template.rs
View file

@ -18,6 +18,7 @@ use std::fs::File;
use std::io::{Read, Error as IoError}; use std::io::{Read, Error as IoError};
use std::ops::Deref; use std::ops::Deref;
use std::sync::Mutex; use std::sync::Mutex;
use webrender_traits::NativeFontHandle;
/// Platform specific font representation for mac. /// Platform specific font representation for mac.
/// The identifier is a PostScript font name. The /// The identifier is a PostScript font name. The
@ -106,8 +107,8 @@ impl FontTemplateData {
} }
/// Returns the native font that underlies this font template, if applicable. /// Returns the native font that underlies this font template, if applicable.
pub fn native_font(&self) -> Option<CGFont> { pub fn native_font(&self) -> Option<NativeFontHandle> {
self.ctfont(0.0).map(|ctfont| ctfont.copy_to_CGFont()) self.ctfont(0.0).map(|ctfont| NativeFontHandle(ctfont.copy_to_CGFont()))
} }
} }

6
components/layout/webrender_helpers.rs
View file

@ -258,10 +258,12 @@ impl WebRenderDisplayItemConverter for DisplayItem {
}; };
if !slice.glyphs.is_whitespace() { if !slice.glyphs.is_whitespace() {
let glyph_offset = glyph.offset().unwrap_or(Point2D::zero()); let glyph_offset = glyph.offset().unwrap_or(Point2D::zero());
let x = (origin.x + glyph_offset.x).to_f32_px();
let y = (origin.y + glyph_offset.y).to_f32_px();
let point = webrender_traits::LayoutPoint::new(x, y);
let glyph = webrender_traits::GlyphInstance { let glyph = webrender_traits::GlyphInstance {
index: glyph.id(), index: glyph.id(),
point: Point2D::new((origin.x + glyph_offset.x).to_f32_px(), point: point,
(origin.y + glyph_offset.y).to_f32_px()),
}; };
glyphs.push(glyph); glyphs.push(glyph);
} }

4
tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
View file

@ -1,3 +1,5 @@
[transform-input-018.htm] [transform-input-018.htm]
type: reftest type: reftest
expected: FAIL expected:
if os == "linux": FAIL