<?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>202338</bug_id>
          
          <creation_ts>2019-09-27 17:15:54 -0700</creation_ts>
          <short_desc>Switch to WKShareSheet for WKPDFView</short_desc>
          <delta_ts>2019-10-07 15:53:34 -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>New Bugs</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="Megan Gardner">megan_gardner</reporter>
          <assigned_to name="Megan Gardner">megan_gardner</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>dbates</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1575015</commentid>
    <comment_count>0</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2019-09-27 17:15:54 -0700</bug_when>
    <thetext>Switch to WKShareSheet for WKPDFView</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1575016</commentid>
    <comment_count>1</comment_count>
      <attachid>379775</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2019-09-27 17:18:38 -0700</bug_when>
    <thetext>Created attachment 379775
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1575020</commentid>
    <comment_count>2</comment_count>
      <attachid>379778</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2019-09-27 17:31:07 -0700</bug_when>
    <thetext>Created attachment 379778
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1575150</commentid>
    <comment_count>3</comment_count>
      <attachid>379778</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2019-09-29 10:04:52 -0700</bug_when>
    <thetext>Comment on attachment 379778
Patch

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

This is a good first stab. It looks like this patch has a use-after-free because:

1. The allocated WKShareSheet is assigned to a local RetainPtr.

2. _shareSheet is never assigned a non-nil value

&gt; Source/WebKit/UIProcess/ios/WKPDFView.mm:560
&gt; +    if (_shareSheet)

Ok as-is. The optimal solution would be to unconditionally call -dismiss because:

1. Sending a message to a possible nil object is okay in Obj-C.
2. Because of (1) a branch can be removed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1577421</commentid>
    <comment_count>4</comment_count>
      <attachid>380342</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2019-10-07 12:02:20 -0700</bug_when>
    <thetext>Created attachment 380342
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1577511</commentid>
    <comment_count>5</comment_count>
      <attachid>380342</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2019-10-07 14:18:56 -0700</bug_when>
    <thetext>Comment on attachment 380342
Patch

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

&gt; Source/WebKit/ChangeLog:10
&gt; +        us to eliminate this mostly unused class.

Now entirely unused?

&gt; Source/WebKit/UIProcess/ios/WKPDFView.h:32
&gt; +@interface WKPDFView : WKApplicationStateTrackingView &lt;WKWebViewContentProvider, WKShareSheetDelegate&gt;

Keep these sorted :P

&gt; Source/WebKit/UIProcess/ios/WKPDFView.mm:564
&gt; +    [_shareSheet presentWithParameters:shareData inRect: { [[_hostViewController view] convertRect:boundingRect toView:webView] } completionHandler:[] (bool success) { }];

Is there not a way to pass a null completion handler? Maybe not.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1577526</commentid>
    <comment_count>6</comment_count>
      <attachid>380342</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2019-10-07 15:11:21 -0700</bug_when>
    <thetext>Comment on attachment 380342
Patch

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

&gt;&gt; Source/WebKit/UIProcess/ios/WKPDFView.mm:564
&gt;&gt; +    [_shareSheet presentWithParameters:shareData inRect: { [[_hostViewController view] convertRect:boundingRect toView:webView] } completionHandler:[] (bool success) { }];
&gt; 
&gt; Is there not a way to pass a null completion handler? Maybe not.

I took this from the calls in WKContentViewInteraction.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1577528</commentid>
    <comment_count>7</comment_count>
      <attachid>380366</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2019-10-07 15:12:10 -0700</bug_when>
    <thetext>Created attachment 380366
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1577529</commentid>
    <comment_count>8</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2019-10-07 15:13:00 -0700</bug_when>
    <thetext>&lt;rdar://problem/56052711&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1577548</commentid>
    <comment_count>9</comment_count>
      <attachid>380366</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-10-07 15:53:33 -0700</bug_when>
    <thetext>Comment on attachment 380366
Patch for landing

Clearing flags on attachment: 380366

Committed r250801: &lt;https://trac.webkit.org/changeset/250801&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1577549</commentid>
    <comment_count>10</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-10-07 15:53:34 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>379775</attachid>
            <date>2019-09-27 17:18:38 -0700</date>
            <delta_ts>2019-09-27 17:31:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-202338-20190927171837.patch</filename>
            <type>text/plain</type>
            <size>4087</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2ZThlNGQ4NjM0OTcyMWRm
