Auto merge of #4757 - moz-gfx:github-sync, r=auto

Sync changes from mozilla-central gfx/wr

None

Author: bors-servo

Cargo.lock

@@ -9,16 +9,16 @@ build = "build.rs"
 edition = "2018"
 
 [features]
-default = ["freetype-lib"]
-freetype-lib = ["freetype/freetype-sys"]
+default = ["static_freetype"]
 profiler = ["tracy-rs/enable_profiler"]
-capture = ["api/serialize", "ron", "serde", "smallvec/serde", "etagere/serialization"]
-replay = ["api/deserialize", "ron", "serde", "smallvec/serde", "etagere/serialization"]
+capture = ["api/serialize", "ron", "serde", "smallvec/serde", "etagere/serialization", "glyph_rasterizer/capture"]
+replay = ["api/deserialize", "ron", "serde", "smallvec/serde", "etagere/serialization", "glyph_rasterizer/replay"]
 display_list_stats = ["api/display_list_stats"]
 serialize_program = ["serde", "webrender_build/serialize_program"]
-no_static_freetype = []
+dynamic_freetype = ["glyph_rasterizer/dynamic_freetype"]
+static_freetype = ["glyph_rasterizer/static_freetype"]
 leak_checks = []
-gecko = ["fog"]
+gecko = ["fog", "glyph_rasterizer/gecko"]
 sw_compositor = ["swgl"]
 
 [build-dependencies]
@@ -47,6 +47,7 @@ time = "0.1"
 api = { version = "0.62.0", path = "../webrender_api", package = "webrender_api" }
 webrender_build = { version = "0.0.2", path = "../webrender_build" }
 malloc_size_of = { version = "0.0.2", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }
+glyph_rasterizer = { version = "0.1.0", path = "../wr_glyph_rasterizer", package = "wr_glyph_rasterizer", default-features = false }
 svg_fmt = "0.4"
 tracy-rs = "0.1.2"
 derive_more = { version = "0.99", default-features = false, features = ["add_assign"] }
@@ -59,16 +60,3 @@ topological-sort = "0.1"
 [dev-dependencies]
 mozangle = "0.3.3"
 rand = "0.4"
