<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>225003</bug_id>
          
          <creation_ts>2021-04-23 15:41:43 -0700</creation_ts>
          <short_desc>ANGLE X11 build fixes</short_desc>
          <delta_ts>2021-04-26 08:05:16 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>ANGLE</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Don Olmstead">don.olmstead</reporter>
          <assigned_to name="Don Olmstead">don.olmstead</assigned_to>
          <cc>dino</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>graouts</cc>
    
    <cc>jdarpinian</cc>
    
    <cc>kbr</cc>
    
    <cc>kkinnunen</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1753763</commentid>
    <comment_count>0</comment_count>
    <who name="Don Olmstead">don.olmstead</who>
    <bug_when>2021-04-23 15:41:43 -0700</bug_when>
    <thetext>See https://bugs.webkit.org/show_bug.cgi?id=223577</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753769</commentid>
    <comment_count>1</comment_count>
      <attachid>426957</attachid>
    <who name="Don Olmstead">don.olmstead</who>
    <bug_when>2021-04-23 15:48:45 -0700</bug_when>
    <thetext>Created attachment 426957
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753816</commentid>
    <comment_count>2</comment_count>
      <attachid>426957</attachid>
    <who name="Kenneth Russell">kbr</who>
    <bug_when>2021-04-23 17:56:23 -0700</bug_when>
    <thetext>Comment on attachment 426957
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=426957&amp;action=review

Seems fine. r+

&gt; Source/WebCore/platform/graphics/angle/ANGLEHeaders.h:52
&gt; +#if defined(None)