Y2Q3MDU5MWMyNTE2ZTQxYTQ0MmQyNGYuLjIxZDQyZDY0Mzc2MTgyMzU5OWYzNGFiOTA4MGI1Yjg2
YzgwMzU2OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDktMjcgIE1lZ2FuIEdh
cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBTd2l0Y2ggdG8gV0tT
aGFyZVNoZWV0IGZvciBXS1BERlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIwMjMzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFN3aXRjaCB0byBXS1NoYXJlU2hlZXQgZnJvbSB0aGUgc2hhcmUgc2hl
ZXQgaW4gVUlXS1NlbGVjdGlvbkFzc2lzdGFudCwgc2luY2UgdGhpcyBpcyB0aGUgb25seSBpbnN0
YW5jZQorICAgICAgICBvZiBVSVdLU2VsZWN0aW9uQXNzaXN0YW50IGFueSBtb3JlLiBUaGlzIHdp
bGwga2VlcCBhbGwgb3VyIHNoYXJlIHNoZWV0IGNvZGUgdG9nZXRoZXIsIGFuZCBhbGxvdworICAg
ICAgICB1cyB0byBlbGltaW5hdGUgdGhpcyBtb3N0bHkgdW51c2VkIGNsYXNzLgorCisgICAgICAg
ICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dL
UERGVmlldy5tbToKKyAgICAgICAgKC1bV0tQREZWaWV3IGRlYWxsb2NdKToKKyAgICAgICAgKC1b
V0tQREZWaWV3IGFjdGlvblNoZWV0QXNzaXN0YW50OnNoYXJlRWxlbWVudFdpdGhVUkw6cmVjdDpd
KToKKyAgICAgICAgKC1bV0tQREZWaWV3IHNoYXJlU2hlZXREaWREaXNtaXNzOl0pOgorCiAyMDE5
LTA5LTI1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg
ICAgICAgRG9uJ3QgZmFsbCBiYWNrIHRvIGRlZmF1bHQgc2Vzc2lvbiBpZiBzZXNzaW9uIGNhbid0
IGJlIGZvdW5kIGZvciBjb29raWUgb3BlcmF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z
L1dLUERGVmlldy5oCmluZGV4IGU4MDQ0ZTU0Y2U1ZDMzMGI5MjRkNzE5ZTI4YWM3MGQ1Y2MwM2Yz
NTkuLjE3ZDZmNDI4YjRhYjFhOWU1OThjMDI4NWJmNjUyYTg2YjgzMjM3MTkgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcuaAorKysgYi9Tb3VyY2UvV2Vi
S2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3LmgKQEAgLTI2LDkgKzI2LDEwIEBACiAjaWYgRU5B
QkxFKFdLUERGVklFVykKIAogI2ltcG9ydCAiV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3
LmgiCisjaW1wb3J0ICJXS1NoYXJlU2hlZXQuaCIKICNpbXBvcnQgIldLV2ViVmlld0NvbnRlbnRQ
cm92aWRlci5oIgogCi1AaW50ZXJmYWNlIFdLUERGVmlldyA6IFdLQXBwbGljYXRpb25TdGF0ZVRy
YWNraW5nVmlldyA8V0tXZWJWaWV3Q29udGVudFByb3ZpZGVyPgorQGludGVyZmFjZSBXS1BERlZp
ZXcgOiBXS0FwcGxpY2F0aW9uU3RhdGVUcmFja2luZ1ZpZXcgPFdLV2ViVmlld0NvbnRlbnRQcm92
aWRlciwgV0tTaGFyZVNoZWV0RGVsZWdhdGU+CiAKIEBlbmQKIApkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL2lvcy9XS1BERlZpZXcubW0KaW5kZXggMDI1NzAxZGE2NWY1MTNkNjRkYTE5OGRmMDViMGU0
ZTRiYTJmNzU2Ny4uYmIxZTNiYTY4MzRmNDYxMmQ0MmRlOGJlODk5NDExN2UxOTQ5NDVkMiAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQorKysgYi9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCkBAIC00MSw2ICs0MSw3IEBA
CiAjaW1wb3J0ICJfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5oIgogI2ltcG9ydCA8
TW9iaWxlQ29yZVNlcnZpY2VzL01vYmlsZUNvcmVTZXJ2aWNlcy5oPgogI2ltcG9ydCA8V2ViQ29y
ZS9EYXRhRGV0ZWN0aW9uLmg+CisjaW1wb3J0IDxXZWJDb3JlL1NoYXJlRGF0YS5oPgogI2ltcG9y
dCA8d3RmL0Jsb2NrUHRyLmg+CiAjaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgogI2ltcG9ydCA8
d3RmL1JldGFpblB0ci5oPgpAQCAtNzAsMTAgKzcxLDE2IEBAIEBpbXBsZW1lbnRhdGlvbiBXS1BE
RlZpZXcgewogICAgIFJldGFpblB0cjxOU1N0cmluZz4gX3N1Z2dlc3RlZEZpbGVuYW1lOwogICAg
IFdlYWtPYmpDUHRyPFdLV2ViVmlldz4gX3dlYlZpZXc7CiAgICAgUmV0YWluUHRyPFdLS2V5Ym9h
cmRTY3JvbGxWaWV3QW5pbWF0b3I+IF9rZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yOworICAgIFJl
dGFpblB0cjxXS1NoYXJlU2hlZXQ+IF9zaGFyZVNoZWV0OwogfQogCiAtICh2b2lkKWRlYWxsb2MK
IHsKKyAgICBpZiAoX3NoYXJlU2hlZXQpIHsKKyAgICAgICAgW19zaGFyZVNoZWV0IHNldERlbGVn
YXRlOm5pbF07CisgICAgICAgIFtfc2hhcmVTaGVldCBkaXNtaXNzXTsKKyAgICAgICAgX3NoYXJl
U2hlZXQgPSBuaWw7CisgICAgfQogICAgIFtfYWN0aW9uU2hlZXRBc3Npc3RhbnQgY2xlYW51cFNo
ZWV0XTsKICAgICBbW19ob3N0Vmlld0NvbnRyb2xsZXIgdmlld10gcmVtb3ZlRnJvbVN1cGVydmll
d107CiAgICAgW19wYWdlTnVtYmVySW5kaWNhdG9yIHJlbW92ZUZyb21TdXBlcnZpZXddOwpAQCAt
NTQzLDkgKzU1MCwyNyBAQCAtICh2b2lkKWFjdGlvblNoZWV0QXNzaXN0YW50OihXS0FjdGlvblNo
ZWV0QXNzaXN0YW50ICopYXNzaXN0YW50IG9wZW5FbGVtZW50QXRMbwogCiAtICh2b2lkKWFjdGlv
blNoZWV0QXNzaXN0YW50OihXS0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YW50IHNoYXJl
RWxlbWVudFdpdGhVUkw6KE5TVVJMICopdXJsIHJlY3Q6KENHUmVjdClib3VuZGluZ1JlY3QKIHsK
LSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHVzZSBXS1NoYXJlU2hlZXQgaW5zdGVhZCBvZiBVSVdL
U2VsZWN0aW9uQXNzaXN0YW50IGZvciB0aGlzLgotICAgIGF1dG8gc2VsZWN0aW9uQXNzaXN0YW50
ID0gYWRvcHROUyhbW1VJV0tTZWxlY3Rpb25Bc3Npc3RhbnQgYWxsb2NdIGluaXRXaXRoVmlldzpb
X2hvc3RWaWV3Q29udHJvbGxlciB2aWV3XV0pOwotICAgIFtzZWxlY3Rpb25Bc3Npc3RhbnQgc2hv
d1NoYXJlU2hlZXRGb3I6V1RGOjp1c2VyVmlzaWJsZVN0cmluZyh1cmwpIGZyb21SZWN0OmJvdW5k
aW5nUmVjdF07CisgICAgV0tXZWJWaWV3ICp3ZWJWaWV3ID0gX3dlYlZpZXcuZ2V0QXV0b3JlbGVh
c2VkKCk7CisgICAgaWYgKCF3ZWJWaWV3KQorICAgICAgICByZXR1cm47CisKKyAgICBXZWJDb3Jl
OjpTaGFyZURhdGFXaXRoUGFyc2VkVVJMIHNoYXJlRGF0YTsKKyAgICBzaGFyZURhdGEudXJsID0g
eyB1cmwgfTsKKyAgICAKKyAgICBpZiAoX3NoYXJlU2hlZXQpCisgICAgICAgIFtfc2hhcmVTaGVl
dCBkaXNtaXNzXTsKKworICAgIGF1dG8gc2hhcmVTaGVldCA9IGFkb3B0TlMoW1tXS1NoYXJlU2hl
ZXQgYWxsb2NdIGluaXRXaXRoVmlldzp3ZWJWaWV3XSk7CisgICAgW3NoYXJlU2hlZXQgc2V0RGVs
ZWdhdGU6c2VsZl07CisgICAgW3NoYXJlU2hlZXQgcHJlc2VudFdpdGhQYXJhbWV0ZXJzOnNoYXJl
RGF0YSBpblJlY3Q6IHsgW1tfaG9zdFZpZXdDb250cm9sbGVyIHZpZXddIGNvbnZlcnRSZWN0OmJv
dW5kaW5nUmVjdCB0b1ZpZXc6d2ViVmlld10gfSBjb21wbGV0aW9uSGFuZGxlcjpbXSAoYm9vbCBz
dWNjZXNzKSB7IH1dOworfQorCistICh2b2lkKXNoYXJlU2hlZXREaWREaXNtaXNzOihXS1NoYXJl
U2hlZXQgKilzaGFyZVNoZWV0Cit7CisgICAgQVNTRVJUKF9zaGFyZVNoZWV0ID09IHNoYXJlU2hl
ZXQpOworICAgIAorICAgIFtfc2hhcmVTaGVldCBzZXREZWxlZ2F0ZTpuaWxdOworICAgIF9zaGFy
ZVNoZWV0ID0gbmlsOwogfQogCiAjaWYgSEFWRShBUFBfTElOS1MpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>379778</attachid>
            <date>2019-09-27 17:31:07 -0700</date>
            <delta_ts>2019-10-07 12:02:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-202338-20190927173106.patch</filename>
            <type>text/plain</type>
            <size>5138</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2ZThlNGQ4NjM0OTcyMWRm
