Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macos: Remove font size attribute from font descriptor. #24387

Merged
merged 2 commits into from Oct 8, 2019
Merged

macos: Remove font size attribute from font descriptor. #24387

merged 2 commits into from Oct 8, 2019

Conversation

@jdm
Copy link
Member

jdm commented Oct 7, 2019 •
edited by SimonSapin

This attribute isn't present in font-kit, and maybe this will help with #23290?

This change is Reviewable
@jdm
macos: Remove font size attribute from font descriptor.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b94615b
@highfive
Copy link

highfive commented Oct 7, 2019

warning Warning warning

  • These commits modify gfx code, but no tests are modified. Please consider adding a test!
@jdm
Copy link
Member Author

jdm commented Oct 7, 2019

@bors-servo try=macos
@bors-servo
Copy link
Contributor

bors-servo commented Oct 7, 2019

🙁 There is no try chooser macos for this repo, try one of: wpt, windows, wpt-mac, android, linux, mac, magicleap, wpt-android, arm
@bors-servo
Copy link
Contributor

bors-servo commented Oct 7, 2019

⌛ Trying commit b94615b with merge 66c8af0...
bors-servo added a commit that referenced this pull request Oct 7, 2019
@bors-servo
Auto merge of #24387 - servo:jdm-patch-31, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
66c8af0 
macos: Remove font size attribute from font descriptor.

This attribute isn't present in font-kit, and maybe this will help with #23290?

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24387)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 7, 2019

💔 Test failed - status-taskcluster
@jdm
Copy link
Member Author

jdm commented Oct 7, 2019

@bors-servo try=wpt-mac
@jdm
Copy link
Member Author

jdm commented Oct 7, 2019

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Oct 7, 2019

⌛ Trying commit b94615b with merge 8f180cb...
bors-servo added a commit that referenced this pull request Oct 7, 2019
@bors-servo
Auto merge of #24387 - servo:jdm-patch-31, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
8f180cb 
macos: Remove font size attribute from font descriptor.

This attribute isn't present in font-kit, and maybe this will help with #23290?

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24387)
<!-- Reviewable:end -->
@CYBAI
Copy link
Collaborator

CYBAI commented Oct 7, 2019 

Diff in /repo/components/gfx/platform/macos/font_template.rs at line 103:
                     // that one.
 
                     let attributes: CFDictionary<CFString, CFType> =
�[31m-                        CFDictionary::from_CFType_pairs(&[
�(B�[m�[31m-                            (
�(B�[m�[31m-                                CFString::new("NSFontNameAttribute"),
�(B�[m�[31m-                                CFString::new(&*self.identifier).as_CFType(),
�(B�[m�[31m-                            ),
�(B�[m�[31m-                        ]);
�(B�[m�[32m+                        CFDictionary::from_CFType_pairs(&[(
�(B�[m�[32m+                            CFString::new("NSFontNameAttribute"),
�(B�[m�[32m+                            CFString::new(&*self.identifier).as_CFType(),
�(B�[m�[32m+                        )]);
�(B�[m 
                     let descriptor = font_descriptor::new_from_attributes(&attributes);
                     let descriptors = CFArray::from_CFTypes(&[descriptor]);
Run `./mach fmt` to fix the formatting
@jdm
rustfmt
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
35f1910
@highfive highfive removed the S-tests-failed label Oct 7, 2019
@jdm
Copy link
Member Author

jdm commented Oct 7, 2019

@bors-servo try=wpt-mac
@bors-servo
Copy link
Contributor

bors-servo commented Oct 7, 2019

⌛ Trying commit 35f1910 with merge 1e6a0b8...
bors-servo added a commit that referenced this pull request Oct 7, 2019
@bors-servo
Auto merge of #24387 - servo:jdm-patch-31, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
1e6a0b8 
macos: Remove font size attribute from font descriptor.

This attribute isn't present in font-kit, and maybe this will help with #23290?

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24387)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 7, 2019

☀️ Test successful - status-taskcluster
State: approved= try=True
@jdm
Copy link
Member Author

jdm commented Oct 7, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Oct 7, 2019

📌 Commit 35f1910 has been approved by jdm
@highfive highfive assigned jdm and unassigned paulrouget Oct 7, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Oct 8, 2019

⌛ Testing commit 35f1910 with merge bd3422a...
bors-servo added a commit that referenced this pull request Oct 8, 2019
@bors-servo
Auto merge of #24387 - servo:jdm-patch-31, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
bd3422a 
macos: Remove font size attribute from font descriptor.

This attribute isn't present in font-kit, and maybe this will help with #23290?

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24387)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 8, 2019

💔 Test failed - status-taskcluster
@CYBAI
Copy link
Collaborator

CYBAI commented Oct 8, 2019

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Oct 8, 2019

💣 Failed to start rebuilding: Unknown error
@bors-servo
Copy link
Contributor

bors-servo commented Oct 8, 2019

⌛ Testing commit 35f1910 with merge e05f0b4...
bors-servo added a commit that referenced this pull request Oct 8, 2019
@bors-servo
Auto merge of #24387 - servo:jdm-patch-31, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
e05f0b4 
macos: Remove font size attribute from font descriptor.

This attribute isn't present in font-kit, and maybe this will help with #23290?

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24387)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 8, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing e05f0b4 to master...
@bors-servo bors-servo merged commit 35f1910 into master Oct 8, 2019
1 of 3 checks passed
1 of 3 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
continuous-integration/appveyor/pr AppVeyor build failed
Details
homu Test successful
Details
@bors-servo bors-servo deleted the jdm-patch-31 branch Oct 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@jdm @highfive @bors-servo @CYBAI @paulrouget
You can’t perform that action at this time.