core: Make ruffle_core::font module public

When adding more features and integrations to fonts (e.g. device fonts),
more and more types are being used from the font module.  This patch
makes it public so that symbols from it don't have to be reexported
manually.

Author: kjarosh

core/src/html/layout.rs

@@ -2,12 +2,11 @@
 
 use crate::context::UpdateContext;
 use crate::drawing::Drawing;
-use crate::font::{EvalParameters, Font, FontLike, FontSet, FontType};
+use crate::font::{DefaultFont, EvalParameters, Font, FontLike, FontSet, FontType};
 use crate::html::dimensions::{BoxBounds, Position, Size};
 use crate::html::text_format::{FormatSpans, TextFormat, TextSpan};
 use crate::string::{utils as string_utils, WStr};
 use crate::tag_utils::SwfMovie;
-use crate::DefaultFont;
 use gc_arena::Collect;
 use std::cmp::{max, min, Ordering};
 use std::fmt::{Debug, Formatter};

core/src/lib.rs

@@ -25,7 +25,7 @@ mod drawing;
 mod ecma_conversions;
 pub mod events;
 pub mod focus_tracker;
-mod font;
+pub mod font;
 mod frame_lifecycle;
 mod html;
 mod input;
@@ -59,7 +59,6 @@ pub mod stub;
 
 pub use context_menu::ContextMenuItem;
 pub use events::PlayerEvent;
-pub use font::{DefaultFont, FontFileData, FontQuery, FontType};
 pub use indexmap;
 pub use loader::LoadBehavior;
 pub use player::{Player, PlayerBuilder, PlayerMode, PlayerRuntime, StaticCallstack};

core/src/library.rs

@@ -15,7 +15,7 @@ use ruffle_render::bitmap::BitmapHandle;
 use ruffle_render::utils::remove_invalid_jpeg_data;
 
 use crate::backend::ui::{FontDefinition, UiBackend};
-use crate::DefaultFont;
+use crate::font::DefaultFont;
 use fnv::{FnvHashMap, FnvHashSet};
 use std::collections::HashMap;
 use std::sync::{Arc, Weak};

core/src/player.rs

@@ -32,6 +32,7 @@ use crate::events::{ButtonKeyCode, ClipEvent, ClipEventResult, KeyCode, MouseBut
 use crate::external::{ExternalInterface, ExternalInterfaceProvider, NullFsCommandProvider};
 use crate::external::{FsCommandProvider, Value as ExternalValue};
 use crate::focus_tracker::NavigationDirection;
+use crate::font::DefaultFont;
 use crate::frame_lifecycle::{run_all_phases_avm2, FramePhase};
 use crate::input::InputEvent;
 use crate::input::InputManager;
@@ -50,7 +51,7 @@ use crate::system_properties::SystemProperties;
 use crate::tag_utils::SwfMovie;
 use crate::timer::Timers;
 use crate::vminterface::Instantiator;
-use crate::{DefaultFont, DEFAULT_PLAYER_VERSION};
+use crate::DEFAULT_PLAYER_VERSION;
 use async_channel::Sender;
 use gc_arena::lock::GcRefLock;
 use gc_arena::{Collect, DynamicRootSet, Mutation, Rootable};

desktop/src/backends/ui.rs

@@ -14,7 +14,7 @@ use ruffle_core::backend::ui::{
     DialogLoaderError, DialogResultFuture, FileDialogResult, FileFilter, FontDefinition,
     FullscreenError, LanguageIdentifier, MouseCursor, UiBackend,
 };
-use ruffle_core::{FontFileData, FontQuery};
+use ruffle_core::font::{FontFileData, FontQuery};
 use std::fs::File;
 use std::path::Path;
 use std::rc::Rc;

desktop/src/player.rs

@@ -12,7 +12,8 @@ use anyhow::anyhow;
 use ruffle_core::backend::navigator::{OwnedFuture, SocketMode};
 use ruffle_core::config::Letterbox;
 use ruffle_core::events::{GamepadButton, KeyCode};
-use ruffle_core::{DefaultFont, LoadBehavior, Player, PlayerBuilder, PlayerEvent};
+use ruffle_core::font::DefaultFont;
+use ruffle_core::{LoadBehavior, Player, PlayerBuilder, PlayerEvent};
 use ruffle_frontend_utils::backends::audio::CpalAudioBackend;
 use ruffle_frontend_utils::backends::navigator::{ExternalNavigatorBackend, FutureSpawner};
 use ruffle_frontend_utils::bundle::source::BundleSourceError;

tests/framework/src/backends/ui.rs

@@ -2,13 +2,11 @@ use std::collections::HashMap;
 
 use crate::test::Font;
 use chrono::{DateTime, Utc};
-use ruffle_core::{
-    FontFileData, FontQuery,
-    backend::ui::{
-        DialogLoaderError, DialogResultFuture, FileDialogResult, FileFilter, FontDefinition,
-        FullscreenError, LanguageIdentifier, MouseCursor, US_ENGLISH, UiBackend,
-    },
+use ruffle_core::backend::ui::{
+    DialogLoaderError, DialogResultFuture, FileDialogResult, FileFilter, FontDefinition,
+    FullscreenError, LanguageIdentifier, MouseCursor, US_ENGLISH, UiBackend,
 };
+use ruffle_core::font::{FontFileData, FontQuery};
 use url::Url;
 
 /// A simulated file dialog response, for use in tests

tests/framework/src/options/font.rs

@@ -1,4 +1,5 @@
-use ruffle_core::{DefaultFont, FontQuery, FontType, Player};
+use ruffle_core::Player;
+use ruffle_core::font::{DefaultFont, FontQuery, FontType};
 use serde::Deserialize;
 
 #[derive(Deserialize, Default, Clone)]

tests/framework/src/test.rs

@@ -5,7 +5,8 @@ use crate::options::TestOptions;
 use crate::runner::TestRunner;
 use crate::util::read_bytes;
 use anyhow::{Result, anyhow};
-use ruffle_core::{FontQuery, FontType, tag_utils::SwfMovie};
+use ruffle_core::font::{FontQuery, FontType};
+use ruffle_core::tag_utils::SwfMovie;
 use ruffle_input_format::InputInjector;
 use ruffle_socket_format::SocketEvent;
 use vfs::VfsPath;

web/src/builder.rs

@@ -11,10 +11,9 @@ use ruffle_core::backend::ui::FontDefinition;
 use ruffle_core::compatibility_rules::CompatibilityRules;
 use ruffle_core::config::{Letterbox, NetworkingAccessMode};
 use ruffle_core::events::{GamepadButton, KeyCode};
-use ruffle_core::{
-    Color, DefaultFont, Player, PlayerBuilder, PlayerRuntime, StageAlign, StageScaleMode, swf,
-};
-use ruffle_core::{FontFileData, ttf_parser};
+use ruffle_core::font::{DefaultFont, FontFileData};
+use ruffle_core::ttf_parser;
+use ruffle_core::{Color, Player, PlayerBuilder, PlayerRuntime, StageAlign, StageScaleMode, swf};
 use ruffle_render::backend::RenderBackend;
 use ruffle_render::quality::StageQuality;
 use ruffle_video_external::backend::ExternalVideoBackend;