Bug 172568 - [CMake] Consolidate CMake code related to Cairo
Summary: [CMake] Consolidate CMake code related to Cairo
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Don Olmstead
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2017-05-24 18:02 PDT by Don Olmstead
Modified: 2017-05-30 20:25 PDT (History)
7 users (show)

See Also:


Attachments
Patch (13.30 KB, patch)
2017-05-24 18:09 PDT, Don Olmstead
no flags Details | Formatted Diff | Diff
Patch (13.30 KB, patch)
2017-05-24 18:17 PDT, Don Olmstead
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Don Olmstead 2017-05-24 18:02:32 PDT
Centralize Cairo cmake code for sharing between ports.
Comment 1 Don Olmstead 2017-05-24 18:09:36 PDT
Created attachment 311174 [details]
Patch

Adds a Cairo.cmake file which unifies the cairo sections of GTK, WinCairo, and WPE. Adds if checks in Gstreamer and image decoder cmake files where applicable.

Harfbuzz sources are left unchanged. Another patch will be for freetype, harfbuzz and fontconfig path.

Exposes USE_CAIRO to the build with WinCairo so any references there are removed.

Compiled successfully on WinCairo.
Comment 2 Build Bot 2017-05-24 18:11:26 PDT
Attachment 311174 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/Cairo.cmake:8:  No trailing spaces  [whitespace/trailing] [5]
ERROR: Source/WebCore/platform/Cairo.cmake:9:  There should be no empty line between "platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp" and "platform/graphics/cairo/CairoUtilities.cpp".  [list/emptyline] [5]
Total errors found: 2 in 11 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 3 Don Olmstead 2017-05-24 18:17:56 PDT
Created attachment 311175 [details]
Patch

Fixing style
Comment 4 Michael Catanzaro 2017-05-24 19:05:58 PDT
Nice!
Comment 5 WebKit Commit Bot 2017-05-24 19:16:36 PDT
Comment on attachment 311175 [details]
Patch

Clearing flags on attachment: 311175

Committed r217404: <http://trac.webkit.org/changeset/217404>
Comment 6 WebKit Commit Bot 2017-05-24 19:16:38 PDT
All reviewed patches have been landed.  Closing bug.
Comment 7 Claudio Saavedra 2017-05-25 02:58:09 PDT
This broke WPE. Here's the build fix:

http://trac.webkit.org/changeset/217410
Comment 8 Don Olmstead 2017-05-25 09:50:26 PDT
(In reply to Claudio Saavedra from comment #7)
> This broke WPE. Here's the build fix:
> 
> http://trac.webkit.org/changeset/217410

Ugh sorry! EWS for WPE coming anytime soon?
Comment 9 Radar WebKit Bug Importer 2017-05-30 20:25:26 PDT
<rdar://problem/32479802>