Y2Q3MDU5MWMyNTE2ZTQxYTQ0MmQyNGYuLjFiN2FiNzM4MmQ4ODQxODI3YTgzMTI1ZmYzMWEwNWVm
MTdhNmQ4NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMDktMjcgIE1lZ2FuIEdh
cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBTd2l0Y2ggdG8gV0tT
aGFyZVNoZWV0IGZvciBXS1BERlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIwMjMzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFN3aXRjaCB0byBXS1NoYXJlU2hlZXQgZnJvbSB0aGUgc2hhcmUgc2hl
ZXQgaW4gVUlXS1NlbGVjdGlvbkFzc2lzdGFudCwgc2luY2UgdGhpcyBpcyB0aGUgb25seSBpbnN0
YW5jZQorICAgICAgICBvZiBVSVdLU2VsZWN0aW9uQXNzaXN0YW50IGFueSBtb3JlLiBUaGlzIHdp
bGwga2VlcCBhbGwgb3VyIHNoYXJlIHNoZWV0IGNvZGUgdG9nZXRoZXIsIGFuZCBhbGxvdworICAg
ICAgICB1cyB0byBlbGltaW5hdGUgdGhpcyBtb3N0bHkgdW51c2VkIGNsYXNzLgorCisgICAgICAg
ICogUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv
V0tQREZWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisgICAg
ICAgICgtW1dLUERGVmlldyBkZWFsbG9jXSk6CisgICAgICAgICgtW1dLUERGVmlldyBhY3Rpb25T
aGVldEFzc2lzdGFudDpzaGFyZUVsZW1lbnRXaXRoVVJMOnJlY3Q6XSk6CisgICAgICAgICgtW1dL
UERGVmlldyBzaGFyZVNoZWV0RGlkRGlzbWlzczpdKToKKwogMjAxOS0wOS0yNSAgQWxleCBDaHJp
c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIERvbid0IGZhbGwg
YmFjayB0byBkZWZhdWx0IHNlc3Npb24gaWYgc2Vzc2lvbiBjYW4ndCBiZSBmb3VuZCBmb3IgY29v
a2llIG9wZXJhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lv
cy9VSUtpdFNQSS5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgK
aW5kZXggOGJjNDhiZGZjMjdkNmZhNjNkN2MzMGFlM2QyZGMzMzZlNDdjOGQxMi4uNjE4MDA4YzBh
ODVjYmYyNDEyM2M4MTYyYmNiODBkMTY3ZWQxM2JiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9y
bS9zcGkvaW9zL1VJS2l0U1BJLmgKQEAgLTY5LDcgKzY5LDYgQEAKICNpbXBvcnQgPFVJS2l0L1VJ
Vmlld0NvbnRyb2xsZXJfVmlld1NlcnZpY2UuaD4KICNpbXBvcnQgPFVJS2l0L1VJVmlld19Qcml2
YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSVZpc3VhbEVmZmVjdF9Qcml2YXRlLmg+Ci0jaW1wb3J0
IDxVSUtpdC9VSVdLU2VsZWN0aW9uQXNzaXN0YW50Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVdLVGV4
dEludGVyYWN0aW9uQXNzaXN0YW50Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVdlYkJyb3dzZXJWaWV3
Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVdlYkRvY3VtZW50Vmlldy5oPgpAQCAtNTkxLDE0ICs1OTAs
NiBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBVSVdLR2VzdHVyZVR5cGUpIHsKIEBpbnRl
cmZhY2UgVUlXZWJTZWxlY3Rpb25Bc3Npc3RhbnQgOiBOU09iamVjdAogQGVuZAogCi1AaW50ZXJm
YWNlIFVJV0tTZWxlY3Rpb25Bc3Npc3RhbnQgOiBVSVdlYlNlbGVjdGlvbkFzc2lzdGFudAotQGVu
ZAotCi1AaW50ZXJmYWNlIFVJV0tTZWxlY3Rpb25Bc3Npc3RhbnQgKCkKLS0gKGlkKWluaXRXaXRo
VmlldzooVUlWaWV3ICopdmlldzsKLS0gKHZvaWQpc2hvd1NoYXJlU2hlZXRGb3I6KE5TU3RyaW5n
ICopc2VsZWN0ZWRUZXJtIGZyb21SZWN0OihDR1JlY3QpcHJlc2VudGF0aW9uUmVjdDsKLUBlbmQK
LQogQGludGVyZmFjZSBVSVdLQXV0b2NvcnJlY3Rpb25SZWN0cyA6IE5TT2JqZWN0CiBAZW5kCiAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcuaCBiL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcuaAppbmRleCBlODA0NGU1NGNlNWQz
MzBiOTI0ZDcxOWUyOGFjNzBkNWNjMDNmMzU5Li4xN2Q2ZjQyOGI0YWIxYTllNTk4YzAyODViZjY1
MmE4NmI4MzIzNzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQ
REZWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5oCkBA
IC0yNiw5ICsyNiwxMCBAQAogI2lmIEVOQUJMRShXS1BERlZJRVcpCiAKICNpbXBvcnQgIldLQXBw
bGljYXRpb25TdGF0ZVRyYWNraW5nVmlldy5oIgorI2ltcG9ydCAiV0tTaGFyZVNoZWV0LmgiCiAj
aW1wb3J0ICJXS1dlYlZpZXdDb250ZW50UHJvdmlkZXIuaCIKIAotQGludGVyZmFjZSBXS1BERlZp
ZXcgOiBXS0FwcGxpY2F0aW9uU3RhdGVUcmFja2luZ1ZpZXcgPFdLV2ViVmlld0NvbnRlbnRQcm92
aWRlcj4KK0BpbnRlcmZhY2UgV0tQREZWaWV3IDogV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdW
aWV3IDxXS1dlYlZpZXdDb250ZW50UHJvdmlkZXIsIFdLU2hhcmVTaGVldERlbGVnYXRlPgogCiBA
ZW5kCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcu
bW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCmluZGV4IDAyNTcw
MWRhNjVmNTEzZDY0ZGExOThkZjA1YjBlNGU0YmEyZjc1NjcuLmJiMWUzYmE2ODM0ZjQ2MTJkNDJk
ZThiZTg5OTQxMTdlMTk0OTQ1ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L2lvcy9XS1BERlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERG
Vmlldy5tbQpAQCAtNDEsNiArNDEsNyBAQAogI2ltcG9ydCAiX1dLV2ViVmlld1ByaW50Rm9ybWF0
dGVySW50ZXJuYWwuaCIKICNpbXBvcnQgPE1vYmlsZUNvcmVTZXJ2aWNlcy9Nb2JpbGVDb3JlU2Vy
dmljZXMuaD4KICNpbXBvcnQgPFdlYkNvcmUvRGF0YURldGVjdGlvbi5oPgorI2ltcG9ydCA8V2Vi
Q29yZS9TaGFyZURhdGEuaD4KICNpbXBvcnQgPHd0Zi9CbG9ja1B0ci5oPgogI2ltcG9ydCA8d3Rm
L01haW5UaHJlYWQuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTcwLDEwICs3MSwx
NiBAQCBAaW1wbGVtZW50YXRpb24gV0tQREZWaWV3IHsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+
IF9zdWdnZXN0ZWRGaWxlbmFtZTsKICAgICBXZWFrT2JqQ1B0cjxXS1dlYlZpZXc+IF93ZWJWaWV3
OwogICAgIFJldGFpblB0cjxXS0tleWJvYXJkU2Nyb2xsVmlld0FuaW1hdG9yPiBfa2V5Ym9hcmRT
Y3JvbGxpbmdBbmltYXRvcjsKKyAgICBSZXRhaW5QdHI8V0tTaGFyZVNoZWV0PiBfc2hhcmVTaGVl
dDsKIH0KIAogLSAodm9pZClkZWFsbG9jCiB7CisgICAgaWYgKF9zaGFyZVNoZWV0KSB7CisgICAg
ICAgIFtfc2hhcmVTaGVldCBzZXREZWxlZ2F0ZTpuaWxdOworICAgICAgICBbX3NoYXJlU2hlZXQg
ZGlzbWlzc107CisgICAgICAgIF9zaGFyZVNoZWV0ID0gbmlsOworICAgIH0KICAgICBbX2FjdGlv
blNoZWV0QXNzaXN0YW50IGNsZWFudXBTaGVldF07CiAgICAgW1tfaG9zdFZpZXdDb250cm9sbGVy
IHZpZXddIHJlbW92ZUZyb21TdXBlcnZpZXddOwogICAgIFtfcGFnZU51bWJlckluZGljYXRvciBy
ZW1vdmVGcm9tU3VwZXJ2aWV3XTsKQEAgLTU0Myw5ICs1NTAsMjcgQEAgLSAodm9pZClhY3Rpb25T
aGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudCBvcGVuRWxl
bWVudEF0TG8KIAogLSAodm9pZClhY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFz
c2lzdGFudCAqKWFzc2lzdGFudCBzaGFyZUVsZW1lbnRXaXRoVVJMOihOU1VSTCAqKXVybCByZWN0
OihDR1JlY3QpYm91bmRpbmdSZWN0CiB7Ci0gICAgLy8gRklYTUU6IFdlIHNob3VsZCB1c2UgV0tT
aGFyZVNoZWV0IGluc3RlYWQgb2YgVUlXS1NlbGVjdGlvbkFzc2lzdGFudCBmb3IgdGhpcy4KLSAg
ICBhdXRvIHNlbGVjdGlvbkFzc2lzdGFudCA9IGFkb3B0TlMoW1tVSVdLU2VsZWN0aW9uQXNzaXN0
YW50IGFsbG9jXSBpbml0V2l0aFZpZXc6W19ob3N0Vmlld0NvbnRyb2xsZXIgdmlld11dKTsKLSAg
ICBbc2VsZWN0aW9uQXNzaXN0YW50IHNob3dTaGFyZVNoZWV0Rm9yOldURjo6dXNlclZpc2libGVT
dHJpbmcodXJsKSBmcm9tUmVjdDpib3VuZGluZ1JlY3RdOworICAgIFdLV2ViVmlldyAqd2ViVmll
dyA9IF93ZWJWaWV3LmdldEF1dG9yZWxlYXNlZCgpOworICAgIGlmICghd2ViVmlldykKKyAgICAg
ICAgcmV0dXJuOworCisgICAgV2ViQ29yZTo6U2hhcmVEYXRhV2l0aFBhcnNlZFVSTCBzaGFyZURh
dGE7CisgICAgc2hhcmVEYXRhLnVybCA9IHsgdXJsIH07CisgICAgCisgICAgaWYgKF9zaGFyZVNo
ZWV0KQorICAgICAgICBbX3NoYXJlU2hlZXQgZGlzbWlzc107CisKKyAgICBhdXRvIHNoYXJlU2hl
ZXQgPSBhZG9wdE5TKFtbV0tTaGFyZVNoZWV0IGFsbG9jXSBpbml0V2l0aFZpZXc6d2ViVmlld10p
OworICAgIFtzaGFyZVNoZWV0IHNldERlbGVnYXRlOnNlbGZdOworICAgIFtzaGFyZVNoZWV0IHBy
ZXNlbnRXaXRoUGFyYW1ldGVyczpzaGFyZURhdGEgaW5SZWN0OiB7IFtbX2hvc3RWaWV3Q29udHJv
bGxlciB2aWV3XSBjb252ZXJ0UmVjdDpib3VuZGluZ1JlY3QgdG9WaWV3OndlYlZpZXddIH0gY29t
cGxldGlvbkhhbmRsZXI6W10gKGJvb2wgc3VjY2VzcykgeyB9XTsKK30KKworLSAodm9pZClzaGFy
ZVNoZWV0RGlkRGlzbWlzczooV0tTaGFyZVNoZWV0ICopc2hhcmVTaGVldAoreworICAgIEFTU0VS
VChfc2hhcmVTaGVldCA9PSBzaGFyZVNoZWV0KTsKKyAgICAKKyAgICBbX3NoYXJlU2hlZXQgc2V0
RGVsZWdhdGU6bmlsXTsKKyAgICBfc2hhcmVTaGVldCA9IG5pbDsKIH0KIAogI2lmIEhBVkUoQVBQ
X0xJTktTKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>380342</attachid>
            <date>2019-10-07 12:02:20 -0700</date>
            <delta_ts>2019-10-07 15:12:09 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-202338-20191007120219.patch</filename>
            <type>text/plain</type>
            <size>5110</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2ZThlNGQ4NjM0OTcyMWRm
