<?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>213038</bug_id>
          
          <creation_ts>2020-06-10 11:36:23 -0700</creation_ts>
          <short_desc>WebKit: Make UIGestureRecognizer build for watchOS and tvOS</short_desc>
          <delta_ts>2020-06-11 14:02:57 -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>WebKit2</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=212718</see_also>
          <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="Jonathan Bedard">jbedard</reporter>
          <assigned_to name="Jonathan Bedard">jbedard</assigned_to>
          <cc>benjamin</cc>
    
    <cc>cdumez</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>darin</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1661253</commentid>
    <comment_count>0</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-10 11:36:23 -0700</bug_when>
    <thetext>UIGestureRecognizer SPI is guarded by an iOS macro, but we need the definition for watchOS and tvOS.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661254</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-06-10 11:37:44 -0700</bug_when>
    <thetext>&lt;rdar://problem/64217654&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661257</commentid>
    <comment_count>2</comment_count>
      <attachid>401561</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-10 11:41:16 -0700</bug_when>
    <thetext>Created attachment 401561
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661258</commentid>
    <comment_count>3</comment_count>
      <attachid>401561</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-10 11:43:11 -0700</bug_when>
    <thetext>Comment on attachment 401561
Patch

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

&gt; Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1457
&gt; +    return [recognizer respondsToSelector:@selector(modifierFlags)] ? [recognizer modifierFlags] : 0;

This gets watchOS and tvOS building, but I&apos;m pretty sure it&apos;s wrong.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661264</commentid>
    <comment_count>4</comment_count>
      <attachid>401561</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-10 11:59:00 -0700</bug_when>
    <thetext>Comment on attachment 401561
Patch

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

&gt;&gt; Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1457
&gt;&gt; +    return [recognizer respondsToSelector:@selector(modifierFlags)] ? [recognizer modifierFlags] : 0;
&gt; 
&gt; This gets watchOS and tvOS building, but I&apos;m pretty sure it&apos;s wrong.

Let&apos;s not commit something that we are pretty sure is wrong.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661272</commentid>
    <comment_count>5</comment_count>
      <attachid>401561</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-06-10 12:08:48 -0700</bug_when>
    <thetext>Comment on attachment 401561
Patch

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

&gt;&gt;&gt; Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1457
&gt;&gt;&gt; +    return [recognizer respondsToSelector:@selector(modifierFlags)] ? [recognizer modifierFlags] : 0;
&gt;&gt; 
&gt;&gt; This gets watchOS and tvOS building, but I&apos;m pretty sure it&apos;s wrong.
&gt; 
&gt; Let&apos;s not commit something that we are pretty sure is wrong.

