Add support for DirectWrite font rendering on Windows #14153

vvuk · 2016-11-09T21:45:43Z

This PR adds support for DirectWrite text rendering using a thin wrapper for dwrite, as well as similar functionality added to WebRender. In doing so it removes the FreeType dep from the Windows build.

There is still work to be done here, but this is a good starting point for future cleanup and fixes.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #13371 (github issue number if applicable).

There are tests for these changes OR
These changes do not require tests because they are already tested by other tests

This change is

highfive · 2016-11-09T21:45:46Z

Heads up! This PR modifies the following files:

@asajeffrey: components/constellation/Cargo.toml, components/webdriver_server/Cargo.toml
@jgraham: components/webdriver_server/Cargo.toml
@KiChjang: components/script/Cargo.toml, components/net/Cargo.toml, components/script_layout_interface/Cargo.toml, components/net_traits/Cargo.toml, components/net_traits/Cargo.toml, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml
@fitzgen: components/devtools_traits/Cargo.toml, components/devtools_traits/Cargo.toml, components/profile/Cargo.toml, components/profile_traits/Cargo.toml, components/profile_traits/Cargo.toml, components/devtools/Cargo.toml, components/script/Cargo.toml, components/script_layout_interface/Cargo.toml, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml
@emilio: components/layout/Cargo.toml

vvuk · 2016-11-09T21:46:16Z

Ugh, ignore the ipc-channel 0.6 bump commit -- I had to pull that in in order to test. I'll rebase without it once that lands.

glennw · 2016-11-10T19:50:52Z

components/gfx/platform/windows/font_template.rs

+}
+
+#[derive(Debug)]
+pub struct CachedDWFont(Mutex<HashMap<Au, Font>>);


Is this actually used anywhere?

glennw · 2016-11-10T19:50:52Z

components/gfx/platform/windows/font_context.rs

+
+#[derive(Clone, Debug)]
+pub struct FontContextHandle {
+    ctx: ()


Can this just be an empty struct (i.e. pub struct FontContextHandle;) ?


        DirectWrite font backend for Windows


        Update shaders for sampler names, copy new text-shadow shaders.


        Remove unused old blur shader.


        Update WR to get ipc-channel revert.


        tidy and warning fixes

glennw · 2016-11-10T21:25:40Z

@vvuk r=me on the commits from you. If you (or someone else) wants to r= on my commits here, we can get this merged!

vvuk · 2016-11-10T21:28:28Z

@glennw r=me on your commits!

glennw · 2016-11-10T21:28:50Z

@bors-servo r+

bors-servo · 2016-11-10T21:28:51Z

📌 Commit 473df19 has been approved by glennw

bors-servo · 2016-11-10T21:30:54Z

⌛ Testing commit 473df19 with merge d54cae4...


        Auto merge of #14153 - vvuk:win32-dwrite, r=glennw

Add support for DirectWrite font rendering on Windows  This PR adds support for DirectWrite text rendering using a thin wrapper for dwrite, as well as similar functionality added to WebRender. In doing so it removes the FreeType dep from the Windows build. There is still work to be done here, but this is a good starting point for future cleanup and fixes. ---  - [X] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [X] These changes fix #13371 (github issue number if applicable).  - [ ] There are tests for these changes OR - [X] These changes do not require tests because they are already tested by other tests   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14153)

bors-servo · 2016-11-10T22:20:36Z

💔 Test failed - mac-rel-wpt1

glennw · 2016-11-10T22:42:35Z

@bors-servo retry

#11100

bors-servo · 2016-11-10T22:55:18Z

⌛ Testing commit 473df19 with merge 796fae4...


        Auto merge of #14153 - vvuk:win32-dwrite, r=glennw

Add support for DirectWrite font rendering on Windows  This PR adds support for DirectWrite text rendering using a thin wrapper for dwrite, as well as similar functionality added to WebRender. In doing so it removes the FreeType dep from the Windows build. There is still work to be done here, but this is a good starting point for future cleanup and fixes. ---  - [X] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [X] These changes fix #13371 (github issue number if applicable).  - [ ] There are tests for these changes OR - [X] These changes do not require tests because they are already tested by other tests   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14153)

bors-servo · 2016-11-11T00:06:14Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev

highfive assigned mbrubeck Nov 9, 2016

highfive added the S-awaiting-review label Nov 9, 2016

vvuk force-pushed the vvuk:win32-dwrite branch 2 times, most recently from a48bd5b to e3908fc Nov 10, 2016

glennw reviewed Nov 10, 2016

View changes

DirectWrite font backend for Windows

Loading status checks…

db357b0

vvuk force-pushed the vvuk:win32-dwrite branch from e3908fc to db357b0 Nov 10, 2016

gw3583 and others added 4 commits Nov 10, 2016

Update shaders for sampler names, copy new text-shadow shaders.

9991e06

Remove unused old blur shader.

Loading status checks…

8aff2dd

Update WR to get ipc-channel revert.

Loading status checks…

8a5baee

tidy and warning fixes

Loading status checks…

473df19

highfive assigned glennw and unassigned mbrubeck Nov 10, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Nov 10, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels Nov 10, 2016

highfive removed the S-tests-failed label Nov 10, 2016

highfive added the S-awaiting-merge label Nov 10, 2016

bors-servo merged commit 473df19 into servo:master Nov 11, 2016
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Nov 11, 2016

bors-servo mentioned this pull request Nov 11, 2016

Update `ipc-channel` dependency to 0.6 #14146

Closed

rigtorp mentioned this pull request Jan 8, 2017

Windows Support alacritty/alacritty#28

Closed

jdm mentioned this pull request Jan 14, 2017

Windows Nightly blockers #12125

Closed

11 of 11 tasks complete

Wilfred mentioned this pull request Feb 21, 2017

Thoughts on using glutin and winit for the windowing system layer remacs/remacs#25

Open

servo / servo

Add support for DirectWrite font rendering on Windows #14153

Add support for DirectWrite font rendering on Windows #14153

vvuk commented Nov 9, 2016 •

edited by larsbergstrom

highfive commented Nov 9, 2016

vvuk commented Nov 9, 2016

This comment has been minimized.

This comment has been minimized.

glennw commented Nov 10, 2016

vvuk commented Nov 10, 2016

glennw commented Nov 10, 2016

bors-servo commented Nov 10, 2016

bors-servo commented Nov 10, 2016

bors-servo commented Nov 10, 2016

glennw commented Nov 10, 2016 •

edited by jdm

bors-servo commented Nov 10, 2016

bors-servo commented Nov 11, 2016

servo / servo

Join GitHub today

Add support for DirectWrite font rendering on Windows #14153

Add support for DirectWrite font rendering on Windows #14153

Conversation

vvuk commented Nov 9, 2016 • edited by larsbergstrom

highfive commented Nov 9, 2016

vvuk commented Nov 9, 2016

This comment has been minimized.

glennw Nov 10, 2016

This comment has been minimized.

glennw Nov 10, 2016

glennw commented Nov 10, 2016

vvuk commented Nov 10, 2016

glennw commented Nov 10, 2016

bors-servo commented Nov 10, 2016

bors-servo commented Nov 10, 2016

bors-servo commented Nov 10, 2016

glennw commented Nov 10, 2016 • edited by jdm

bors-servo commented Nov 10, 2016

bors-servo commented Nov 11, 2016

vvuk commented Nov 9, 2016 •

edited by larsbergstrom

glennw commented Nov 10, 2016 •

edited by jdm