Y2Q3MDU5MWMyNTE2ZTQxYTQ0MmQyNGYuLjFiN2FiNzM4MmQ4ODQxODI3YTgzMTI1ZmYzMWEwNWVm
MTdhNmQ4NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMDktMjcgIE1lZ2FuIEdh
cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBTd2l0Y2ggdG8gV0tT
aGFyZVNoZWV0IGZvciBXS1BERlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIwMjMzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFN3aXRjaCB0byBXS1NoYXJlU2hlZXQgZnJvbSB0aGUgc2hhcmUgc2hl
ZXQgaW4gVUlXS1NlbGVjdGlvbkFzc2lzdGFudCwgc2luY2UgdGhpcyBpcyB0aGUgb25seSBpbnN0
YW5jZQorICAgICAgICBvZiBVSVdLU2VsZWN0aW9uQXNzaXN0YW50IGFueSBtb3JlLiBUaGlzIHdp
bGwga2VlcCBhbGwgb3VyIHNoYXJlIHNoZWV0IGNvZGUgdG9nZXRoZXIsIGFuZCBhbGxvdworICAg
ICAgICB1cyB0byBlbGltaW5hdGUgdGhpcyBtb3N0bHkgdW51c2VkIGNsYXNzLgorCisgICAgICAg
ICogUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv
V0tQREZWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisgICAg
ICAgICgtW1dLUERGVmlldyBkZWFsbG9jXSk6CisgICAgICAgICgtW1dLUERGVmlldyBhY3Rpb25T
aGVldEFzc2lzdGFudDpzaGFyZUVsZW1lbnRXaXRoVVJMOnJlY3Q6XSk6CisgICAgICAgICgtW1dL
UERGVmlldyBzaGFyZVNoZWV0RGlkRGlzbWlzczpdKToKKwogMjAxOS0wOS0yNSAgQWxleCBDaHJp
c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIERvbid0IGZhbGwg
YmFjayB0byBkZWZhdWx0IHNlc3Npb24gaWYgc2Vzc2lvbiBjYW4ndCBiZSBmb3VuZCBmb3IgY29v
a2llIG9wZXJhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lv
cy9VSUtpdFNQSS5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgK
aW5kZXggOGJjNDhiZGZjMjdkNmZhNjNkN2MzMGFlM2QyZGMzMzZlNDdjOGQxMi4uNjE4MDA4YzBh
ODVjYmYyNDEyM2M4MTYyYmNiODBkMTY3ZWQxM2JiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9y
bS9zcGkvaW9zL1VJS2l0U1BJLmgKQEAgLTY5LDcgKzY5LDYgQEAKICNpbXBvcnQgPFVJS2l0L1VJ
Vmlld0NvbnRyb2xsZXJfVmlld1NlcnZpY2UuaD4KICNpbXBvcnQgPFVJS2l0L1VJVmlld19Qcml2
YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSVZpc3VhbEVmZmVjdF9Qcml2YXRlLmg+Ci0jaW1wb3J0
IDxVSUtpdC9VSVdLU2VsZWN0aW9uQXNzaXN0YW50Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVdLVGV4
dEludGVyYWN0aW9uQXNzaXN0YW50Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVdlYkJyb3dzZXJWaWV3
Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVdlYkRvY3VtZW50Vmlldy5oPgpAQCAtNTkxLDE0ICs1OTAs
NiBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBVSVdLR2VzdHVyZVR5cGUpIHsKIEBpbnRl
cmZhY2UgVUlXZWJTZWxlY3Rpb25Bc3Npc3RhbnQgOiBOU09iamVjdAogQGVuZAogCi1AaW50ZXJm
YWNlIFVJV0tTZWxlY3Rpb25Bc3Npc3RhbnQgOiBVSVdlYlNlbGVjdGlvbkFzc2lzdGFudAotQGVu
ZAotCi1AaW50ZXJmYWNlIFVJV0tTZWxlY3Rpb25Bc3Npc3RhbnQgKCkKLS0gKGlkKWluaXRXaXRo
VmlldzooVUlWaWV3ICopdmlldzsKLS0gKHZvaWQpc2hvd1NoYXJlU2hlZXRGb3I6KE5TU3RyaW5n
ICopc2VsZWN0ZWRUZXJtIGZyb21SZWN0OihDR1JlY3QpcHJlc2VudGF0aW9uUmVjdDsKLUBlbmQK
LQogQGludGVyZmFjZSBVSVdLQXV0b2NvcnJlY3Rpb25SZWN0cyA6IE5TT2JqZWN0CiBAZW5kCiAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcuaCBiL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcuaAppbmRleCBlODA0NGU1NGNlNWQz
MzBiOTI0ZDcxOWUyOGFjNzBkNWNjMDNmMzU5Li4xN2Q2ZjQyOGI0YWIxYTllNTk4YzAyODViZjY1
MmE4NmI4MzIzNzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQ
REZWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5oCkBA
IC0yNiw5ICsyNiwxMCBAQAogI2lmIEVOQUJMRShXS1BERlZJRVcpCiAKICNpbXBvcnQgIldLQXBw
bGljYXRpb25TdGF0ZVRyYWNraW5nVmlldy5oIgorI2ltcG9ydCAiV0tTaGFyZVNoZWV0LmgiCiAj
aW1wb3J0ICJXS1dlYlZpZXdDb250ZW50UHJvdmlkZXIuaCIKIAotQGludGVyZmFjZSBXS1BERlZp
ZXcgOiBXS0FwcGxpY2F0aW9uU3RhdGVUcmFja2luZ1ZpZXcgPFdLV2ViVmlld0NvbnRlbnRQcm92
aWRlcj4KK0BpbnRlcmZhY2UgV0tQREZWaWV3IDogV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdW
aWV3IDxXS1dlYlZpZXdDb250ZW50UHJvdmlkZXIsIFdLU2hhcmVTaGVldERlbGVnYXRlPgogCiBA
ZW5kCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcu
bW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCmluZGV4IDAyNTcw
MWRhNjVmNTEzZDY0ZGExOThkZjA1YjBlNGU0YmEyZjc1NjcuLjhjY2M2Mjc4MzBjYWM1NzA5ODli
Mzg3NTg4MDI4MzQwMDEwZTQ1M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L2lvcy9XS1BERlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERG
Vmlldy5tbQpAQCAtNDEsNiArNDEsNyBAQAogI2ltcG9ydCAiX1dLV2ViVmlld1ByaW50Rm9ybWF0
dGVySW50ZXJuYWwuaCIKICNpbXBvcnQgPE1vYmlsZUNvcmVTZXJ2aWNlcy9Nb2JpbGVDb3JlU2Vy
dmljZXMuaD4KICNpbXBvcnQgPFdlYkNvcmUvRGF0YURldGVjdGlvbi5oPgorI2ltcG9ydCA8V2Vi
Q29yZS9TaGFyZURhdGEuaD4KICNpbXBvcnQgPHd0Zi9CbG9ja1B0ci5oPgogI2ltcG9ydCA8d3Rm
L01haW5UaHJlYWQuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTcwLDEwICs3MSwx
NiBAQCBAaW1wbGVtZW50YXRpb24gV0tQREZWaWV3IHsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+
IF9zdWdnZXN0ZWRGaWxlbmFtZTsKICAgICBXZWFrT2JqQ1B0cjxXS1dlYlZpZXc+IF93ZWJWaWV3
OwogICAgIFJldGFpblB0cjxXS0tleWJvYXJkU2Nyb2xsVmlld0FuaW1hdG9yPiBfa2V5Ym9hcmRT
Y3JvbGxpbmdBbmltYXRvcjsKKyAgICBSZXRhaW5QdHI8V0tTaGFyZVNoZWV0PiBfc2hhcmVTaGVl
dDsKIH0KIAogLSAodm9pZClkZWFsbG9jCiB7CisgICAgaWYgKF9zaGFyZVNoZWV0KSB7CisgICAg
ICAgIFtfc2hhcmVTaGVldCBzZXREZWxlZ2F0ZTpuaWxdOworICAgICAgICBbX3NoYXJlU2hlZXQg
ZGlzbWlzc107CisgICAgICAgIF9zaGFyZVNoZWV0ID0gbmlsOworICAgIH0KICAgICBbX2FjdGlv
blNoZWV0QXNzaXN0YW50IGNsZWFudXBTaGVldF07CiAgICAgW1tfaG9zdFZpZXdDb250cm9sbGVy
IHZpZXddIHJlbW92ZUZyb21TdXBlcnZpZXddOwogICAgIFtfcGFnZU51bWJlckluZGljYXRvciBy
ZW1vdmVGcm9tU3VwZXJ2aWV3XTsKQEAgLTU0Myw5ICs1NTAsMjYgQEAgLSAodm9pZClhY3Rpb25T
aGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudCBvcGVuRWxl
bWVudEF0TG8KIAogLSAodm9pZClhY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFz
c2lzdGFudCAqKWFzc2lzdGFudCBzaGFyZUVsZW1lbnRXaXRoVVJMOihOU1VSTCAqKXVybCByZWN0
OihDR1JlY3QpYm91bmRpbmdSZWN0CiB7Ci0gICAgLy8gRklYTUU6IFdlIHNob3VsZCB1c2UgV0tT
aGFyZVNoZWV0IGluc3RlYWQgb2YgVUlXS1NlbGVjdGlvbkFzc2lzdGFudCBmb3IgdGhpcy4KLSAg
ICBhdXRvIHNlbGVjdGlvbkFzc2lzdGFudCA9IGFkb3B0TlMoW1tVSVdLU2VsZWN0aW9uQXNzaXN0
YW50IGFsbG9jXSBpbml0V2l0aFZpZXc6W19ob3N0Vmlld0NvbnRyb2xsZXIgdmlld11dKTsKLSAg
ICBbc2VsZWN0aW9uQXNzaXN0YW50IHNob3dTaGFyZVNoZWV0Rm9yOldURjo6dXNlclZpc2libGVT
dHJpbmcodXJsKSBmcm9tUmVjdDpib3VuZGluZ1JlY3RdOworICAgIFdLV2ViVmlldyAqd2ViVmll
dyA9IF93ZWJWaWV3LmdldEF1dG9yZWxlYXNlZCgpOworICAgIGlmICghd2ViVmlldykKKyAgICAg
ICAgcmV0dXJuOworCisgICAgV2ViQ29yZTo6U2hhcmVEYXRhV2l0aFBhcnNlZFVSTCBzaGFyZURh
dGE7CisgICAgc2hhcmVEYXRhLnVybCA9IHsgdXJsIH07CisgICAgCisgICAgW19zaGFyZVNoZWV0
IGRpc21pc3NdOworCisgICAgX3NoYXJlU2hlZXQgPSBhZG9wdE5TKFtbV0tTaGFyZVNoZWV0IGFs
bG9jXSBpbml0V2l0aFZpZXc6d2ViVmlld10pOworICAgIFtfc2hhcmVTaGVldCBzZXREZWxlZ2F0
ZTpzZWxmXTsKKyAgICBbX3NoYXJlU2hlZXQgcHJlc2VudFdpdGhQYXJhbWV0ZXJzOnNoYXJlRGF0
YSBpblJlY3Q6IHsgW1tfaG9zdFZpZXdDb250cm9sbGVyIHZpZXddIGNvbnZlcnRSZWN0OmJvdW5k
aW5nUmVjdCB0b1ZpZXc6d2ViVmlld10gfSBjb21wbGV0aW9uSGFuZGxlcjpbXSAoYm9vbCBzdWNj
ZXNzKSB7IH1dOworfQorCistICh2b2lkKXNoYXJlU2hlZXREaWREaXNtaXNzOihXS1NoYXJlU2hl
ZXQgKilzaGFyZVNoZWV0Cit7CisgICAgQVNTRVJUKF9zaGFyZVNoZWV0ID09IHNoYXJlU2hlZXQp
OworICAgIAorICAgIFtfc2hhcmVTaGVldCBzZXREZWxlZ2F0ZTpuaWxdOworICAgIF9zaGFyZVNo
ZWV0ID0gbmlsOwogfQogCiAjaWYgSEFWRShBUFBfTElOS1MpCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>380366</attachid>
            <date>2019-10-07 15:12:10 -0700</date>
            <delta_ts>2019-10-07 15:53:33 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-202338-20191007151209.patch</filename>
            <type>text/plain</type>
            <size>5140</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2ZThlNGQ4NjM0OTcyMWRm
