aboutsummaryrefslogtreecommitdiffstats
path: root/components/gfx/font.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-02-19 00:54:06 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-02-19 00:54:06 +0530
commitab07b06823ea9748a6091aee2281495f86f00bce (patch)
tree2dd06ac4834d5bc4bcba6e4ada3aab12bb2c12d9 /components/gfx/font.rs
parentfe70efe07f6d72665f10c752884e5705d5bdc600 (diff)
parentc0531c312fdb0783e4d121b4c2d7f15d4f5cdc1f (diff)
downloadservo-ab07b06823ea9748a6091aee2281495f86f00bce.tar.gz
servo-ab07b06823ea9748a6091aee2281495f86f00bce.zip
Auto merge of #9589 - glennw:webrender, r=pcwalton
Add WebRender integration to Servo. WebRender is an experimental GPU accelerated rendering backend for Servo. The WebRender backend can be specified by running Servo with the -w option (otherwise the default rendering backend will be used). WebRender has many bugs, and missing features - but it is usable to browse most websites - please report any WebRender specific rendering bugs you encounter! <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9589) <!-- Reviewable:end -->
Diffstat (limited to 'components/gfx/font.rs')
-rw-r--r--components/gfx/font.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/components/gfx/font.rs b/components/gfx/font.rs
index bb9ff7b3d45..8e5a80939ab 100644
--- a/components/gfx/font.rs
+++ b/components/gfx/font.rs
@@ -23,6 +23,7 @@ use text::shaping::ShaperMethods;
use time;
use unicode_script::Script;
use util::cache::HashCache;
+use webrender_traits;
static TEXT_SHAPING_PERFORMANCE_COUNTER: AtomicUsize = ATOMIC_USIZE_INIT;
@@ -100,6 +101,7 @@ pub struct Font {
pub shaper: Option<Shaper>,
pub shape_cache: HashCache<ShapeCacheEntry, Arc<GlyphStore>>,
pub glyph_advance_cache: HashCache<u32, FractionalPixel>,
+ pub font_key: Option<webrender_traits::FontKey>,
}
bitflags! {