Would it be possible to put some guard around this entire block so it only applies to X11 platforms? If not, that&apos;s OK.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753826</commentid>
    <comment_count>3</comment_count>
    <who name="Don Olmstead">don.olmstead</who>
    <bug_when>2021-04-23 20:30:24 -0700</bug_when>
    <thetext>(In reply to Kenneth Russell from comment #2)
&gt; Comment on attachment 426957 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=426957&amp;action=review
&gt; 
&gt; Seems fine. r+
&gt; 
&gt; &gt; Source/WebCore/platform/graphics/angle/ANGLEHeaders.h:52
&gt; &gt; +#if defined(None)
&gt; 
&gt; Would it be possible to put some guard around this entire block so it only
&gt; applies to X11 platforms? If not, that&apos;s OK.

It seemed to be dragging in X11 headers on Linux even when `angle_use_x11` and `ENABLE_X11_TARGET` were OFF.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754187</commentid>
    <comment_count>4</comment_count>
      <attachid>426957</attachid>
    <who name="Don Olmstead">don.olmstead</who>
    <bug_when>2021-04-26 08:01:19 -0700</bug_when>
    <thetext>Comment on attachment 426957
Patch

Talked to mcatanzaro and there doesn&apos;t seem to be a good way to guard the set of checks. The other file using it also does the same unconditionally.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754188</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-26 08:04:49 -0700</bug_when>
    <thetext>Committed r276591 (237027@main): &lt;https://commits.webkit.org/237027@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 426957.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754189</commentid>
    <comment_count>6</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-04-26 08:05:16 -0700</bug_when>
    <thetext>&lt;rdar://problem/77157618&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426957</attachid>
            <date>2021-04-23 15:48:45 -0700</date>
            <delta_ts>2021-04-26 08:04:50 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225003.diff</filename>
            <type>text/plain</type>
            <size>2009</size>
            <attacher name="Don Olmstead">don.olmstead</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZwppbmRleCBlY2UwNmRhYjY4YTMuLjA5OTg5NTdhYWRjYyAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt
MSwzICsxLDE4IEBACisyMDIxLTA0LTIzICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29u
eS5jb20+CisKKyAgICAgICAgQU5HTEUgWDExIGJ1aWxkIGZpeGVzCisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUwMDMKKworICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBYMTEgaGVhZGVycyBkZWZpbmUgYSBidW5j
aCBvZiBtYWNyb3Mgd2l0aCBjb21tb24gdGVybXMsIGludGVyZmVyaW5nIHdpdGggV2ViQ29yZSBh
bmQgV1RGCisgICAgICAgIGVudW0gdmFsdWVzLiBBcyBhIHdvcmthcm91bmQsIHdlIGV4cGxpY2l0
bHkgdW5kZWYgdGhlbS4KKworICAgICAgICBUaGlzIGlzIHRoZSBzYW1lIGZpeCBhcyB0aGUgb25l
IHRvIEdMQ29udGV4dC5oIGluIHIyNzQ4NjkgYnV0IGFwcGxpZWQgdG8gdGhlIEFOR0xFIGhlYWRl
cnMKKyAgICAgICAgdGhhdCBhcmUgaW5jbHVkaW5nIFgxMS4KKworICAgICAgICAqIHBsYXRmb3Jt
L2dyYXBoaWNzL2FuZ2xlL0FOR0xFSGVhZGVycy5oOgorCiAyMDIxLTA0LTIzICBNaWNoYWVsIENh
dGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZW1vdmUgdmlydHVh
bCBmdW5jdGlvbiBjYWxscyBpbiBHcmFwaGljc0xheWVyIGRlc3RydWN0b3JzCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9BTkdMRUhlYWRlcnMuaCBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0FOR0xFSGVhZGVycy5oCmlu
ZGV4IDE2YTI1YjAwNjMxNy4uYzQ1ZDliMDg4NmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9BTkdMRUhlYWRlcnMuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9BTkdMRUhlYWRlcnMuaApAQCAtNDcsNiArNDcs
NDIgQEAKICNpbmNsdWRlIDxBTkdMRS9lbnRyeV9wb2ludHNfZ2xlc18zXzBfYXV0b2dlbi5oPgog
I2luY2x1ZGUgPEFOR0xFL2VudHJ5X3BvaW50c19nbGVzX2V4dF9hdXRvZ2VuLmg+CiAKKy8vIFgx
MSBoZWFkZXJzIGRlZmluZSBhIGJ1bmNoIG9mIG1hY3JvcyB3aXRoIGNvbW1vbiB0ZXJtcywgaW50
ZXJmZXJpbmcgd2l0aCBXZWJDb3JlIGFuZCBXVEYgZW51bSB2YWx1ZXMuCisvLyBBcyBhIHdvcmth
cm91bmQsIHdlIGV4cGxpY2l0bHkgdW5kZWYgdGhlbSBoZXJlLgorI2lmIGRlZmluZWQoTm9uZSkK
KyN1bmRlZiBOb25lCisjZW5kaWYKKyNpZiBkZWZpbmVkKEFib3ZlKQorI3VuZGVmIEFib3ZlCisj
ZW5kaWYKKyNpZiBkZWZpbmVkKEJlbG93KQorI3VuZGVmIEJlbG93CisjZW5kaWYKKyNpZiBkZWZp
bmVkKFN1Y2Nlc3MpCisjdW5kZWYgU3VjY2VzcworI2VuZGlmCisjaWYgZGVmaW5lZChGYWxzZSkK
KyN1bmRlZiBGYWxzZQorI2VuZGlmCisjaWYgZGVmaW5lZChUcnVlKQorI3VuZGVmIFRydWUKKyNl
bmRpZgorI2lmIGRlZmluZWQoQm9vbCkKKyN1bmRlZiBCb29sCisjZW5kaWYKKyNpZiBkZWZpbmVk
KEFsd2F5cykKKyN1bmRlZiBBbHdheXMKKyNlbmRpZgorI2lmIGRlZmluZWQoU3RhdHVzKQorI3Vu
ZGVmIFN0YXR1cworI2VuZGlmCisjaWYgZGVmaW5lZChDb250aW51ZSkKKyN1bmRlZiBDb250aW51
ZQorI2VuZGlmCisjaWYgZGVmaW5lZChSZWdpb24pCisjdW5kZWYgUmVnaW9uCisjZW5kaWYKKwog
Ly8gTm90ZTogdGhpcyBmaWxlIGNhbid0IGJlIGNvbXBpbGVkIGluIHRoZSBzYW1lIHVuaWZpZWQg
c291cmNlIGZpbGUKIC8vIGFzIG90aGVycyB3aGljaCBpbmNsdWRlIHRoZSBzeXN0ZW0ncyBPcGVu
R0wgaGVhZGVycy4KIAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>