-
-[target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
-freetype = { version = "0.7", default-features = false }
-libc = "0.2"
-
-[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.11"
-
-[target.'cfg(target_os = "macos")'.dependencies]
-core-foundation = "0.9.2"
-core-graphics = "0.22.3"
-core-text = { version = "19.2", default-features = false }
-objc = "0.2"

webrender/Cargo.toml

@@ -6,7 +6,7 @@ use crate::api::{BlobImageKey, ImageDescriptor, DirtyRect, TileSize};
 use crate::api::{BlobImageHandler, AsyncBlobImageRasterizer, BlobImageData, BlobImageParams};
 use crate::api::{BlobImageRequest, BlobImageDescriptor, FontTemplate};
 use crate::api::units::*;
-use crate::glyph_rasterizer::{SharedFontResources, BaseFontInstance};
+use glyph_rasterizer::{SharedFontResources, BaseFontInstance};
 use crate::render_api::{ResourceUpdate, TransactionMsg, AddFont};
 use crate::image_tiling::*;
 use crate::profiler;

webrender/src/api_resources.rs

@@ -8,7 +8,7 @@ use api::units::*;
 use crate::clip::{ClipNodeFlags, ClipNodeRange, ClipItemKind, ClipStore};
 use crate::command_buffer::PrimitiveCommand;
 use crate::spatial_tree::{SpatialTree, SpatialNodeIndex, CoordinateSystemId};
-use crate::glyph_rasterizer::{GlyphFormat, SubpixelDirection};
+use glyph_rasterizer::{GlyphFormat, SubpixelDirection};
 use crate::gpu_cache::{GpuBlockData, GpuCache, GpuCacheAddress};
 use crate::gpu_types::{BrushFlags, BrushInstance, PrimitiveHeaders, ZBufferId, ZBufferIdGenerator};
 use crate::gpu_types::{SplitCompositeInstance};

webrender/src/batch.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use api::{FontKey, FontInstanceKey, IdNamespace};
-use crate::glyph_rasterizer::{FontInstance, GlyphFormat, GlyphKey, GlyphRasterizer};
+use glyph_rasterizer::{FontInstance, GlyphFormat, GlyphKey, GlyphRasterizer};
 use crate::internal_types::{FrameId, FrameStamp, FastHashMap};
 use crate::resource_cache::ResourceClassCache;
 use std::sync::Arc;

webrender/src/glyph_cache.rs

@@ -14,7 +14,7 @@ use crate::render_task::RenderTaskAddress;
 use crate::renderer::ShaderColorMode;
 use std::i32;
 use crate::util::{TransformedRectKind, MatrixHelpers};
-use crate::glyph_rasterizer::SubpixelDirection;
+use glyph_rasterizer::SubpixelDirection;
 use crate::util::{ScaleOffset, pack_as_float};
 
 // Contains type that must exactly match the same structures declared in GLSL.

webrender/src/gpu_types.rs

@@ -724,9 +724,6 @@ pub enum ResultMsg {
     ForceRedraw,
 }
 
-#[derive(Clone, Debug)]
-pub struct ResourceCacheError;
-
 /// Primitive metadata we pass around in a bunch of places
 #[derive(Copy, Clone, Debug)]
 pub struct LayoutPrimitiveInfo {

webrender/src/internal_types.rs

@@ -95,10 +95,7 @@ mod ellipse;
 mod filterdata;
 mod frame_builder;
 mod freelist;
-#[cfg(any(target_os = "macos", target_os = "windows"))]
-mod gamma_lut;
 mod glyph_cache;
-mod glyph_rasterizer;
 mod gpu_cache;
 mod gpu_types;
 mod hit_test;
@@ -143,43 +140,6 @@ pub mod shader_source {
     include!(concat!(env!("OUT_DIR"), "/shaders.rs"));
 }
 
-mod platform {
-    #[cfg(target_os = "macos")]
-    pub use crate::platform::macos::font;
-    #[cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))]
-    pub use crate::platform::unix::font;
-    #[cfg(target_os = "windows")]
-    pub use crate::platform::windows::font;
-
-    #[cfg(target_os = "macos")]
-    pub mod macos {
-        pub mod font;
-    }
-    #[cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))]
-    pub mod unix {
-        pub mod font;
-    }
-    #[cfg(target_os = "windows")]
-    pub mod windows {
-        pub mod font;
-    }
-}
-
-#[cfg(target_os = "macos")]
-extern crate core_foundation;
-#[cfg(target_os = "macos")]
-extern crate core_graphics;
-#[cfg(target_os = "macos")]
-extern crate core_text;
-
-#[cfg(all(unix, not(target_os = "macos")))]
-extern crate freetype;
-#[cfg(all(unix, not(target_os = "macos")))]
-extern crate libc;
-
-#[cfg(target_os = "windows")]
-extern crate dwrote;
-
 extern crate bincode;
 extern crate byteorder;
 pub extern crate euclid;
@@ -228,6 +188,7 @@ pub use crate::picture::{TileNode, TileNodeKind, TileOffset};
 pub use crate::intern::ItemUid;
 pub use crate::render_api::*;
 pub use crate::tile_cache::{PictureCacheDebugInfo, DirtyTileDebugInfo, TileDebugInfo, SliceDebugInfo};
+pub use glyph_rasterizer;
 
 #[cfg(feature = "sw_compositor")]
 pub use crate::compositor::sw_compositor;

webrender/src/lib.rs

@@ -16,7 +16,7 @@ use crate::debug_item::{DebugItem, DebugMessage};
 use crate::debug_colors;
 use crate::scene_building::{CreateShadow, IsVisible};
 use crate::frame_builder::FrameBuildingState;
-use crate::glyph_rasterizer::GlyphKey;
+use glyph_rasterizer::GlyphKey;
 use crate::gpu_cache::{GpuCacheAddress, GpuCacheHandle, GpuDataRequest};
 use crate::gpu_types::{BrushFlags};
 use crate::intern;

webrender/src/prim_store/mod.rs

@@ -6,7 +6,7 @@ use api::{ColorF, FontInstanceFlags, GlyphInstance, RasterSpace, Shadow};
 use api::units::{LayoutToWorldTransform, LayoutVector2D, RasterPixelScale, DevicePixelScale};
 use crate::scene_building::{CreateShadow, IsVisible};
 use crate::frame_builder::FrameBuildingState;
-use crate::glyph_rasterizer::{FontInstance, FontTransform, GlyphKey, FONT_SIZE_LIMIT};
+use glyph_rasterizer::{FontInstance, FontTransform, GlyphKey, FONT_SIZE_LIMIT};
 use crate::gpu_cache::GpuCache;
 use crate::intern;
 use crate::internal_types::LayoutPrimitiveInfo;