aboutsummaryrefslogtreecommitdiffstats
path: root/components/gfx
diff options
context:
space:
mode:
authorSamson <16504129+sagudev@users.noreply.github.com>2023-09-08 14:11:31 +0200
committerGitHub <noreply@github.com>2023-09-08 12:11:31 +0000
commit711dbbd4afe161fc334db198357d814e99e5ac57 (patch)
tree5c0e3a6a18dd26c9e39a47a790c6ec36f0ff8d4d /components/gfx
parenta0cff6a0858e675b805a71238ab96fa295a271f8 (diff)
downloadservo-711dbbd4afe161fc334db198357d814e99e5ac57.tar.gz
servo-711dbbd4afe161fc334db198357d814e99e5ac57.zip
remove `extern crate` (#30311)
* remove extern crate * Update components/script_plugins/lib.rs Co-authored-by: Martin Robinson <mrobinson@igalia.com> --------- Co-authored-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components/gfx')
-rw-r--r--components/gfx/font.rs6
-rw-r--r--components/gfx/font_cache_thread.rs2
-rw-r--r--components/gfx/font_context.rs1
-rw-r--r--components/gfx/font_template.rs1
-rw-r--r--components/gfx/lib.rs12
-rw-r--r--components/gfx/platform/freetype/font.rs1
-rw-r--r--components/gfx/platform/freetype/font_list.rs1
-rw-r--r--components/gfx/platform/freetype/font_template.rs1
-rw-r--r--components/gfx/platform/macos/font.rs1
-rw-r--r--components/gfx/platform/macos/font_list.rs1
-rw-r--r--components/gfx/platform/windows/font.rs1
-rw-r--r--components/gfx/platform/windows/font_list.rs1
-rw-r--r--components/gfx/platform/windows/font_template.rs1
-rw-r--r--components/gfx/text/glyph.rs2
-rw-r--r--components/gfx/text/shaping/harfbuzz.rs3
-rw-r--r--components/gfx/text/text_run.rs2
16 files changed, 24 insertions, 13 deletions
diff --git a/components/gfx/font.rs b/components/gfx/font.rs
index 054b732b779..3d0bc816fb3 100644
--- a/components/gfx/font.rs
+++ b/components/gfx/font.rs
@@ -12,8 +12,11 @@ use crate::text::glyph::{ByteIndex, GlyphData, GlyphId, GlyphStore};
use crate::text::shaping::ShaperMethods;
use crate::text::Shaper;
use app_units::Au;
+use bitflags::bitflags;
use euclid::default::{Point2D, Rect, Size2D};
-use servo_atoms::Atom;
+use log::debug;
+use serde::{Deserialize, Serialize};
+use servo_atoms::{atom, Atom};
use smallvec::SmallVec;
use std::borrow::ToOwned;
use std::cell::RefCell;
@@ -29,6 +32,7 @@ use style::values::computed::font::{GenericFontFamily, SingleFontFamily};
use unicode_script::Script;
use webrender_api::FontInstanceKey;
+#[macro_export]
macro_rules! ot_tag {
($t1:expr, $t2:expr, $t3:expr, $t4:expr) => {
(($t1 as u32) << 24) | (($t2 as u32) << 16) | (($t3 as u32) << 8) | ($t4 as u32)
diff --git a/components/gfx/font_cache_thread.rs b/components/gfx/font_cache_thread.rs
index 325018102c9..ad1c5f6026b 100644
--- a/components/gfx/font_cache_thread.rs
+++ b/components/gfx/font_cache_thread.rs
@@ -14,8 +14,10 @@ use crate::platform::font_template::FontTemplateData;
use app_units::Au;
use gfx_traits::{FontData, WebrenderApi};
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
+use log::{debug, trace};
use net_traits::request::{Destination, Referrer, RequestBuilder};
use net_traits::{fetch_async, CoreResourceThread, FetchResponseMsg};
+use serde::{Deserialize, Serialize};
use servo_atoms::Atom;
use servo_url::ServoUrl;
use std::borrow::ToOwned;
diff --git a/components/gfx/font_context.rs b/components/gfx/font_context.rs
index 6a975e6b12f..0e6d0ce12e7 100644
--- a/components/gfx/font_context.rs
+++ b/components/gfx/font_context.rs
@@ -11,6 +11,7 @@ use crate::platform::font::FontHandle;
pub use crate::platform::font_context::FontContextHandle;
use app_units::Au;
use fnv::FnvHasher;
+use log::debug;
use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
use servo_arc::Arc;
use std::cell::RefCell;
diff --git a/components/gfx/font_template.rs b/components/gfx/font_template.rs
index c01f58460d8..25b2e60f117 100644
--- a/components/gfx/font_template.rs
+++ b/components/gfx/font_template.rs
@@ -6,6 +6,7 @@ use crate::font::FontHandleMethods;
use crate::platform::font::FontHandle;
use crate::platform::font_context::FontContextHandle;
use crate::platform::font_template::FontTemplateData;
+use serde::{Deserialize, Serialize};
use servo_atoms::Atom;
use std::fmt::{Debug, Error, Formatter};
use std::io::Error as IoError;
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs
index 15148328bf6..c13d9663079 100644
--- a/components/gfx/lib.rs
+++ b/components/gfx/lib.rs
@@ -4,19 +4,7 @@
#![deny(unsafe_code)]
-#[macro_use]
-extern crate bitflags;
-#[macro_use]
-extern crate lazy_static;
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde;
-#[macro_use]
-extern crate servo_atoms;
-
// Fonts
-#[macro_use]
pub mod font;
pub mod font_cache_thread;
pub mod font_context;
diff --git a/components/gfx/platform/freetype/font.rs b/components/gfx/platform/freetype/font.rs
index 63cda12c7a9..bbfc94d7e8a 100644
--- a/components/gfx/platform/freetype/font.rs
+++ b/components/gfx/platform/freetype/font.rs
@@ -21,6 +21,7 @@ use freetype::freetype::{FT_Load_Glyph, FT_Set_Char_Size};
use freetype::freetype::{FT_SizeRec, FT_Size_Metrics, FT_UInt, FT_Vector};
use freetype::succeeded;
use freetype::tt_os2::TT_OS2;
+use log::debug;
use servo_atoms::Atom;
use std::ffi::CString;
use std::os::raw::{c_char, c_long};
diff --git a/components/gfx/platform/freetype/font_list.rs b/components/gfx/platform/freetype/font_list.rs
index fded1d160d5..c0809ece5ed 100644
--- a/components/gfx/platform/freetype/font_list.rs
+++ b/components/gfx/platform/freetype/font_list.rs
@@ -11,6 +11,7 @@ use fontconfig_sys::{FcFontSetDestroy, FcMatchPattern, FcPatternCreate, FcPatter
use fontconfig_sys::{FcFontSetList, FcObjectSetCreate, FcObjectSetDestroy, FcPatternAddString};
use fontconfig_sys::{FcObjectSetAdd, FcPatternGetInteger};
use libc::{c_char, c_int};
+use log::debug;
use std::ffi::CString;
use std::ptr;
diff --git a/components/gfx/platform/freetype/font_template.rs b/components/gfx/platform/freetype/font_template.rs
index 52654ed6d5a..2524cf9bb69 100644
--- a/components/gfx/platform/freetype/font_template.rs
+++ b/components/gfx/platform/freetype/font_template.rs
@@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+use serde::{Deserialize, Serialize};
use servo_atoms::Atom;
use std::fmt;
use std::fs::File;
diff --git a/components/gfx/platform/macos/font.rs b/components/gfx/platform/macos/font.rs
index eff3d51789d..ca94c384a78 100644
--- a/components/gfx/platform/macos/font.rs
+++ b/components/gfx/platform/macos/font.rs
@@ -20,6 +20,7 @@ use core_graphics::geometry::CGRect;
use core_text::font::CTFont;
use core_text::font_descriptor::kCTFontDefaultOrientation;
use core_text::font_descriptor::{SymbolicTraitAccessors, TraitAccessors};
+use log::debug;
use servo_atoms::Atom;
use std::ops::Range;
use std::sync::Arc;
diff --git a/components/gfx/platform/macos/font_list.rs b/components/gfx/platform/macos/font_list.rs
index d02fbdc7dbc..70d46edd2b0 100644
--- a/components/gfx/platform/macos/font_list.rs
+++ b/components/gfx/platform/macos/font_list.rs
@@ -3,6 +3,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use crate::text::util::unicode_plane;
+use log::debug;
use ucd::{Codepoint, UnicodeBlock};
pub fn for_each_available_family<F>(mut callback: F)
diff --git a/components/gfx/platform/windows/font.rs b/components/gfx/platform/windows/font.rs
index 5b41b0c21f0..9e371685491 100644
--- a/components/gfx/platform/windows/font.rs
+++ b/components/gfx/platform/windows/font.rs
@@ -15,6 +15,7 @@ use crate::text::glyph::GlyphId;
use app_units::Au;
use dwrote::{Font, FontFace, FontFile};
use dwrote::{FontStretch, FontStyle};
+use log::debug;
use servo_atoms::Atom;
use std::fmt;
use std::ops::Deref;
diff --git a/components/gfx/platform/windows/font_list.rs b/components/gfx/platform/windows/font_list.rs
index d9d1261dba9..9de2073d6b8 100644
--- a/components/gfx/platform/windows/font_list.rs
+++ b/components/gfx/platform/windows/font_list.rs
@@ -4,6 +4,7 @@
use crate::text::util::unicode_plane;
use dwrote::{Font, FontCollection, FontDescriptor};
+use lazy_static::lazy_static;
use servo_atoms::Atom;
use std::collections::HashMap;
use std::sync::atomic::{AtomicUsize, Ordering};
diff --git a/components/gfx/platform/windows/font_template.rs b/components/gfx/platform/windows/font_template.rs
index 8576e3f6fc8..96923c77afc 100644
--- a/components/gfx/platform/windows/font_template.rs
+++ b/components/gfx/platform/windows/font_template.rs
@@ -3,6 +3,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use crate::platform::windows::font_list::font_from_atom;
+use serde::{Deserialize, Serialize};
use servo_atoms::Atom;
use std::fmt;
use std::io;
diff --git a/components/gfx/text/glyph.rs b/components/gfx/text/glyph.rs
index 7492064e3f7..373fb48dc86 100644
--- a/components/gfx/text/glyph.rs
+++ b/components/gfx/text/glyph.rs
@@ -4,7 +4,9 @@
use app_units::Au;
use euclid::default::Point2D;
+use log::debug;
use range::{self, EachIndex, Range, RangeIndex};
+use serde::{Deserialize, Serialize};
use std::cmp::{Ordering, PartialOrd};
use std::vec::Vec;
use std::{fmt, mem, u16};
diff --git a/components/gfx/text/shaping/harfbuzz.rs b/components/gfx/text/shaping/harfbuzz.rs
index ef49bb32e68..20791a52148 100644
--- a/components/gfx/text/shaping/harfbuzz.rs
+++ b/components/gfx/text/shaping/harfbuzz.rs
@@ -5,6 +5,7 @@
#![allow(unsafe_code)]
use crate::font::{Font, FontTableMethods, FontTableTag, ShapingFlags, ShapingOptions, KERN};
+use crate::ot_tag;
use crate::platform::font::FontTable;
use crate::text::glyph::{ByteIndex, GlyphData, GlyphId, GlyphStore};
use crate::text::shaping::ShaperMethods;
@@ -38,6 +39,8 @@ use harfbuzz_sys::{hb_buffer_t, hb_codepoint_t, hb_font_funcs_t};
use harfbuzz_sys::{hb_face_t, hb_font_t};
use harfbuzz_sys::{hb_position_t, hb_tag_t};
use harfbuzz_sys::{HB_DIRECTION_LTR, HB_DIRECTION_RTL, HB_MEMORY_MODE_READONLY};
+use lazy_static::lazy_static;
+use log::debug;
use std::os::raw::{c_char, c_int, c_uint, c_void};
use std::{char, cmp, ptr};
diff --git a/components/gfx/text/text_run.rs b/components/gfx/text/text_run.rs
index cf340a2e3dc..f230bbc92a5 100644
--- a/components/gfx/text/text_run.rs
+++ b/components/gfx/text/text_run.rs
@@ -7,7 +7,9 @@ use crate::font::{RunMetrics, ShapingOptions};
use crate::platform::font_template::FontTemplateData;
use crate::text::glyph::{ByteIndex, GlyphStore};
use app_units::Au;
+use log::debug;
use range::Range;
+use serde::{Deserialize, Serialize};
use std::cell::Cell;
use std::cmp::{max, Ordering};
use std::slice::Iter;