Bug 211410 - [ANGLE] Correct Catalyst guards
Summary: [ANGLE] Correct Catalyst guards
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: ANGLE (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Jonathan Bedard
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2020-05-04 16:24 PDT by Jonathan Bedard
Modified: 2020-06-19 14:03 PDT (History)
11 users (show)

See Also:


Attachments
Patch (5.68 KB, patch)
2020-05-04 16:30 PDT, Jonathan Bedard
no flags Details | Formatted Diff | Diff
Patch (3.73 KB, patch)
2020-06-19 11:03 PDT, Jonathan Bedard
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Bedard 2020-05-04 16:24:29 PDT
In a few places, ANGLE declares classes that are explicitly not defined on certain platforms. Declarations and definitions should match so that failures are in ANGLE instead of the libraries that link it.
Comment 1 Jonathan Bedard 2020-05-04 16:30:26 PDT
Created attachment 398431 [details]
Patch
Comment 2 EWS Watchlist 2020-05-04 16:31:04 PDT
Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE
Comment 3 Jonathan Bedard 2020-05-04 16:39:03 PDT
Discovered this when working on the watchOS build. We end up declaring classes that aren't defined, which can create headaches for projects which attempt to link against those classes.

Under the philosophy that errors should happen as soon as possible in the build process, I think we should guard the class declarations with the same macros that the class definitions are guarded with.
Comment 4 Kenneth Russell 2020-05-05 09:09:43 PDT
Thanks for finding and fixing these build issues - they look good to me.

Have filed https://bugs.chromium.org/p/angleproject/issues/detail?id=4613 about upstreaming these changes into the ANGLE project to make future rolls of ANGLE into WebKit easier.
Comment 5 Jonathan Bedard 2020-05-05 09:31:36 PDT
(In reply to Kenneth Russell from comment #4)
> Thanks for finding and fixing these build issues - they look good to me.
> 
> Have filed https://bugs.chromium.org/p/angleproject/issues/detail?id=4613
> about upstreaming these changes into the ANGLE project to make future rolls
> of ANGLE into WebKit easier.

There is a decent chance there will be more changes like this in the next week or two.
Comment 6 EWS 2020-05-05 09:39:02 PDT
Committed r261176: <https://trac.webkit.org/changeset/261176>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 398431 [details].
Comment 7 Radar WebKit Bug Importer 2020-05-05 09:40:14 PDT
<rdar://problem/62891185>
Comment 8 Saam Barati 2020-05-05 11:43:24 PDT
Reverted r261176 for reason:

It broke the build

Committed r261185: <https://trac.webkit.org/changeset/261185>
Comment 9 Jonathan Bedard 2020-06-19 10:56:51 PDT
Trying this again, tested more builds this time.
Comment 10 Jonathan Bedard 2020-06-19 11:03:38 PDT
Created attachment 402295 [details]
Patch
Comment 11 EWS 2020-06-19 14:03:42 PDT
Committed r263284: <https://trac.webkit.org/changeset/263284>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402295 [details].