Jonathan, don&apos;t you just want to make UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS be true on watchOS and tvOS?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661273</commentid>
    <comment_count>6</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-06-10 12:08:58 -0700</bug_when>
    <thetext>(In reply to Tim Horton from comment #5)
&gt; Comment on attachment 401561 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=401561&amp;action=review
&gt; 
&gt; &gt;&gt;&gt; Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1457
&gt; &gt;&gt;&gt; +    return [recognizer respondsToSelector:@selector(modifierFlags)] ? [recognizer modifierFlags] : 0;
&gt; &gt;&gt; 
&gt; &gt;&gt; This gets watchOS and tvOS building, but I&apos;m pretty sure it&apos;s wrong.
&gt; &gt; 
&gt; &gt; Let&apos;s not commit something that we are pretty sure is wrong.
&gt; 
&gt; Jonathan, don&apos;t you just want to make UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS
&gt; be true on watchOS and tvOS?

err, HAVE()</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661279</commentid>
    <comment_count>7</comment_count>
      <attachid>401561</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-10 12:15:24 -0700</bug_when>
    <thetext>Comment on attachment 401561
Patch

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

&gt;&gt;&gt;&gt;&gt; Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1457
&gt;&gt;&gt;&gt;&gt; +    return [recognizer respondsToSelector:@selector(modifierFlags)] ? [recognizer modifierFlags] : 0;
&gt;&gt;&gt;&gt; 
&gt;&gt;&gt;&gt; This gets watchOS and tvOS building, but I&apos;m pretty sure it&apos;s wrong.
&gt;&gt;&gt; 
&gt;&gt;&gt; Let&apos;s not commit something that we are pretty sure is wrong.
&gt;&gt; 
&gt;&gt; Jonathan, don&apos;t you just want to make UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS be true on watchOS and tvOS?
&gt; 
&gt; err, HAVE()

Maybe? Shouldn&apos;t the definition of modifierFlags also be guarded by HAVE(UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS), in that case?

I&apos;m a bit confused by the original content of this line in the first place. It seems like it would only compile if the recognizer had a _modifierFlags member variable, which it doesn&apos;t seem to have for watchOS. I would expect this code to read:

#if HAVE(UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS)
    return recognizer.modifierFlags;
#else
    return 0;
#endif</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661290</commentid>
    <comment_count>8</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-06-10 12:30:10 -0700</bug_when>
    <thetext>(In reply to Jonathan Bedard from comment #7)
&gt; Comment on attachment 401561 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=401561&amp;action=review
&gt; 
&gt; &gt;&gt;&gt;&gt;&gt; Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1457
&gt; &gt;&gt;&gt;&gt;&gt; +    return [recognizer respondsToSelector:@selector(modifierFlags)] ? [recognizer modifierFlags] : 0;
&gt; &gt;&gt;&gt;&gt; 
&gt; &gt;&gt;&gt;&gt; This gets watchOS and tvOS building, but I&apos;m pretty sure it&apos;s wrong.
&gt; &gt;&gt;&gt; 
&gt; &gt;&gt;&gt; Let&apos;s not commit something that we are pretty sure is wrong.
&gt; &gt;&gt; 
&gt; &gt;&gt; Jonathan, don&apos;t you just want to make UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS be true on watchOS and tvOS?
&gt; &gt; 
&gt; &gt; err, HAVE()
&gt; 
&gt; Maybe? Shouldn&apos;t the definition of modifierFlags also be guarded by
&gt; HAVE(UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS), in that case?
&gt; 
&gt; I&apos;m a bit confused by the original content of this line in the first place.
&gt; It seems like it would only compile if the recognizer had a _modifierFlags
&gt; member variable, which it doesn&apos;t seem to have for watchOS. I would expect
&gt; this code to read:
&gt; 
&gt; #if HAVE(UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS)
&gt;     return recognizer.modifierFlags;
&gt; #else
&gt;     return 0;
&gt; #endif

1) That&apos;s a method, not a member variable.
2) This is all because _modifierFlags used to exist on iOS as SPI and then became API (without the underscore) in iOS 13.4, it&apos;s got nothing to do with watchOS/etc., but your substitution is definitely wrong.
3) The header suggests that the watchOS 6 SDK has both the SPI and API versions available. So I think my suggestion is probably the right path forward, but you have alternative paths available if necessary.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661577</commentid>
    <comment_count>9</comment_count>
      <attachid>401642</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-11 07:47:12 -0700</bug_when>
    <thetext>Created attachment 401642
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661579</commentid>
    <comment_count>10</comment_count>
      <attachid>401643</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-11 07:52:36 -0700</bug_when>
    <thetext>Created attachment 401643
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661638</commentid>
    <comment_count>11</comment_count>
      <attachid>401643</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-06-11 10:47:40 -0700</bug_when>
    <thetext>Comment on attachment 401643
Patch

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

&gt; Source/WTF/wtf/PlatformHave.h:450
&gt; +#if (PLATFORM(IOS_FAMILY) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 130400)

As previously mentioned, a IOS_FAMILY + IPHONE_OS_VERSION* check is always wrong.

&gt; Source/WebKit/Platform/spi/ios/UIKitSPI.h:422
&gt; -#if PLATFORM(IOS) &amp;&amp; !defined(__IPHONE_13_4)
&gt; +#if !HAVE(UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS)

This used defined(__IPHONE_13_4) instead of MIN_REQUIRED for a reason! Blame it and see.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661639</commentid>
    <comment_count>12</comment_count>
      <attachid>401643</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-06-11 10:47:42 -0700</bug_when>
    <thetext>Comment on attachment 401643
Patch

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

&gt; Source/WTF/wtf/PlatformHave.h:450
&gt; +#if (PLATFORM(IOS_FAMILY) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 130400)

As previously mentioned, a IOS_FAMILY + IPHONE_OS_VERSION* check is always wrong.

&gt; Source/WebKit/Platform/spi/ios/UIKitSPI.h:422
&gt; -#if PLATFORM(IOS) &amp;&amp; !defined(__IPHONE_13_4)
&gt; +#if !HAVE(UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS)

