Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update servo-gfx and submodules for language changes

Browse source
This commit is contained in:
Patrick Walton 2013-05-02 16:45:23 -07:00
parent d7f4834e9a
commit 51be0641ff
9 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rust-azure

@ -1 +1 @@
Subproject commit 985549a76eeeb5d10aae40812154424629534811 Subproject commit a42dd146fb22022db61cfc74efec2c5726ba5751

2
src/rust-core-foundation

@ -1 +1 @@
Subproject commit 4d0a8c1ca4d1f8b7036e3154a49f4066a3284697 Subproject commit 79afdda83a62402ceadd9ad9f33b9de24cd674bb

2
src/rust-core-graphics

@ -1 +1 @@
Subproject commit 8082be782bb64468136a3bc024dc8c813246784f Subproject commit 557db505525d759e05d342f87195cccfc9aa4d15

2
src/rust-core-text

@ -1 +1 @@
Subproject commit 5ec7feec6365946ca7a0caf890531400fd64ba56 Subproject commit 0f5746163aa7bf3098cbd3f66c316344cc1551e2

2
src/rust-io-surface

@ -1 +1 @@
Subproject commit fef34b3682991563cab69953f986b3089fab5b8f Subproject commit 9caf05ac898bc4f69bf51a7d5c463b0e071231de

2
src/rust-opengles

@ -1 +1 @@
Subproject commit 8e36a17c0a555427019be592d0f7c6ce6f2d5b09 Subproject commit 03a995e039945c74755f841e7a4d70c7962eb8ae

4
src/servo-gfx/platform/macos/font.rs
View file

@ -64,10 +64,10 @@ pub impl FontHandle {
fn get_CGFont(&mut self) -> CGFont { fn get_CGFont(&mut self) -> CGFont {
match self.cgfont { match self.cgfont {
Some(ref font) => CFWrapper::wrap_shared(*(font.borrow_ref())), Some(ref font) => font.clone(),
None => { None => {
let cgfont = self.ctfont.copy_to_CGFont(); let cgfont = self.ctfont.copy_to_CGFont();
self.cgfont = Some(CFWrapper::clone(&cgfont)); self.cgfont = Some(cgfont.clone());
cgfont cgfont
} }
} }

6
src/servo-gfx/platform/macos/font_list.rs
View file

@ -30,9 +30,9 @@ pub impl FontListHandle {
fn get_available_families(&self) -> FontFamilyMap { fn get_available_families(&self) -> FontFamilyMap {
let family_names: CFArray<CFStringRef> = core_text::font_collection::get_family_names(); let family_names: CFArray<CFStringRef> = core_text::font_collection::get_family_names();
let mut family_map : FontFamilyMap = HashMap::new(); let mut family_map: FontFamilyMap = HashMap::new();
for family_names.each |&strref: &CFStringRef| { for family_names.each |&strref: &CFStringRef| {
let family_name = CFString::wrap_extern(strref).to_str(); let family_name = CFString::wrap_shared(strref).to_str();
debug!("Creating new FontFamily for family: %s", family_name); debug!("Creating new FontFamily for family: %s", family_name);
let new_family = @mut FontFamily::new(family_name); let new_family = @mut FontFamily::new(family_name);
@ -42,7 +42,7 @@ pub impl FontListHandle {
} }
fn load_variations_for_family(&self, family: @mut FontFamily) { fn load_variations_for_family(&self, family: @mut FontFamily) {
let fam : &mut FontFamily = family; // FIXME: borrow checker workaround let fam: &mut FontFamily = family; // FIXME: borrow checker workaround
let family_name = &fam.family_name; let family_name = &fam.family_name;
debug!("Looking for faces of family: %s", *family_name); debug!("Looking for faces of family: %s", *family_name);

2
src/sharegl

@ -1 +1 @@
Subproject commit b9434228ce8cf24fe9686e392c9661fc049b5b64 Subproject commit 81b203a305b3044ee2d3db7fbb9c804521fc330b