Y2Q3MDU5MWMyNTE2ZTQxYTQ0MmQyNGYuLjU5Y2NlZTc1MzQ5ZTM2YWNiMzgzOGQ2NjAxZTBkNDZi
ODI5NWM2YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMDktMjcgIE1lZ2FuIEdh
cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBTd2l0Y2ggdG8gV0tT
aGFyZVNoZWV0IGZvciBXS1BERlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIwMjMzOAorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24u
CisKKyAgICAgICAgU3dpdGNoIHRvIFdLU2hhcmVTaGVldCBmcm9tIHRoZSBzaGFyZSBzaGVldCBp
biBVSVdLU2VsZWN0aW9uQXNzaXN0YW50LCBzaW5jZSB0aGlzIGlzIHRoZSBvbmx5IGluc3RhbmNl
CisgICAgICAgIG9mIFVJV0tTZWxlY3Rpb25Bc3Npc3RhbnQgYW55IG1vcmUuIFRoaXMgd2lsbCBr
ZWVwIGFsbCBvdXIgc2hhcmUgc2hlZXQgY29kZSB0b2dldGhlciwgYW5kIGFsbG93CisgICAgICAg
IHVzIHRvIGVsaW1pbmF0ZSB0aGlzIGNsYXNzIHRoYXQgd2lsbCBiZSBjb21wbGV0ZWx5IHVudXNl
ZCB3aXRoIHRoaXMgY2hhbmdlLgorCisgICAgICAgICogUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQ
SS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lmg6CisgICAgICAgICogVUlQ
cm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisgICAgICAgICgtW1dLUERGVmlldyBkZWFsbG9jXSk6
CisgICAgICAgICgtW1dLUERGVmlldyBhY3Rpb25TaGVldEFzc2lzdGFudDpzaGFyZUVsZW1lbnRX
aXRoVVJMOnJlY3Q6XSk6CisgICAgICAgICgtW1dLUERGVmlldyBzaGFyZVNoZWV0RGlkRGlzbWlz
czpdKToKKwogMjAxOS0wOS0yNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJr
aXQub3JnPgogCiAgICAgICAgIERvbid0IGZhbGwgYmFjayB0byBkZWZhdWx0IHNlc3Npb24gaWYg
c2Vzc2lvbiBjYW4ndCBiZSBmb3VuZCBmb3IgY29va2llIG9wZXJhdGlvbnMKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291cmNlL1dlYktp
dC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKaW5kZXggOGJjNDhiZGZjMjdkNmZhNjNkN2Mz
MGFlM2QyZGMzMzZlNDdjOGQxMi4uNjE4MDA4YzBhODVjYmYyNDEyM2M4MTYyYmNiODBkMTY3ZWQx
M2JiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJ
LmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKQEAgLTY5
LDcgKzY5LDYgQEAKICNpbXBvcnQgPFVJS2l0L1VJVmlld0NvbnRyb2xsZXJfVmlld1NlcnZpY2Uu
aD4KICNpbXBvcnQgPFVJS2l0L1VJVmlld19Qcml2YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSVZp
c3VhbEVmZmVjdF9Qcml2YXRlLmg+Ci0jaW1wb3J0IDxVSUtpdC9VSVdLU2VsZWN0aW9uQXNzaXN0
YW50Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVdLVGV4dEludGVyYWN0aW9uQXNzaXN0YW50Lmg+CiAj
aW1wb3J0IDxVSUtpdC9VSVdlYkJyb3dzZXJWaWV3Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVdlYkRv
Y3VtZW50Vmlldy5oPgpAQCAtNTkxLDE0ICs1OTAsNiBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRl
Z2VyLCBVSVdLR2VzdHVyZVR5cGUpIHsKIEBpbnRlcmZhY2UgVUlXZWJTZWxlY3Rpb25Bc3Npc3Rh
bnQgOiBOU09iamVjdAogQGVuZAogCi1AaW50ZXJmYWNlIFVJV0tTZWxlY3Rpb25Bc3Npc3RhbnQg
OiBVSVdlYlNlbGVjdGlvbkFzc2lzdGFudAotQGVuZAotCi1AaW50ZXJmYWNlIFVJV0tTZWxlY3Rp
b25Bc3Npc3RhbnQgKCkKLS0gKGlkKWluaXRXaXRoVmlldzooVUlWaWV3ICopdmlldzsKLS0gKHZv
aWQpc2hvd1NoYXJlU2hlZXRGb3I6KE5TU3RyaW5nICopc2VsZWN0ZWRUZXJtIGZyb21SZWN0OihD
R1JlY3QpcHJlc2VudGF0aW9uUmVjdDsKLUBlbmQKLQogQGludGVyZmFjZSBVSVdLQXV0b2NvcnJl
Y3Rpb25SZWN0cyA6IE5TT2JqZWN0CiBAZW5kCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL2lvcy9XS1BERlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X
S1BERlZpZXcuaAppbmRleCBlODA0NGU1NGNlNWQzMzBiOTI0ZDcxOWUyOGFjNzBkNWNjMDNmMzU5
Li5kMGM1YjUzOTg5ZjAzOGNlMDk5MjFiMjIzNjVmNjg3OGU0ZWYwZGE1IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3LmgKKysrIGIvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5oCkBAIC0yNiw5ICsyNiwxMCBAQAogI2lmIEVOQUJM
RShXS1BERlZJRVcpCiAKICNpbXBvcnQgIldLQXBwbGljYXRpb25TdGF0ZVRyYWNraW5nVmlldy5o
IgorI2ltcG9ydCAiV0tTaGFyZVNoZWV0LmgiCiAjaW1wb3J0ICJXS1dlYlZpZXdDb250ZW50UHJv
dmlkZXIuaCIKIAotQGludGVyZmFjZSBXS1BERlZpZXcgOiBXS0FwcGxpY2F0aW9uU3RhdGVUcmFj
a2luZ1ZpZXcgPFdLV2ViVmlld0NvbnRlbnRQcm92aWRlcj4KK0BpbnRlcmZhY2UgV0tQREZWaWV3
IDogV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3IDxXS1NoYXJlU2hlZXREZWxlZ2F0ZSwg
V0tXZWJWaWV3Q29udGVudFByb3ZpZGVyPgogCiBAZW5kCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9pb3MvV0tQREZWaWV3Lm1tCmluZGV4IDAyNTcwMWRhNjVmNTEzZDY0ZGExOThkZjA1YjBlNGU0
YmEyZjc1NjcuLjhjY2M2Mjc4MzBjYWM1NzA5ODliMzg3NTg4MDI4MzQwMDEwZTQ1M2IgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KKysrIGIvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQpAQCAtNDEsNiArNDEsNyBAQAog
I2ltcG9ydCAiX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50ZXJuYWwuaCIKICNpbXBvcnQgPE1v
YmlsZUNvcmVTZXJ2aWNlcy9Nb2JpbGVDb3JlU2VydmljZXMuaD4KICNpbXBvcnQgPFdlYkNvcmUv
RGF0YURldGVjdGlvbi5oPgorI2ltcG9ydCA8V2ViQ29yZS9TaGFyZURhdGEuaD4KICNpbXBvcnQg
PHd0Zi9CbG9ja1B0ci5oPgogI2ltcG9ydCA8d3RmL01haW5UaHJlYWQuaD4KICNpbXBvcnQgPHd0
Zi9SZXRhaW5QdHIuaD4KQEAgLTcwLDEwICs3MSwxNiBAQCBAaW1wbGVtZW50YXRpb24gV0tQREZW
aWV3IHsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF9zdWdnZXN0ZWRGaWxlbmFtZTsKICAgICBX
ZWFrT2JqQ1B0cjxXS1dlYlZpZXc+IF93ZWJWaWV3OwogICAgIFJldGFpblB0cjxXS0tleWJvYXJk
U2Nyb2xsVmlld0FuaW1hdG9yPiBfa2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvcjsKKyAgICBSZXRh
aW5QdHI8V0tTaGFyZVNoZWV0PiBfc2hhcmVTaGVldDsKIH0KIAogLSAodm9pZClkZWFsbG9jCiB7
CisgICAgaWYgKF9zaGFyZVNoZWV0KSB7CisgICAgICAgIFtfc2hhcmVTaGVldCBzZXREZWxlZ2F0
ZTpuaWxdOworICAgICAgICBbX3NoYXJlU2hlZXQgZGlzbWlzc107CisgICAgICAgIF9zaGFyZVNo
ZWV0ID0gbmlsOworICAgIH0KICAgICBbX2FjdGlvblNoZWV0QXNzaXN0YW50IGNsZWFudXBTaGVl
dF07CiAgICAgW1tfaG9zdFZpZXdDb250cm9sbGVyIHZpZXddIHJlbW92ZUZyb21TdXBlcnZpZXdd
OwogICAgIFtfcGFnZU51bWJlckluZGljYXRvciByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKQEAgLTU0
Myw5ICs1NTAsMjYgQEAgLSAodm9pZClhY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVl
dEFzc2lzdGFudCAqKWFzc2lzdGFudCBvcGVuRWxlbWVudEF0TG8KIAogLSAodm9pZClhY3Rpb25T
aGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudCBzaGFyZUVs
ZW1lbnRXaXRoVVJMOihOU1VSTCAqKXVybCByZWN0OihDR1JlY3QpYm91bmRpbmdSZWN0CiB7Ci0g
ICAgLy8gRklYTUU6IFdlIHNob3VsZCB1c2UgV0tTaGFyZVNoZWV0IGluc3RlYWQgb2YgVUlXS1Nl
bGVjdGlvbkFzc2lzdGFudCBmb3IgdGhpcy4KLSAgICBhdXRvIHNlbGVjdGlvbkFzc2lzdGFudCA9
IGFkb3B0TlMoW1tVSVdLU2VsZWN0aW9uQXNzaXN0YW50IGFsbG9jXSBpbml0V2l0aFZpZXc6W19o
b3N0Vmlld0NvbnRyb2xsZXIgdmlld11dKTsKLSAgICBbc2VsZWN0aW9uQXNzaXN0YW50IHNob3dT
aGFyZVNoZWV0Rm9yOldURjo6dXNlclZpc2libGVTdHJpbmcodXJsKSBmcm9tUmVjdDpib3VuZGlu
Z1JlY3RdOworICAgIFdLV2ViVmlldyAqd2ViVmlldyA9IF93ZWJWaWV3LmdldEF1dG9yZWxlYXNl
ZCgpOworICAgIGlmICghd2ViVmlldykKKyAgICAgICAgcmV0dXJuOworCisgICAgV2ViQ29yZTo6
U2hhcmVEYXRhV2l0aFBhcnNlZFVSTCBzaGFyZURhdGE7CisgICAgc2hhcmVEYXRhLnVybCA9IHsg
dXJsIH07CisgICAgCisgICAgW19zaGFyZVNoZWV0IGRpc21pc3NdOworCisgICAgX3NoYXJlU2hl
ZXQgPSBhZG9wdE5TKFtbV0tTaGFyZVNoZWV0IGFsbG9jXSBpbml0V2l0aFZpZXc6d2ViVmlld10p
OworICAgIFtfc2hhcmVTaGVldCBzZXREZWxlZ2F0ZTpzZWxmXTsKKyAgICBbX3NoYXJlU2hlZXQg
cHJlc2VudFdpdGhQYXJhbWV0ZXJzOnNoYXJlRGF0YSBpblJlY3Q6IHsgW1tfaG9zdFZpZXdDb250
cm9sbGVyIHZpZXddIGNvbnZlcnRSZWN0OmJvdW5kaW5nUmVjdCB0b1ZpZXc6d2ViVmlld10gfSBj
b21wbGV0aW9uSGFuZGxlcjpbXSAoYm9vbCBzdWNjZXNzKSB7IH1dOworfQorCistICh2b2lkKXNo
YXJlU2hlZXREaWREaXNtaXNzOihXS1NoYXJlU2hlZXQgKilzaGFyZVNoZWV0Cit7CisgICAgQVNT
RVJUKF9zaGFyZVNoZWV0ID09IHNoYXJlU2hlZXQpOworICAgIAorICAgIFtfc2hhcmVTaGVldCBz
ZXREZWxlZ2F0ZTpuaWxdOworICAgIF9zaGFyZVNoZWV0ID0gbmlsOwogfQogCiAjaWYgSEFWRShB
UFBfTElOS1MpCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>