Skip to content
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

Fix From conversion from NativeFontHandleWrapper to PathfinderComPtr #2705

Merged
merged 1 commit into from May 1, 2018

Conversation

@fschutt
Copy link
Contributor

fschutt commented Apr 28, 2018

See https://github.com/pcwalton/pathfinder/pull/81 and #2645 - this fixes 1 compile error, where we can't convert from a NativeFontHandleWrapper to a ComPtr. We need this, so that PathfinderFontContext::add_native_font() works correctly.


This change is Reviewable

@glennw
Copy link
Member

glennw commented Apr 29, 2018

Copy link
Collaborator

pcwalton left a comment

r=me with that nit addressed

let system_fc = ::dwrote::FontCollection::system();
let font = match system_fc.get_font_from_descriptor(&font_handle.0) {
Some(font) => font,
None => { panic!("missing descriptor {:?}", font_handle.0) }

This comment has been minimized.

@pcwalton

pcwalton Apr 30, 2018

Collaborator

nit: no need for {} here

See https://github.com/pcwalton/pathfinder/pull/81 and #2645 - this fixes 1 compile error, where we can't convert from a NativeFontHandleWrapper to a ComPtr. We need this, so that PathfinderFontContext::add_native_font() works correctly.
@fschutt
Copy link
Contributor Author

fschutt commented May 1, 2018

@pcwalton alright, fixed it

@glennw
Copy link
Member

glennw commented May 1, 2018

@bors-servo r=pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2018

📌 Commit 74ac0a9 has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2018

Testing commit 74ac0a9 with merge 5714137...

bors-servo added a commit that referenced this pull request May 1, 2018
Fix From conversion from NativeFontHandleWrapper to PathfinderComPtr

See https://github.com/pcwalton/pathfinder/pull/81 and #2645 - this fixes 1 compile error, where we can't convert from a NativeFontHandleWrapper to a ComPtr. We need this, so that PathfinderFontContext::add_native_font() works correctly.

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

bors-servo commented May 1, 2018

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: pcwalton
Pushing 5714137 to master...

@bors-servo bors-servo merged commit 74ac0a9 into servo:master May 1, 2018
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.