This used defined(__IPHONE_13_4) instead of MIN_REQUIRED for a reason! Blame it and see.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661690</commentid>
    <comment_count>13</comment_count>
      <attachid>401668</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-11 12:30:50 -0700</bug_when>
    <thetext>Created attachment 401668
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661697</commentid>
    <comment_count>14</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-11 12:35:52 -0700</bug_when>
    <thetext>(In reply to Jonathan Bedard from comment #13)
&gt; Created attachment 401668 [details]
&gt; Patch

I think I was trying way too hard.

Seems that we don&apos;t need the SPI header at all. And actually, do we still need the SPI declaration for iOS once we move to 13.5, the old macros only work on 13.4, right?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661707</commentid>
    <comment_count>15</comment_count>
      <attachid>401668</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-11 12:51:12 -0700</bug_when>
    <thetext>Comment on attachment 401668
Patch

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

&gt; Source/WTF/wtf/PlatformHave.h:450
&gt; +#if (PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 130400 || PLATFORM(WATCHOS) || PLATFORM(APPLETV))

Seems like we could either remove the () entirely, or put them just around the &amp;&amp; section.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661719</commentid>
    <comment_count>16</comment_count>
      <attachid>401677</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-11 13:21:06 -0700</bug_when>
    <thetext>Created attachment 401677
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1661733</commentid>
    <comment_count>17</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-11 14:02:57 -0700</bug_when>
    <thetext>Committed r262924: &lt;https://trac.webkit.org/changeset/262924&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 401677.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401561</attachid>
            <date>2020-06-10 11:41:16 -0700</date>
            <delta_ts>2020-06-11 07:47:11 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213038-20200610114116.patch</filename>
            <type>text/plain</type>
            <size>1909</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjI4NDUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA2LTEwICBKb25hdGhhbiBC
ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQ6IE1ha2UgVUlHZXN0
dXJlUmVjb2duaXplciBidWlsZCBmb3Igd2F0Y2hPUyBhbmQgdHZPUworICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMDM4CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS82NDIxNzY1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBObyBuZXcgdGVzdHMsIGJlaGF2aW9yIHVuY2hhbmdlZC4KKworICAgICAgICAq
IFBsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dL
Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKGdlc3R1cmVSZWNvZ25pemVyTW9k
aWZpZXJGbGFncyk6CisKIDIwMjAtMDYtMTAgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5z
ZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZlcnQgcjI1OTc3MApJbmRleDogU291cmNlL1dl
YktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgJKHJldmlzaW9uIDI2Mjg0NSkKKysrIFNv
dXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCSh3b3JraW5nIGNvcHkpCkBA
IC00MTksNyArNDE5LDcgQEAgdHlwZWRlZiBlbnVtIHsKIEBlbmQKIAogQGludGVyZmFjZSBVSUdl
c3R1cmVSZWNvZ25pemVyICgpCi0jaWYgUExBVEZPUk0oSU9TKSAmJiAhZGVmaW5lZChfX0lQSE9O
RV8xM180KQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpICYmICFkZWZpbmVkKF9fSVBIT05FXzEz
XzQpCiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIGdldHRlcj1fbW9kaWZpZXJGbGFn
cykgVUlLZXlNb2RpZmllckZsYWdzIG1vZGlmaWVyRmxhZ3M7CiAjZW5kaWYKIEBlbmQKSW5kZXg6
IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0K
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ
bnRlcmFjdGlvbi5tbQkocmV2aXNpb24gMjYyODQ1KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMTQ1
NCw3ICsxNDU0LDcgQEAgaW5saW5lIHN0YXRpYyBVSUtleU1vZGlmaWVyRmxhZ3MgZ2VzdHVyZQog
I2lmIEhBVkUoVUlfR0VTVFVSRV9SRUNPR05JWkVSX01PRElGSUVSX0ZMQUdTKQogICAgIHJldHVy
biByZWNvZ25pemVyLm1vZGlmaWVyRmxhZ3M7CiAjZWxzZQotICAgIHJldHVybiBbcmVjb2duaXpl
ciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9tb2RpZmllckZsYWdzKV0gPyBbcmVjb2du
aXplciBfbW9kaWZpZXJGbGFnc10gOiAwOworICAgIHJldHVybiBbcmVjb2duaXplciByZXNwb25k
c1RvU2VsZWN0b3I6QHNlbGVjdG9yKG1vZGlmaWVyRmxhZ3MpXSA/IFtyZWNvZ25pemVyIG1vZGlm
aWVyRmxhZ3NdIDogMDsKICNlbmRpZgogfQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401642</attachid>
            <date>2020-06-11 07:47:12 -0700</date>
            <delta_ts>2020-06-11 07:52:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213038-20200611074712.patch</filename>
            <type>text/plain</type>
            <size>2428</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNjI5MDEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA2LTExICBKb25hdGhhbiBCZWRhcmQgIDxq
YmVkYXJkPgorCisgICAgICAgIFdlYktpdDogTWFrZSBVSUdlc3R1cmVSZWNvZ25pemVyIGJ1aWxk
IGZvciB3YXRjaE9TIGFuZCB0dk9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMTMwMzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0MjE3NjU0Pgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL1Bs
YXRmb3JtSGF2ZS5oOiBFbmFibGUgSEFWRShVSV9HRVNUVVJFX1JFQ09HTklaRVJfTU9ESUZJRVJf
RkxBR1MpIGZvciB3YXRjaE9TIGFuZCB0dk9TLgorCiAyMDIwLTA2LTEwICBHZW9mZnJleSBHYXJl
biAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgU29tZSBzdHlsZSBpbXByb3ZlbWVudHMg
dG8gbWFpbiB0aHJlYWQgY29kZQpJbmRleDogU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgJKHJldmlzaW9uIDI2
MjkwMSkKKysrIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCSh3b3JraW5nIGNvcHkpCkBA
IC00NDUsNiArNDQ1LDkgQEAKIAogI2lmIChQTEFURk9STShJT1MpICYmIF9fSVBIT05FX09TX1ZF
UlNJT05fTUlOX1JFUVVJUkVEID49IDEzMDQwMCkKICNkZWZpbmUgSEFWRV9VSV9DVVJTT1JfSU5U
RVJBQ1RJT04gMQorI2VuZGlmCisKKyNpZiAoUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgX19JUEhP
TkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTMwNDAwKQogI2RlZmluZSBIQVZFX1VJX0dF
U1RVUkVfUkVDT0dOSVpFUl9NT0RJRklFUl9GTEFHUyAxCiAjZW5kaWYKIApJbmRleDogU291cmNl
L1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJ
KHJldmlzaW9uIDI2MjkwMSkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv
cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDYtMTEgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRh
cmQ+CisKKyAgICAgICAgV2ViS2l0OiBNYWtlIFVJR2VzdHVyZVJlY29nbml6ZXIgYnVpbGQgZm9y
IHdhdGNoT1MgYW5kIHR2T1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIxMzAzOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQyMTc2NTQ+CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz
LCBiZWhhdmlvciB1bmNoYW5nZWQuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0
U1BJLmg6IEd1YXJkIFVJR2VzdHVyZVJlY29nbml6ZXIgbW9kaWZpZXJGbGFncyB3aXRoIEhBVkUo
VUlfR0VTVFVSRV9SRUNPR05JWkVSX01PRElGSUVSX0ZMQUdTKS4KKwogMjAyMC0wNi0xMSAgQ2hh
bmdTZW9rIE9oICA8Y2hhbmdzZW9rQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0dUS10gSW1wbGVt
ZW50IGJ1dHRvbi1wcmVzcy1ldmVudCwgYnV0dG9uLXJlbGVhc2UtZXZlbnQsIGFuZCBhYnNvbHV0
ZS1heGlzLWV2ZW50IG9mIEdBTUVQQUQgQVBJLgpJbmRleDogU291cmNlL1dlYktpdC9QbGF0Zm9y
bS9zcGkvaW9zL1VJS2l0U1BJLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9QbGF0Zm9y
bS9zcGkvaW9zL1VJS2l0U1BJLmgJKHJldmlzaW9uIDI2MjkwMSkKKysrIFNvdXJjZS9XZWJLaXQv
UGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MTksNyArNDE5
LDcgQEAgdHlwZWRlZiBlbnVtIHsKIEBlbmQKIAogQGludGVyZmFjZSBVSUdlc3R1cmVSZWNvZ25p
emVyICgpCi0jaWYgUExBVEZPUk0oSU9TKSAmJiAhZGVmaW5lZChfX0lQSE9ORV8xM180KQorI2lm
IEhBVkUoVUlfR0VTVFVSRV9SRUNPR05JWkVSX01PRElGSUVSX0ZMQUdTKQogQHByb3BlcnR5IChu
b25hdG9taWMsIHJlYWRvbmx5LCBnZXR0ZXI9X21vZGlmaWVyRmxhZ3MpIFVJS2V5TW9kaWZpZXJG
bGFncyBtb2RpZmllckZsYWdzOwogI2VuZGlmCiBAZW5kCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401643</attachid>
            <date>2020-06-11 07:52:36 -0700</date>
            <delta_ts>2020-06-11 12:30:48 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213038-20200611075235.patch</filename>
            <type>text/plain</type>
            <size>2429</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNjI5MDEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA2LTExICBKb25hdGhhbiBCZWRhcmQgIDxq
YmVkYXJkPgorCisgICAgICAgIFdlYktpdDogTWFrZSBVSUdlc3R1cmVSZWNvZ25pemVyIGJ1aWxk
IGZvciB3YXRjaE9TIGFuZCB0dk9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMTMwMzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0MjE3NjU0Pgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL1Bs
YXRmb3JtSGF2ZS5oOiBFbmFibGUgSEFWRShVSV9HRVNUVVJFX1JFQ09HTklaRVJfTU9ESUZJRVJf
RkxBR1MpIGZvciB3YXRjaE9TIGFuZCB0dk9TLgorCiAyMDIwLTA2LTEwICBHZW9mZnJleSBHYXJl
biAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgU29tZSBzdHlsZSBpbXByb3ZlbWVudHMg
dG8gbWFpbiB0aHJlYWQgY29kZQpJbmRleDogU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgJKHJldmlzaW9uIDI2
MjkwMSkKKysrIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCSh3b3JraW5nIGNvcHkpCkBA
IC00NDUsNiArNDQ1LDkgQEAKIAogI2lmIChQTEFURk9STShJT1MpICYmIF9fSVBIT05FX09TX1ZF
UlNJT05fTUlOX1JFUVVJUkVEID49IDEzMDQwMCkKICNkZWZpbmUgSEFWRV9VSV9DVVJTT1JfSU5U
RVJBQ1RJT04gMQorI2VuZGlmCisKKyNpZiAoUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgX19JUEhP
TkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTMwNDAwKQogI2RlZmluZSBIQVZFX1VJX0dF
U1RVUkVfUkVDT0dOSVpFUl9NT0RJRklFUl9GTEFHUyAxCiAjZW5kaWYKIApJbmRleDogU291cmNl
L1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJ
KHJldmlzaW9uIDI2MjkwMSkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv
cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDYtMTEgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRh
cmQ+CisKKyAgICAgICAgV2ViS2l0OiBNYWtlIFVJR2VzdHVyZVJlY29nbml6ZXIgYnVpbGQgZm9y
IHdhdGNoT1MgYW5kIHR2T1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIxMzAzOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQyMTc2NTQ+CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz
LCBiZWhhdmlvciB1bmNoYW5nZWQuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0
U1BJLmg6IEd1YXJkIFVJR2VzdHVyZVJlY29nbml6ZXIgbW9kaWZpZXJGbGFncyB3aXRoIEhBVkUo
VUlfR0VTVFVSRV9SRUNPR05JWkVSX01PRElGSUVSX0ZMQUdTKS4KKwogMjAyMC0wNi0xMSAgQ2hh
bmdTZW9rIE9oICA8Y2hhbmdzZW9rQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0dUS10gSW1wbGVt
ZW50IGJ1dHRvbi1wcmVzcy1ldmVudCwgYnV0dG9uLXJlbGVhc2UtZXZlbnQsIGFuZCBhYnNvbHV0
ZS1heGlzLWV2ZW50IG9mIEdBTUVQQUQgQVBJLgpJbmRleDogU291cmNlL1dlYktpdC9QbGF0Zm9y
bS9zcGkvaW9zL1VJS2l0U1BJLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9QbGF0Zm9y
bS9zcGkvaW9zL1VJS2l0U1BJLmgJKHJldmlzaW9uIDI2MjkwMSkKKysrIFNvdXJjZS9XZWJLaXQv
UGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MTksNyArNDE5
LDcgQEAgdHlwZWRlZiBlbnVtIHsKIEBlbmQKIAogQGludGVyZmFjZSBVSUdlc3R1cmVSZWNvZ25p
emVyICgpCi0jaWYgUExBVEZPUk0oSU9TKSAmJiAhZGVmaW5lZChfX0lQSE9ORV8xM180KQorI2lm
ICFIQVZFKFVJX0dFU1RVUkVfUkVDT0dOSVpFUl9NT0RJRklFUl9GTEFHUykKIEBwcm9wZXJ0eSAo
bm9uYXRvbWljLCByZWFkb25seSwgZ2V0dGVyPV9tb2RpZmllckZsYWdzKSBVSUtleU1vZGlmaWVy
RmxhZ3MgbW9kaWZpZXJGbGFnczsKICNlbmRpZgogQGVuZAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401668</attachid>
            <date>2020-06-11 12:30:50 -0700</date>
            <delta_ts>2020-06-11 13:21:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213038-20200611123049.patch</filename>
            <type>text/plain</type>
            <size>1172</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNjI5MTYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA2LTExICBKb25hdGhhbiBCZWRhcmQgIDxq
YmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQ6IE1ha2UgVUlHZXN0dXJlUmVjb2du
aXplciBidWlsZCBmb3Igd2F0Y2hPUyBhbmQgdHZPUworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMDM4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82
NDIxNzY1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICAqIHd0Zi9QbGF0Zm9ybUhhdmUuaDogRW5hYmxlIEhBVkUoVUlfR0VTVFVSRV9SRUNPR05JWkVS
X01PRElGSUVSX0ZMQUdTKSBmb3Igd2F0Y2hPUyBhbmQgdHZPUy4KKwogMjAyMC0wNi0xMSAgRGF2
aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtJUENdIEFkb3B0IGVu
dW0gY2xhc3MgZm9yIERyYWdTb3VyY2VBY3Rpb24KSW5kZXg6IFNvdXJjZS9XVEYvd3RmL1BsYXRm
b3JtSGF2ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCShy
ZXZpc2lvbiAyNjI5MTUpCisrKyBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAkod29ya2lu
ZyBjb3B5KQpAQCAtNDQ1LDYgKzQ0NSw5IEBACiAKICNpZiAoUExBVEZPUk0oSU9TKSAmJiBfX0lQ
SE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMzA0MDApCiAjZGVmaW5lIEhBVkVfVUlf
Q1VSU09SX0lOVEVSQUNUSU9OIDEKKyNlbmRpZgorCisjaWYgKFBMQVRGT1JNKElPUykgJiYgX19J
UEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTMwNDAwIHx8IFBMQVRGT1JNKFdBVENI
T1MpIHx8IFBMQVRGT1JNKEFQUExFVFYpKQogI2RlZmluZSBIQVZFX1VJX0dFU1RVUkVfUkVDT0dO
SVpFUl9NT0RJRklFUl9GTEFHUyAxCiAjZW5kaWYKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401677</attachid>
            <date>2020-06-11 13:21:06 -0700</date>
            <delta_ts>2020-06-11 14:02:57 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-213038-20200611132105.patch</filename>
            <type>text/plain</type>
            <size>1168</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNjI5MjApCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA2LTExICBKb25hdGhhbiBCZWRhcmQgIDxq
YmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQ6IE1ha2UgVUlHZXN0dXJlUmVjb2du
aXplciBidWlsZCBmb3Igd2F0Y2hPUyBhbmQgdHZPUworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMDM4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82
NDIxNzY1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgICog
d3RmL1BsYXRmb3JtSGF2ZS5oOiBFbmFibGUgSEFWRShVSV9HRVNUVVJFX1JFQ09HTklaRVJfTU9E
SUZJRVJfRkxBR1MpIGZvciB3YXRjaE9TIGFuZCB0dk9TLgorCiAyMDIwLTA2LTExICBEYXZpZCBL
aWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgW0lQQ10gQWRvcHQgZW51bSBj
bGFzcyBmb3IgRHJhZ1NvdXJjZUFjdGlvbgpJbmRleDogU291cmNlL1dURi93dGYvUGxhdGZvcm1I
YXZlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgJKHJldmlz
aW9uIDI2MjkyMCkKKysrIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCSh3b3JraW5nIGNv
cHkpCkBAIC00NDUsNiArNDQ1LDkgQEAKIAogI2lmIChQTEFURk9STShJT1MpICYmIF9fSVBIT05F
X09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEzMDQwMCkKICNkZWZpbmUgSEFWRV9VSV9DVVJT
T1JfSU5URVJBQ1RJT04gMQorI2VuZGlmCisKKyNpZiAoUExBVEZPUk0oSU9TKSAmJiBfX0lQSE9O
RV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMzA0MDApIHx8IFBMQVRGT1JNKFdBVENIT1Mp
IHx8IFBMQVRGT1JNKEFQUExFVFYpCiAjZGVmaW5lIEhBVkVfVUlfR0VTVFVSRV9SRUNPR05JWkVS
X01PRElGSUVSX0ZMQUdTIDEKICNlbmRpZgogCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>