<?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>197160</bug_id>
          
          <creation_ts>2019-04-22 09:03:08 -0700</creation_ts>
          <short_desc>Delayed WebProcessLaunch may break the _relatedWebView SPI</short_desc>
          <delta_ts>2019-04-29 16:51:54 -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>
          
          
          <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>
          <dependson>197393</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>beidson</cc>
    
    <cc>commit-queue</cc>
    
    <cc>ggaren</cc>
    
    <cc>ryanhaddad</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1529255</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-04-22 09:03:08 -0700</bug_when>
    <thetext>Delayed WebProcessLaunch may break the _relatedWebView SPI. The breakage would happen if the client would relate a WebView to another which has not launched its initial process yet.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529261</commentid>
    <comment_count>1</comment_count>
      <attachid>367943</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-04-22 09:12:19 -0700</bug_when>
    <thetext>Created attachment 367943
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529304</commentid>
    <comment_count>2</comment_count>
      <attachid>367943</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-04-22 11:03:53 -0700</bug_when>
    <thetext>Comment on attachment 367943
Patch

Clearing flags on attachment: 367943

Committed r244502: &lt;https://trac.webkit.org/changeset/244502&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529305</commentid>
    <comment_count>3</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-04-22 11:03:54 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529306</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2019-04-22 11:04:25 -0700</bug_when>
    <thetext>&lt;rdar://problem/50099648&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529375</commentid>
    <comment_count>5</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2019-04-22 14:04:40 -0700</bug_when>
    <thetext>This change caused layout test and API test crashes:

Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0   com.apple.WebKit              	0x000000010e41de34 WebKit::WebPageProxy::creationParameters(WebKit::WebProcessProxy&amp;, WebKit::DrawingAreaProxy&amp;) + 416 (WebPageProxy.cpp:7026)
1   com.apple.WebKit              	0x000000010e44f205 WTF::Function&lt;void (WTF::RefPtr&lt;WebKit::WebPageProxy, WTF::DumbPtrTraits&lt;WebKit::WebPageProxy&gt; &gt;&amp;&amp;)&gt;::CallableWrapper&lt;WebKit::WebPageProxy::createNewPage(WebKit::FrameInfoData const&amp;, unsigned long long, WebCore::ResourceRequest&amp;&amp;, WebCore::WindowFeatures&amp;&amp;, WebKit::NavigationActionData&amp;&amp;, WTF::CompletionHandler&lt;void (unsigned long long, WTF::Optional&lt;WebKit::WebPageCreationParameters&gt; const&amp;)&gt;&amp;&amp;)::$_3&gt;::call(WTF::RefPtr&lt;WebKit::WebPageProxy, WTF::DumbPtrTraits&lt;WebKit::WebPageProxy&gt; &gt;&amp;&amp;) + 97 (Function.h:102)
2   com.apple.WebKit              	0x000000010e4a2fa7 WKPageSetPageUIClient::UIClient::createNewPage(WebKit::WebPageProxy&amp;, WebCore::WindowFeatures&amp;&amp;, WTF::Ref&lt;API::NavigationAction, WTF::DumbPtrTraits&lt;API::NavigationAction&gt; &gt;&amp;&amp;, WTF::CompletionHandler&lt;void (WTF::RefPtr&lt;WebKit::WebPageProxy, WTF::DumbPtrTraits&lt;WebKit::WebPageProxy&gt; &gt;&amp;&amp;)&gt;&amp;&amp;) + 225 (WKPage.cpp:1486)
3   com.apple.WebKit              	0x000000010e43228c WebKit::WebPageProxy::createNewPage(WebKit::FrameInfoData const&amp;, unsigned long long, WebCore::ResourceRequest&amp;&amp;, WebCore::WindowFeatures&amp;&amp;, WebKit::NavigationActionData&amp;&amp;, WTF::CompletionHandler&lt;void (unsigned long long, WTF::Optional&lt;WebKit::WebPageCreationParameters&gt; const&amp;)&gt;&amp;&amp;) + 1678 (WebPageProxy.cpp:5013)
4   com.apple.WebKit              	0x000000010e67a2f7 WebKit::WebPageProxy::didReceiveSyncMessage(IPC::Connection&amp;, IPC::Decoder&amp;, std::__1::unique_ptr&lt;IPC::Encoder, std::__1::default_delete&lt;IPC::Encoder&gt; &gt;&amp;) + 3007 (HandleMessage.h:149)

https://build.webkit.org/builders/Apple%20Mojave%20Release%20WK2%20%28Tests%29/builds/3754</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529377</commentid>
    <comment_count>6</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-04-22 14:08:16 -0700</bug_when>
    <thetext>Reverted r244502 for reason:

Caused crashes on the bots

Committed r244510: &lt;https://trac.webkit.org/changeset/244510&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529389</commentid>
    <comment_count>7</comment_count>
      <attachid>367976</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-04-22 14:30:34 -0700</bug_when>
    <thetext>Created attachment 367976
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529390</commentid>
    <comment_count>8</comment_count>
      <attachid>367977</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-04-22 14:31:29 -0700</bug_when>
    <thetext>Created attachment 367977
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529393</commentid>
    <comment_count>9</comment_count>
      <attachid>367977</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-04-22 14:33:55 -0700</bug_when>
    <thetext>Comment on attachment 367977
Patch

Rejecting attachment 367977 from commit-queue.

Failed to run &quot;[&apos;/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch&apos;, &apos;--status-host=webkit-queues.webkit.org&apos;, &apos;--bot-id=webkit-cq-02&apos;, &apos;validate-changelog&apos;, &apos;--check-oops&apos;, &apos;--non-interactive&apos;, 367977, &apos;--port=mac&apos;]&quot; exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

ChangeLog entry in Source/WebKit/ChangeLog contains OOPS!.

Full output: https://webkit-queues.webkit.org/results/11965057</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529397</commentid>
    <comment_count>10</comment_count>
      <attachid>367980</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-04-22 14:35:38 -0700</bug_when>
    <thetext>Created attachment 367980
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529432</commentid>
    <comment_count>11</comment_count>
      <attachid>367980</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-04-22 15:17:28 -0700</bug_when>
    <thetext>Comment on attachment 367980
Patch

Clearing flags on attachment: 367980

Committed r244516: &lt;https://trac.webkit.org/changeset/244516&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1529433</commentid>
    <comment_count>12</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-04-22 15:17:30 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>367943</attachid>
            <date>2019-04-22 09:12:19 -0700</date>
            <delta_ts>2019-04-22 14:30:33 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-197160-20190422091218.patch</filename>
            <type>text/plain</type>
            <size>9499</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NDk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEzMDlmNzdhNzhiNTRiMWM2
MWM4NjljOTI0M2YzYmNhZjBlNTAwMmEuLjJiZWRiNmYzZmI5NWZiYzRkODk5ODE1ZjIyYTEyOWU2
MGQwOTI0N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDQtMjIgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZWxheWVkIFdlYlByb2Nlc3NMYXVu
Y2ggbWF5IGJyZWFrIHRoZSBfcmVsYXRlZFdlYlZpZXcgU1BJCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcxNjAKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWxheWVkIFdlYlByb2Nlc3NMYXVuY2ggbWF5
IGJyZWFrIHRoZSBfcmVsYXRlZFdlYlZpZXcgU1BJLiBUaGUgYnJlYWthZ2Ugd291bGQgaGFwcGVu
IGlmIHRoZSBjbGllbnQKKyAgICAgICAgd291bGQgcmVsYXRlIGEgV2ViVmlldyB0byBhbm90aGVy
IHdoaWNoIGhhcyBub3QgbGF1bmNoZWQgaXRzIGluaXRpYWwgcHJvY2VzcyB5ZXQuCisKKyAgICAg
ICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHdoZW4gd2UgbmVlZCBhIHJ1bm5pbmcgcHJvY2VzcyBm
b3IgYSBXZWJWaWV3IHdoaWNoIGhhcyBhIHJlbGF0ZWQgdmlldywgd2UgbmVlZAorICAgICAgICB0
byBtYWtlIHN1cmUgdGhlIHJlbGF0ZWQgdmlldyBoYXMgYSBydW5uaW5nIHByb2Nlc3MgYW5kIHVz
ZSB0aGF0IHByb2Nlc3MuIFByZXZpb3VzbHksIHdlIHdvdWxkIHNoYXJlCisgICAgICAgIHRoZSAi
ZHVtbXkiIHByb2Nlc3MgaW5zdGVhZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJv
eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxhdW5jaFByb2Nlc3MpOgor
ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmVuc3VyZVJ1bm5pbmdQcm9jZXNzKToKKyAg
ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dl
YlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmNyZWF0
ZVdlYlBhZ2UpOgorCiAyMDE5LTA0LTIxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw
bGUuY29tPgogCiAgICAgICAgIERlZmVyIEVkaXRvclN0YXRlIHVwZGF0ZXMgdW50aWwgdGhlIG5l
eHQgbGF5ZXIgdHJlZSBmbHVzaCBpbiBhIGZldyBhZGRpdGlvbmFsIGNpcmN1bXN0YW5jZXMKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGI2N2RjMjIyODE2NzFj
ZWJkNWQwMDBjMjA0ZDU1MDY3MzczZjNiNzcuLmJkNjU0MzRiMjE2N2QxYzA4NDY2MjY3YWY4MDdl
ZTA1NDg4ZjI4YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ
cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApA
QCAtNzI3LDcgKzcyNywxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bGF1bmNoUHJvY2Vzcyhjb25z
dCBSZWdpc3RyYWJsZURvbWFpbiYgcmVnaXN0cmFibGVEb21haW4pCiAgICAgbV9wcm9jZXNzLT5y
ZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2Vp
dmVyTmFtZSgpLCBtX3BhZ2VJRCk7CiAKICAgICBhdXRvJiBwcm9jZXNzUG9vbCA9IG1fcHJvY2Vz
cy0+cHJvY2Vzc1Bvb2woKTsKLSAgICBtX3Byb2Nlc3MgPSBwcm9jZXNzUG9vbC5wcm9jZXNzRm9y
UmVnaXN0cmFibGVEb21haW4obV93ZWJzaXRlRGF0YVN0b3JlLmdldCgpLCB0aGlzLCByZWdpc3Ry
YWJsZURvbWFpbik7CisKKyAgICBpZiAoYXV0byogcmVsYXRlZFBhZ2UgPSBtX2NvbmZpZ3VyYXRp
b24tPnJlbGF0ZWRQYWdlKCkpCisgICAgICAgIG1fcHJvY2VzcyA9IHJlbGF0ZWRQYWdlLT5lbnN1
cmVSdW5uaW5nUHJvY2VzcygpOworICAgIGVsc2UKKyAgICAgICAgbV9wcm9jZXNzID0gcHJvY2Vz
c1Bvb2wucHJvY2Vzc0ZvclJlZ2lzdHJhYmxlRG9tYWluKG1fd2Vic2l0ZURhdGFTdG9yZS5nZXQo
KSwgdGhpcywgcmVnaXN0cmFibGVEb21haW4pOwogICAgIG1faGFzUnVubmluZ1Byb2Nlc3MgPSB0
cnVlOwogCiAgICAgbV9wcm9jZXNzLT5hZGRFeGlzdGluZ1dlYlBhZ2UoKnRoaXMsIFdlYlByb2Nl
c3NQcm94eTo6QmVnaW5zVXNpbmdEYXRhU3RvcmU6Olllcyk7CkBAIC0xMDcyLDYgKzEwNzYsMTQg
QEAgdm9pZCBXZWJQYWdlUHJveHk6OmFkZFBsYXRmb3JtTG9hZFBhcmFtZXRlcnMoTG9hZFBhcmFt
ZXRlcnMmKQogfQogI2VuZGlmCiAKK1dlYlByb2Nlc3NQcm94eSYgV2ViUGFnZVByb3h5OjplbnN1
cmVSdW5uaW5nUHJvY2VzcygpCit7CisgICAgaWYgKCFoYXNSdW5uaW5nUHJvY2VzcygpKQorICAg
ICAgICBsYXVuY2hQcm9jZXNzKHsgfSk7CisKKyAgICByZXR1cm4gbV9wcm9jZXNzOworfQorCiBS
ZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0KFJlc291cmNl
UmVxdWVzdCYmIHJlcXVlc3QsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3Bl
bkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGlmICht
X2lzQ2xvc2VkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy
b3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAzNTdk
YzFiNWIyOTA1NmViMDFkN2UxYjE2YTY5OTViZTJjOTBhYmJlLi4zYmM2YTM3MWU5NWM4ZWRlNjg5
NWIwYTllMmQwZWExZGM1ZjU2MTU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv
eHkuaApAQCAtMTA4Myw2ICsxMDgzLDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNWYWxpZEtleXBy
ZXNzQ29tbWFuZE5hbWUoY29uc3QgU3RyaW5nJiBuYW1lKSBjb25zdCB7IHJldHVybiBtX2tub3du
S2V5cHJlc3NDb21tYW5kTmFtZXMuY29udGFpbnMobmFtZSk7IH0KICNlbmRpZgogCisgICAgV2Vi
UHJvY2Vzc1Byb3h5JiBlbnN1cmVSdW5uaW5nUHJvY2VzcygpOwogICAgIFdlYlByb2Nlc3NQcm94
eSYgcHJvY2VzcygpIHsgcmV0dXJuIG1fcHJvY2VzczsgfQogICAgIFByb2Nlc3NJRCBwcm9jZXNz
SWRlbnRpZmllcigpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz
UG9vbC5jcHAKaW5kZXggN2NiMWJiNDBhYTg2NDg3OTIwZjljNGQxNTM1MzRjMDI2ZTQ3ZDQ4OS4u
ODlmODNjMmZkYjg0OWZjYTI4NjM3MTZkZDc4NjJmNjBkNDE0MDk1ZiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtMTIxMCwxMyArMTIxMCwxOCBAQCBS
ZWY8V2ViUGFnZVByb3h5PiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50
JiBwYWdlQ2xpZW50LCBSZWY8QVBJOgogICAgIH0KIAogICAgIFJlZlB0cjxXZWJQcm9jZXNzUHJv
eHk+IHByb2Nlc3M7Ci0gICAgaWYgKHBhZ2VDb25maWd1cmF0aW9uLT5yZWxhdGVkUGFnZSgpKSB7
Ci0gICAgICAgIC8vIFNoYXJpbmcgcHJvY2Vzc2VzLCBlLmcuIHdoZW4gY3JlYXRpbmcgdGhlIHBh
Z2UgdmlhIHdpbmRvdy5vcGVuKCkuCi0gICAgICAgIHByb2Nlc3MgPSAmcGFnZUNvbmZpZ3VyYXRp
b24tPnJlbGF0ZWRQYWdlKCktPnByb2Nlc3MoKTsKLSAgICAgICAgLy8gV2UgZG8gbm90IHN1cHBv
cnQgc2V2ZXJhbCBXZWJzaXRlRGF0YVN0b3JlcyBzaGFyaW5nIGEgc2luZ2xlIHByb2Nlc3MuCi0g
ICAgICAgIEFTU0VSVChwcm9jZXNzLmdldCgpID09IG1fZHVtbXlQcm9jZXNzUHJveHkgfHwgJnBh
Z2VDb25maWd1cmF0aW9uLT53ZWJzaXRlRGF0YVN0b3JlKCktPndlYnNpdGVEYXRhU3RvcmUoKSA9
PSAmcHJvY2Vzcy0+d2Vic2l0ZURhdGFTdG9yZSgpKTsKLSAgICAgICAgQVNTRVJUKCZwYWdlQ29u
ZmlndXJhdGlvbi0+cmVsYXRlZFBhZ2UoKS0+d2Vic2l0ZURhdGFTdG9yZSgpID09ICZwYWdlQ29u
ZmlndXJhdGlvbi0+d2Vic2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkpOwotICAg
IH0gZWxzZSBpZiAoIW1faXNEZWxheWVkV2ViUHJvY2Vzc0xhdW5jaERpc2FibGVkKSB7CisKKyAg
ICBpZiAobV9pc0RlbGF5ZWRXZWJQcm9jZXNzTGF1bmNoRGlzYWJsZWQpIHsKKyAgICAgICAgaWYg
KHBhZ2VDb25maWd1cmF0aW9uLT5yZWxhdGVkUGFnZSgpKSB7CisgICAgICAgICAgICAvLyBTaGFy
aW5nIHByb2Nlc3NlcywgZS5nLiB3aGVuIGNyZWF0aW5nIHRoZSBwYWdlIHZpYSB3aW5kb3cub3Bl
bigpLgorICAgICAgICAgICAgLy8gTWFrZSBzdXJlIHRoZSByZWxhdGVkIHBhZ2UncyBwcm9jZXNz
IGlzIG5vdCB0aGUgZHVtbXkgb25lLgorICAgICAgICAgICAgcHJvY2VzcyA9ICZwYWdlQ29uZmln
dXJhdGlvbi0+cmVsYXRlZFBhZ2UoKS0+ZW5zdXJlUnVubmluZ1Byb2Nlc3MoKTsKKyAgICAgICAg
ICAgIC8vIFdlIGRvIG5vdCBzdXBwb3J0IHNldmVyYWwgV2Vic2l0ZURhdGFTdG9yZXMgc2hhcmlu
ZyBhIHNpbmdsZSBwcm9jZXNzLgorICAgICAgICAgICAgQVNTRVJUKHByb2Nlc3MuZ2V0KCkgPT0g
bV9kdW1teVByb2Nlc3NQcm94eSB8fCAmcGFnZUNvbmZpZ3VyYXRpb24tPndlYnNpdGVEYXRhU3Rv
cmUoKS0+d2Vic2l0ZURhdGFTdG9yZSgpID09ICZwcm9jZXNzLT53ZWJzaXRlRGF0YVN0b3JlKCkp
OworICAgICAgICAgICAgQVNTRVJUKCZwYWdlQ29uZmlndXJhdGlvbi0+cmVsYXRlZFBhZ2UoKS0+
d2Vic2l0ZURhdGFTdG9yZSgpID09ICZwYWdlQ29uZmlndXJhdGlvbi0+d2Vic2l0ZURhdGFTdG9y
ZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIHBy
b2Nlc3MgPSAmcHJvY2Vzc0ZvclJlZ2lzdHJhYmxlRG9tYWluKHBhZ2VDb25maWd1cmF0aW9uLT53
ZWJzaXRlRGF0YVN0b3JlKCktPndlYnNpdGVEYXRhU3RvcmUoKSwgbnVsbHB0ciwgeyB9KTsKKyAg
ICB9IGVsc2UgewogICAgICAgICAvLyBJbiB0aGUgY29tbW9uIGNhc2UsIHdlIGRlbGF5IHByb2Nl
c3MgbGF1bmNoIHVudGlsIHNvbWV0aGluZyBpcyBhY3R1YWxseSBsb2FkZWQgaW4gdGhlIHBhZ2Uu
CiAgICAgICAgIGlmICghbV9kdW1teVByb2Nlc3NQcm94eSkgewogICAgICAgICAgICAgYXV0byBk
dW1teVByb2Nlc3NQcm94eSA9IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRlKCp0aGlzLCBudWxscHRy
LCBXZWJQcm9jZXNzUHJveHk6OklzUHJld2FybWVkOjpObywgV2ViUHJvY2Vzc1Byb3h5OjpTaG91
bGRMYXVuY2hQcm9jZXNzOjpObyk7CkBAIC0xMjI0LDggKzEyMjksNyBAQCBSZWY8V2ViUGFnZVBy
b3h5PiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50
LCBSZWY8QVBJOgogICAgICAgICAgICAgbV9wcm9jZXNzZXMuYXBwZW5kKFdURk1vdmUoZHVtbXlQ
cm9jZXNzUHJveHkpKTsKICAgICAgICAgfQogICAgICAgICBwcm9jZXNzID0gbV9kdW1teVByb2Nl
c3NQcm94eTsKLSAgICB9IGVsc2UKLSAgICAgICAgcHJvY2VzcyA9ICZwcm9jZXNzRm9yUmVnaXN0
cmFibGVEb21haW4ocGFnZUNvbmZpZ3VyYXRpb24tPndlYnNpdGVEYXRhU3RvcmUoKS0+d2Vic2l0
ZURhdGFTdG9yZSgpLCBudWxscHRyLCB7IH0pOworICAgIH0KIAogICAgIEFTU0VSVChwcm9jZXNz
KTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4
IGEwZGU3ZTlmMmNjNDU0ZmJjYjZjZGMwZDcyN2MwNDRmYzIyZGNkY2MuLjJmMWI5MGMyYWJhMTk4
MjE1MThlNTgyYzZjMWY4YTM0YjE3ZmNmYWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor
KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOS0wNC0yMiAgQ2hyaXMg
RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIERlbGF5ZWQgV2ViUHJvY2Vzc0xh
dW5jaCBtYXkgYnJlYWsgdGhlIF9yZWxhdGVkV2ViVmlldyBTUEkKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzE2MAorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBjb3ZlcmFnZS4KKwor
ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5h
dmlnYXRpb24ubW06CisKIDIwMTktMDQtMjIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp
YUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI0MTI4OSk6IFtHVEtdIGFjY2Vz
c2liaWxpdHkvcmVtb3ZlZC1jb250aW51YXRpb24tZWxlbWVudC1jYXVzZXMtY3Jhc2guaHRtbCBh
bmQgYWNjZXNzaWJpbGl0eS9yZW1vdmVkLWFub255bW91cy1ibG9jay1jaGlsZC1jYXVzZXMtY3Jh
c2guaHRtbCBjcmFzaGVzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl
YktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ
SS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQppbmRleCBmYzRm
YTZhMWRjNTQ3M2Q5NDk0NTViZDk1MTZmZWIxZTMyOTExYjVkLi42NDEzMjA5ODI0Zjg0YzZkOWU2
N2MyNGMxMDMyNmQ4ZWE5NGRhMzVjIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl
c3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rl
c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0K
QEAgLTQ1OTgsNiArNDU5OCw0NiBAQCBURVNUKFByb2Nlc3NTd2FwLCBOb1Byb2Nlc3NTd2FwRHVl
VG9SZWxhdGVkVmlldykKICAgICBydW5Qcm9jZXNzU3dhcER1ZVRvUmVsYXRlZFdlYlZpZXdUZXN0
KFtOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwi
XSwgW05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbjIuaHRt
bCJdLCBFeHBlY3RTd2FwOjpObyk7CiB9CiAKK1RFU1QoUHJvY2Vzc1N3YXAsIFJlbGF0ZWRXZWJW
aWV3QmVmb3JlV2ViUHJvY2Vzc0xhdW5jaCkKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmln
dXJhdGlvbiA9IHBzb25Qcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24oKTsKKyAgICBhdXRvIHByb2Nl
c3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3Vy
YXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZp
ZXcxQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9j
XSBpbml0XSk7CisgICAgW3dlYlZpZXcxQ29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9j
ZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUg
YWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldzFDb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhh
bmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJQU09OIl07CisKKyAgICBhdXRvIHdl
YlZpZXcxID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VS
ZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXcxQ29uZmlndXJhdGlvbi5n
ZXQoKV0pOworICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxl
Z2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3MSBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6
ZGVsZWdhdGUuZ2V0KCldOworCisgICAgYXV0byB3ZWJWaWV3MkNvbmZpZ3VyYXRpb24gPSBhZG9w
dE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3
MkNvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIFt3
ZWJWaWV3MkNvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZv
clVSTFNjaGVtZTpAIlBTT04iXTsKKyAgICB3ZWJWaWV3MkNvbmZpZ3VyYXRpb24uZ2V0KCkuX3Jl
bGF0ZWRXZWJWaWV3ID0gd2ViVmlldzEuZ2V0KCk7IC8vIHdlYlZpZXcyIHdpbGwgYmUgcmVsYXRl
ZCB0byB3ZWJWaWV3MSBhbmQgd2ViVmlldzEncyBVUkwgd2lsbCBiZSB1c2VkIGZvciBwcm9jZXNz
IHN3YXAgZGVjaXNpb24uCisgICAgYXV0byB3ZWJWaWV3MiA9IGFkb3B0TlMoW1tXS1dlYlZpZXcg
YWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJh
dGlvbjp3ZWJWaWV3MkNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBbd2ViVmlldzIgc2V0TmF2
aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKKworICAgIE5TVVJMUmVxdWVzdCAqcmVx
dWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6
QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbjEuaHRtbCJdXTsKKyAgICBbd2ViVmlldzEgbG9h
ZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUp
OworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1dG8gcGlkMSA9IFt3ZWJWaWV3MSBfd2ViUHJv
Y2Vzc0lkZW50aWZpZXJdOworCisgICAgcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdp
dGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbjIu
aHRtbCJdXTsKKyAgICBbd2ViVmlldzIgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0
V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1
dG8gcGlkMiA9IFt3ZWJWaWV3MiBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgRVhQRUNU
X0VRKHBpZDEsIHBpZDIpOyAvLyBXZWJWaWV3cyBhcmUgcmVsYXRlZCBzbyB0aGV5IHNob3VsZCBz
aGFyZSB0aGUgc2FtZSBwcm9jZXNzLgorfQorCiBURVNUKFByb2Nlc3NTd2FwLCBUZXJtaW5hdGVk
U3VzcGVuZGVkUGFnZVByb2Nlc3MpCiB7CiAgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRp
b24gPSBwc29uUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKCk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>367976</attachid>
            <date>2019-04-22 14:30:34 -0700</date>
            <delta_ts>2019-04-22 14:31:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-197160-20190422143034.patch</filename>
            <type>text/plain</type>
            <size>7767</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFhOTEzMGRmNjk1MGU3MzI4
NDc1ODlmOTVmMmIxZDNlODg3YTM5MzcuLjVjOGFhMzUzMGU0NDM2YzZjN2IxYmViYWEwYzc2MmZi
ZTg0ZGM1YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDQtMjIgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZWxheWVkIFdlYlByb2Nlc3NMYXVu
Y2ggbWF5IGJyZWFrIHRoZSBfcmVsYXRlZFdlYlZpZXcgU1BJCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcxNjAKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWxheWVkIFdlYlByb2Nlc3NMYXVuY2ggbWF5
IGJyZWFrIHRoZSBfcmVsYXRlZFdlYlZpZXcgU1BJLiBUaGUgYnJlYWthZ2Ugd291bGQgaGFwcGVu
IGlmIHRoZSBjbGllbnQKKyAgICAgICAgd291bGQgcmVsYXRlIGEgV2ViVmlldyB0byBhbm90aGVy
IHdoaWNoIGhhcyBub3QgbGF1bmNoZWQgaXRzIGluaXRpYWwgcHJvY2VzcyB5ZXQuCisKKyAgICAg
ICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHdoZW4gd2UgbmVlZCBhIHJ1bm5pbmcgcHJvY2VzcyBm
b3IgYSBXZWJWaWV3IHdoaWNoIGhhcyBhIHJlbGF0ZWQgdmlldywgd2UgbmVlZAorICAgICAgICB0
byBtYWtlIHN1cmUgdGhlIHJlbGF0ZWQgdmlldyBoYXMgYSBydW5uaW5nIHByb2Nlc3MgYW5kIHVz
ZSB0aGF0IHByb2Nlc3MuIFByZXZpb3VzbHksIHdlIHdvdWxkIHNoYXJlCisgICAgICAgIHRoZSAi
ZHVtbXkiIHByb2Nlc3MgaW5zdGVhZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJv
eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxhdW5jaFByb2Nlc3MpOgor
ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmVuc3VyZVJ1bm5pbmdQcm9jZXNzKToKKyAg
ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dl
YlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmNyZWF0
ZVdlYlBhZ2UpOgorCiAyMDE5LTA0LTIyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+
CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI0NDUwMi4KZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGI2N2RjMjIyODE2NzFjZWJkNWQwMDBj
MjA0ZDU1MDY3MzczZjNiNzcuLmJkNjU0MzRiMjE2N2QxYzA4NDY2MjY3YWY4MDdlZTA1NDg4ZjI4
YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK
KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzI3LDcg
KzcyNywxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bGF1bmNoUHJvY2Vzcyhjb25zdCBSZWdpc3Ry
YWJsZURvbWFpbiYgcmVnaXN0cmFibGVEb21haW4pCiAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNz
YWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgp
LCBtX3BhZ2VJRCk7CiAKICAgICBhdXRvJiBwcm9jZXNzUG9vbCA9IG1fcHJvY2Vzcy0+cHJvY2Vz
c1Bvb2woKTsKLSAgICBtX3Byb2Nlc3MgPSBwcm9jZXNzUG9vbC5wcm9jZXNzRm9yUmVnaXN0cmFi
bGVEb21haW4obV93ZWJzaXRlRGF0YVN0b3JlLmdldCgpLCB0aGlzLCByZWdpc3RyYWJsZURvbWFp
bik7CisKKyAgICBpZiAoYXV0byogcmVsYXRlZFBhZ2UgPSBtX2NvbmZpZ3VyYXRpb24tPnJlbGF0
ZWRQYWdlKCkpCisgICAgICAgIG1fcHJvY2VzcyA9IHJlbGF0ZWRQYWdlLT5lbnN1cmVSdW5uaW5n
UHJvY2VzcygpOworICAgIGVsc2UKKyAgICAgICAgbV9wcm9jZXNzID0gcHJvY2Vzc1Bvb2wucHJv
Y2Vzc0ZvclJlZ2lzdHJhYmxlRG9tYWluKG1fd2Vic2l0ZURhdGFTdG9yZS5nZXQoKSwgdGhpcywg
cmVnaXN0cmFibGVEb21haW4pOwogICAgIG1faGFzUnVubmluZ1Byb2Nlc3MgPSB0cnVlOwogCiAg
ICAgbV9wcm9jZXNzLT5hZGRFeGlzdGluZ1dlYlBhZ2UoKnRoaXMsIFdlYlByb2Nlc3NQcm94eTo6
QmVnaW5zVXNpbmdEYXRhU3RvcmU6Olllcyk7CkBAIC0xMDcyLDYgKzEwNzYsMTQgQEAgdm9pZCBX
ZWJQYWdlUHJveHk6OmFkZFBsYXRmb3JtTG9hZFBhcmFtZXRlcnMoTG9hZFBhcmFtZXRlcnMmKQog
fQogI2VuZGlmCiAKK1dlYlByb2Nlc3NQcm94eSYgV2ViUGFnZVByb3h5OjplbnN1cmVSdW5uaW5n
UHJvY2VzcygpCit7CisgICAgaWYgKCFoYXNSdW5uaW5nUHJvY2VzcygpKQorICAgICAgICBsYXVu
Y2hQcm9jZXNzKHsgfSk7CisKKyAgICByZXR1cm4gbV9wcm9jZXNzOworfQorCiBSZWZQdHI8QVBJ
OjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYm
IHJlcXVlc3QsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFs
VVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGlmIChtX2lzQ2xvc2Vk
KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAzNTdkYzFiNWIyOTA1
NmViMDFkN2UxYjE2YTY5OTViZTJjOTBhYmJlLi4zYmM2YTM3MWU5NWM4ZWRlNjg5NWIwYTllMmQw
ZWExZGM1ZjU2MTU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl
UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAt
MTA4Myw2ICsxMDgzLDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNWYWxpZEtleXByZXNzQ29tbWFu
ZE5hbWUoY29uc3QgU3RyaW5nJiBuYW1lKSBjb25zdCB7IHJldHVybiBtX2tub3duS2V5cHJlc3ND
b21tYW5kTmFtZXMuY29udGFpbnMobmFtZSk7IH0KICNlbmRpZgogCisgICAgV2ViUHJvY2Vzc1By
b3h5JiBlbnN1cmVSdW5uaW5nUHJvY2VzcygpOwogICAgIFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vz
cygpIHsgcmV0dXJuIG1fcHJvY2VzczsgfQogICAgIFByb2Nlc3NJRCBwcm9jZXNzSWRlbnRpZmll
cigpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j
ZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAK
aW5kZXggN2NiMWJiNDBhYTg2NDg3OTIwZjljNGQxNTM1MzRjMDI2ZTQ3ZDQ4OS4uNzhiNWNiNDQ0
ZDY2MTdkNjA1OTg1YzkyNjY0Y2JiMWU2N2FmODQyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtMTIxMCw5ICsxMjEwLDEwIEBAIFJlZjxXZWJQYWdl
UHJveHk+IFdlYlByb2Nlc3NQb29sOjpjcmVhdGVXZWJQYWdlKFBhZ2VDbGllbnQmIHBhZ2VDbGll
bnQsIFJlZjxBUEk6CiAgICAgfQogCiAgICAgUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vz
czsKKwogICAgIGlmIChwYWdlQ29uZmlndXJhdGlvbi0+cmVsYXRlZFBhZ2UoKSkgewogICAgICAg
ICAvLyBTaGFyaW5nIHByb2Nlc3NlcywgZS5nLiB3aGVuIGNyZWF0aW5nIHRoZSBwYWdlIHZpYSB3
aW5kb3cub3BlbigpLgotICAgICAgICBwcm9jZXNzID0gJnBhZ2VDb25maWd1cmF0aW9uLT5yZWxh
dGVkUGFnZSgpLT5wcm9jZXNzKCk7CisgICAgICAgIHByb2Nlc3MgPSAmcGFnZUNvbmZpZ3VyYXRp
b24tPnJlbGF0ZWRQYWdlKCktPmVuc3VyZVJ1bm5pbmdQcm9jZXNzKCk7CiAgICAgICAgIC8vIFdl
IGRvIG5vdCBzdXBwb3J0IHNldmVyYWwgV2Vic2l0ZURhdGFTdG9yZXMgc2hhcmluZyBhIHNpbmds
ZSBwcm9jZXNzLgogICAgICAgICBBU1NFUlQocHJvY2Vzcy5nZXQoKSA9PSBtX2R1bW15UHJvY2Vz
c1Byb3h5IHx8ICZwYWdlQ29uZmlndXJhdGlvbi0+d2Vic2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRl
RGF0YVN0b3JlKCkgPT0gJnByb2Nlc3MtPndlYnNpdGVEYXRhU3RvcmUoKSk7CiAgICAgICAgIEFT
U0VSVCgmcGFnZUNvbmZpZ3VyYXRpb24tPnJlbGF0ZWRQYWdlKCktPndlYnNpdGVEYXRhU3RvcmUo
KSA9PSAmcGFnZUNvbmZpZ3VyYXRpb24tPndlYnNpdGVEYXRhU3RvcmUoKS0+d2Vic2l0ZURhdGFT
dG9yZSgpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp
bmRleCA1NDEyYjY3NzkxN2E4ZGMwYTJjZmE2MzlkYzU0NDg1ODQwZGJkZGRmLi5hNGRhMDdkNzNl
YTA0YjE3NjZkNDU5ZjkwMGJhYWU0NWYwZTU0ZjFiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM
b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDQtMjIgIENo
cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZWxheWVkIFdlYlByb2Nl
c3NMYXVuY2ggbWF5IGJyZWFrIHRoZSBfcmVsYXRlZFdlYlZpZXcgU1BJCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcxNjAKKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJIHRlc3QgY292ZXJhZ2Uu
CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2Fw
T25OYXZpZ2F0aW9uLm1tOgorCiAyMDE5LTA0LTIyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs
ZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI0NDUwMi4KZGlmZiAt
LWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBP
bk5hdmlnYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1By
b2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IGZjNGZhNmExZGM1NDczZDk0OTQ1NWJkOTUx
NmZlYjFlMzI5MTFiNWQuLjY0MTMyMDk4MjRmODRjNmQ5ZTY3YzI0YzEwMzI2ZDhlYTk0ZGEzNWMg
MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vz
c1N3YXBPbk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL
aXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtNDU5OCw2ICs0NTk4LDQ2IEBA
IFRFU1QoUHJvY2Vzc1N3YXAsIE5vUHJvY2Vzc1N3YXBEdWVUb1JlbGF0ZWRWaWV3KQogICAgIHJ1
blByb2Nlc3NTd2FwRHVlVG9SZWxhdGVkV2ViVmlld1Rlc3QoW05TVVJMIFVSTFdpdGhTdHJpbmc6
QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbjEuaHRtbCJdLCBbTlNVUkwgVVJMV2l0aFN0cmlu
ZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluMi5odG1sIl0sIEV4cGVjdFN3YXA6Ok5vKTsK
IH0KIAorVEVTVChQcm9jZXNzU3dhcCwgUmVsYXRlZFdlYlZpZXdCZWZvcmVXZWJQcm9jZXNzTGF1
bmNoKQoreworICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gcHNvblByb2Nlc3NQ
b29sQ29uZmlndXJhdGlvbigpOworICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQ
cm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZp
Z3VyYXRpb24uZ2V0KCldKTsKKworICAgIGF1dG8gd2ViVmlldzFDb25maWd1cmF0aW9uID0gYWRv
cHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmll
dzFDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAgICBh
dXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAgIFt3
ZWJWaWV3MUNvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZv
clVSTFNjaGVtZTpAIlBTT04iXTsKKworICAgIGF1dG8gd2ViVmlldzEgPSBhZG9wdE5TKFtbV0tX
ZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNv
bmZpZ3VyYXRpb246d2ViVmlldzFDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBkZWxl
Z2F0ZSA9IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7Cisg
ICAgW3dlYlZpZXcxIHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAg
ICBhdXRvIHdlYlZpZXcyQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1
cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcyQ29uZmlndXJhdGlvbiBzZXRQcm9j
ZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgW3dlYlZpZXcyQ29uZmlndXJhdGlvbiBz
ZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAiUFNPTiJdOwor
ICAgIHdlYlZpZXcyQ29uZmlndXJhdGlvbi5nZXQoKS5fcmVsYXRlZFdlYlZpZXcgPSB3ZWJWaWV3
MS5nZXQoKTsgLy8gd2ViVmlldzIgd2lsbCBiZSByZWxhdGVkIHRvIHdlYlZpZXcxIGFuZCB3ZWJW
aWV3MSdzIFVSTCB3aWxsIGJlIHVzZWQgZm9yIHByb2Nlc3Mgc3dhcCBkZWNpc2lvbi4KKyAgICBh
dXRvIHdlYlZpZXcyID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpO
U01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXcyQ29uZmlndXJh
dGlvbi5nZXQoKV0pOworICAgIFt3ZWJWaWV3MiBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdh
dGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCBy
ZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9y
Zy9tYWluMS5odG1sIl1dOworICAgIFt3ZWJWaWV3MSBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKwor
ICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOwor
CisgICAgYXV0byBwaWQxID0gW3dlYlZpZXcxIF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAg
ICByZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0
cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluMi5odG1sIl1dOworICAgIFt3ZWJWaWV3
MiBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigm
ZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgYXV0byBwaWQyID0gW3dlYlZpZXcyIF93
ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBFWFBFQ1RfRVEocGlkMSwgcGlkMik7IC8vIFdl
YlZpZXdzIGFyZSByZWxhdGVkIHNvIHRoZXkgc2hvdWxkIHNoYXJlIHRoZSBzYW1lIHByb2Nlc3Mu
Cit9CisKIFRFU1QoUHJvY2Vzc1N3YXAsIFRlcm1pbmF0ZWRTdXNwZW5kZWRQYWdlUHJvY2VzcykK
IHsKICAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IHBzb25Qcm9jZXNzUG9vbENv
bmZpZ3VyYXRpb24oKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>367977</attachid>
            <date>2019-04-22 14:31:29 -0700</date>
            <delta_ts>2019-04-22 14:35:37 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-197160-20190422143128.patch</filename>
            <type>text/plain</type>
            <size>7755</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFhOTEzMGRmNjk1MGU3MzI4
NDc1ODlmOTVmMmIxZDNlODg3YTM5MzcuLjVjOGFhMzUzMGU0NDM2YzZjN2IxYmViYWEwYzc2MmZi
ZTg0ZGM1YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDQtMjIgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZWxheWVkIFdlYlByb2Nlc3NMYXVu
Y2ggbWF5IGJyZWFrIHRoZSBfcmVsYXRlZFdlYlZpZXcgU1BJCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcxNjAKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWxheWVkIFdlYlByb2Nlc3NMYXVuY2ggbWF5
IGJyZWFrIHRoZSBfcmVsYXRlZFdlYlZpZXcgU1BJLiBUaGUgYnJlYWthZ2Ugd291bGQgaGFwcGVu
IGlmIHRoZSBjbGllbnQKKyAgICAgICAgd291bGQgcmVsYXRlIGEgV2ViVmlldyB0byBhbm90aGVy
IHdoaWNoIGhhcyBub3QgbGF1bmNoZWQgaXRzIGluaXRpYWwgcHJvY2VzcyB5ZXQuCisKKyAgICAg
ICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHdoZW4gd2UgbmVlZCBhIHJ1bm5pbmcgcHJvY2VzcyBm
b3IgYSBXZWJWaWV3IHdoaWNoIGhhcyBhIHJlbGF0ZWQgdmlldywgd2UgbmVlZAorICAgICAgICB0
byBtYWtlIHN1cmUgdGhlIHJlbGF0ZWQgdmlldyBoYXMgYSBydW5uaW5nIHByb2Nlc3MgYW5kIHVz
ZSB0aGF0IHByb2Nlc3MuIFByZXZpb3VzbHksIHdlIHdvdWxkIHNoYXJlCisgICAgICAgIHRoZSAi
ZHVtbXkiIHByb2Nlc3MgaW5zdGVhZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJv
eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxhdW5jaFByb2Nlc3MpOgor
ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmVuc3VyZVJ1bm5pbmdQcm9jZXNzKToKKyAg
ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dl
YlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmNyZWF0
ZVdlYlBhZ2UpOgorCiAyMDE5LTA0LTIyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+
CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI0NDUwMi4KZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGI2N2RjMjIyODE2NzFjZWJkNWQwMDBj
MjA0ZDU1MDY3MzczZjNiNzcuLmJkNjU0MzRiMjE2N2QxYzA4NDY2MjY3YWY4MDdlZTA1NDg4ZjI4
YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK
KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzI3LDcg
KzcyNywxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bGF1bmNoUHJvY2Vzcyhjb25zdCBSZWdpc3Ry
YWJsZURvbWFpbiYgcmVnaXN0cmFibGVEb21haW4pCiAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNz
YWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgp
LCBtX3BhZ2VJRCk7CiAKICAgICBhdXRvJiBwcm9jZXNzUG9vbCA9IG1fcHJvY2Vzcy0+cHJvY2Vz
c1Bvb2woKTsKLSAgICBtX3Byb2Nlc3MgPSBwcm9jZXNzUG9vbC5wcm9jZXNzRm9yUmVnaXN0cmFi
bGVEb21haW4obV93ZWJzaXRlRGF0YVN0b3JlLmdldCgpLCB0aGlzLCByZWdpc3RyYWJsZURvbWFp
bik7CisKKyAgICBpZiAoYXV0byogcmVsYXRlZFBhZ2UgPSBtX2NvbmZpZ3VyYXRpb24tPnJlbGF0
ZWRQYWdlKCkpCisgICAgICAgIG1fcHJvY2VzcyA9IHJlbGF0ZWRQYWdlLT5lbnN1cmVSdW5uaW5n
UHJvY2VzcygpOworICAgIGVsc2UKKyAgICAgICAgbV9wcm9jZXNzID0gcHJvY2Vzc1Bvb2wucHJv
Y2Vzc0ZvclJlZ2lzdHJhYmxlRG9tYWluKG1fd2Vic2l0ZURhdGFTdG9yZS5nZXQoKSwgdGhpcywg
cmVnaXN0cmFibGVEb21haW4pOwogICAgIG1faGFzUnVubmluZ1Byb2Nlc3MgPSB0cnVlOwogCiAg
ICAgbV9wcm9jZXNzLT5hZGRFeGlzdGluZ1dlYlBhZ2UoKnRoaXMsIFdlYlByb2Nlc3NQcm94eTo6
QmVnaW5zVXNpbmdEYXRhU3RvcmU6Olllcyk7CkBAIC0xMDcyLDYgKzEwNzYsMTQgQEAgdm9pZCBX
ZWJQYWdlUHJveHk6OmFkZFBsYXRmb3JtTG9hZFBhcmFtZXRlcnMoTG9hZFBhcmFtZXRlcnMmKQog
fQogI2VuZGlmCiAKK1dlYlByb2Nlc3NQcm94eSYgV2ViUGFnZVByb3h5OjplbnN1cmVSdW5uaW5n
UHJvY2VzcygpCit7CisgICAgaWYgKCFoYXNSdW5uaW5nUHJvY2VzcygpKQorICAgICAgICBsYXVu
Y2hQcm9jZXNzKHsgfSk7CisKKyAgICByZXR1cm4gbV9wcm9jZXNzOworfQorCiBSZWZQdHI8QVBJ
OjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYm
IHJlcXVlc3QsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFs
VVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGlmIChtX2lzQ2xvc2Vk
KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAzNTdkYzFiNWIyOTA1
NmViMDFkN2UxYjE2YTY5OTViZTJjOTBhYmJlLi4zYmM2YTM3MWU5NWM4ZWRlNjg5NWIwYTllMmQw
ZWExZGM1ZjU2MTU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl
UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAt
MTA4Myw2ICsxMDgzLDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNWYWxpZEtleXByZXNzQ29tbWFu
ZE5hbWUoY29uc3QgU3RyaW5nJiBuYW1lKSBjb25zdCB7IHJldHVybiBtX2tub3duS2V5cHJlc3ND
b21tYW5kTmFtZXMuY29udGFpbnMobmFtZSk7IH0KICNlbmRpZgogCisgICAgV2ViUHJvY2Vzc1By
b3h5JiBlbnN1cmVSdW5uaW5nUHJvY2VzcygpOwogICAgIFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vz
cygpIHsgcmV0dXJuIG1fcHJvY2VzczsgfQogICAgIFByb2Nlc3NJRCBwcm9jZXNzSWRlbnRpZmll
cigpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j
ZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAK
aW5kZXggN2NiMWJiNDBhYTg2NDg3OTIwZjljNGQxNTM1MzRjMDI2ZTQ3ZDQ4OS4uOWQ2NGMwMmEz
NTE1ODJiNmZiYmNlYzE2YzY1ZDdmYzIyMGMwNWQyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtMTIxMiw3ICsxMjEyLDcgQEAgUmVmPFdlYlBhZ2VQ
cm94eT4gV2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZVdlYlBhZ2UoUGFnZUNsaWVudCYgcGFnZUNsaWVu
dCwgUmVmPEFQSToKICAgICBSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwcm9jZXNzOwogICAgIGlm
IChwYWdlQ29uZmlndXJhdGlvbi0+cmVsYXRlZFBhZ2UoKSkgewogICAgICAgICAvLyBTaGFyaW5n
IHByb2Nlc3NlcywgZS5nLiB3aGVuIGNyZWF0aW5nIHRoZSBwYWdlIHZpYSB3aW5kb3cub3Blbigp
LgotICAgICAgICBwcm9jZXNzID0gJnBhZ2VDb25maWd1cmF0aW9uLT5yZWxhdGVkUGFnZSgpLT5w
cm9jZXNzKCk7CisgICAgICAgIHByb2Nlc3MgPSAmcGFnZUNvbmZpZ3VyYXRpb24tPnJlbGF0ZWRQ
YWdlKCktPmVuc3VyZVJ1bm5pbmdQcm9jZXNzKCk7CiAgICAgICAgIC8vIFdlIGRvIG5vdCBzdXBw
b3J0IHNldmVyYWwgV2Vic2l0ZURhdGFTdG9yZXMgc2hhcmluZyBhIHNpbmdsZSBwcm9jZXNzLgog
ICAgICAgICBBU1NFUlQocHJvY2Vzcy5nZXQoKSA9PSBtX2R1bW15UHJvY2Vzc1Byb3h5IHx8ICZw
YWdlQ29uZmlndXJhdGlvbi0+d2Vic2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkg
PT0gJnByb2Nlc3MtPndlYnNpdGVEYXRhU3RvcmUoKSk7CiAgICAgICAgIEFTU0VSVCgmcGFnZUNv
bmZpZ3VyYXRpb24tPnJlbGF0ZWRQYWdlKCktPndlYnNpdGVEYXRhU3RvcmUoKSA9PSAmcGFnZUNv
bmZpZ3VyYXRpb24tPndlYnNpdGVEYXRhU3RvcmUoKS0+d2Vic2l0ZURhdGFTdG9yZSgpKTsKZGlm
ZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1NDEyYjY3
NzkxN2E4ZGMwYTJjZmE2MzlkYzU0NDg1ODQwZGJkZGRmLi5hNGRhMDdkNzNlYTA0YjE3NjZkNDU5
ZjkwMGJhYWU0NWYwZTU0ZjFiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9v
bHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDQtMjIgIENocmlzIER1bWV6ICA8
Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZWxheWVkIFdlYlByb2Nlc3NMYXVuY2ggbWF5
IGJyZWFrIHRoZSBfcmVsYXRlZFdlYlZpZXcgU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcxNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJIHRlc3QgY292ZXJhZ2UuCisKKyAgICAgICAg
KiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9u
Lm1tOgorCiAyMDE5LTA0LTIyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg
ICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI0NDUwMi4KZGlmZiAtLWdpdCBhL1Rvb2xz
L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24u
bW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25O
YXZpZ2F0aW9uLm1tCmluZGV4IGZjNGZhNmExZGM1NDczZDk0OTQ1NWJkOTUxNmZlYjFlMzI5MTFi
NWQuLjY0MTMyMDk4MjRmODRjNmQ5ZTY3YzI0YzEwMzI2ZDhlYTk0ZGEzNWMgMTAwNjQ0Ci0tLSBh
L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmln
YXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9j
ZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtNDU5OCw2ICs0NTk4LDQ2IEBAIFRFU1QoUHJvY2Vz
c1N3YXAsIE5vUHJvY2Vzc1N3YXBEdWVUb1JlbGF0ZWRWaWV3KQogICAgIHJ1blByb2Nlc3NTd2Fw
RHVlVG9SZWxhdGVkV2ViVmlld1Rlc3QoW05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3
LndlYmtpdC5vcmcvbWFpbjEuaHRtbCJdLCBbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93
d3cud2Via2l0Lm9yZy9tYWluMi5odG1sIl0sIEV4cGVjdFN3YXA6Ok5vKTsKIH0KIAorVEVTVChQ
cm9jZXNzU3dhcCwgUmVsYXRlZFdlYlZpZXdCZWZvcmVXZWJQcm9jZXNzTGF1bmNoKQoreworICAg
IGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gcHNvblByb2Nlc3NQb29sQ29uZmlndXJh
dGlvbigpOworICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBh
bGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0
KCldKTsKKworICAgIGF1dG8gd2ViVmlldzFDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2Vi
Vmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldzFDb25maWd1cmF0
aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAgICBhdXRvIGhhbmRsZXIg
PSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3MUNvbmZp
Z3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpA
IlBTT04iXTsKKworICAgIGF1dG8gd2ViVmlldzEgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9j
XSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246
d2ViVmlldzFDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0
TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcx
IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBhdXRvIHdlYlZp
ZXcyQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9j
XSBpbml0XSk7CisgICAgW3dlYlZpZXcyQ29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9j
ZXNzUG9vbC5nZXQoKV07CisgICAgW3dlYlZpZXcyQ29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVI
YW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAiUFNPTiJdOworICAgIHdlYlZpZXcy
Q29uZmlndXJhdGlvbi5nZXQoKS5fcmVsYXRlZFdlYlZpZXcgPSB3ZWJWaWV3MS5nZXQoKTsgLy8g
d2ViVmlldzIgd2lsbCBiZSByZWxhdGVkIHRvIHdlYlZpZXcxIGFuZCB3ZWJWaWV3MSdzIFVSTCB3
aWxsIGJlIHVzZWQgZm9yIHByb2Nlc3Mgc3dhcCBkZWNpc2lvbi4KKyAgICBhdXRvIHdlYlZpZXcy
ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAs
IDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXcyQ29uZmlndXJhdGlvbi5nZXQoKV0p
OworICAgIFt3ZWJWaWV3MiBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOwor
CisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVS
TDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluMS5odG1s
Il1dOworICAgIFt3ZWJWaWV3MSBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJL
aXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgYXV0byBw
aWQxID0gW3dlYlZpZXcxIF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICByZXF1ZXN0ID0g
W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246
Ly93d3cud2Via2l0Lm9yZy9tYWluMi5odG1sIl1dOworICAgIFt3ZWJWaWV3MiBsb2FkUmVxdWVz
dDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAg
ZG9uZSA9IGZhbHNlOworCisgICAgYXV0byBwaWQyID0gW3dlYlZpZXcyIF93ZWJQcm9jZXNzSWRl
bnRpZmllcl07CisKKyAgICBFWFBFQ1RfRVEocGlkMSwgcGlkMik7IC8vIFdlYlZpZXdzIGFyZSBy
ZWxhdGVkIHNvIHRoZXkgc2hvdWxkIHNoYXJlIHRoZSBzYW1lIHByb2Nlc3MuCit9CisKIFRFU1Qo
UHJvY2Vzc1N3YXAsIFRlcm1pbmF0ZWRTdXNwZW5kZWRQYWdlUHJvY2VzcykKIHsKICAgICBhdXRv
IHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IHBzb25Qcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24o
KTsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>367980</attachid>
            <date>2019-04-22 14:35:38 -0700</date>
            <delta_ts>2019-04-22 15:17:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-197160-20190422143537.patch</filename>
            <type>text/plain</type>
            <size>7759</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFhOTEzMGRmNjk1MGU3MzI4
NDc1ODlmOTVmMmIxZDNlODg3YTM5MzcuLjMzMDAzMzllOTFmYWEwMTY3ZTVlMTg1M2MxY2IxNjYz
ODA1YmNjMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDQtMjIgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZWxheWVkIFdlYlByb2Nlc3NMYXVu
Y2ggbWF5IGJyZWFrIHRoZSBfcmVsYXRlZFdlYlZpZXcgU1BJCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcxNjAKKworICAgICAgICBSZXZpZXdlZCBi
eSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIERlbGF5ZWQgV2ViUHJvY2Vzc0xhdW5jaCBt
YXkgYnJlYWsgdGhlIF9yZWxhdGVkV2ViVmlldyBTUEkuIFRoZSBicmVha2FnZSB3b3VsZCBoYXBw
ZW4gaWYgdGhlIGNsaWVudAorICAgICAgICB3b3VsZCByZWxhdGUgYSBXZWJWaWV3IHRvIGFub3Ro
ZXIgd2hpY2ggaGFzIG5vdCBsYXVuY2hlZCBpdHMgaW5pdGlhbCBwcm9jZXNzIHlldC4KKworICAg
ICAgICBUbyBhZGRyZXNzIHRoZSBpc3N1ZSwgd2hlbiB3ZSBuZWVkIGEgcnVubmluZyBwcm9jZXNz
IGZvciBhIFdlYlZpZXcgd2hpY2ggaGFzIGEgcmVsYXRlZCB2aWV3LCB3ZSBuZWVkCisgICAgICAg
IHRvIG1ha2Ugc3VyZSB0aGUgcmVsYXRlZCB2aWV3IGhhcyBhIHJ1bm5pbmcgcHJvY2VzcyBhbmQg
dXNlIHRoYXQgcHJvY2Vzcy4gUHJldmlvdXNseSwgd2Ugd291bGQgc2hhcmUKKyAgICAgICAgdGhl
ICJkdW1teSIgcHJvY2VzcyBpbnN0ZWFkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ
cm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bGF1bmNoUHJvY2Vzcyk6
CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZW5zdXJlUnVubmluZ1Byb2Nlc3MpOgor
ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv
V2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6Y3Jl
YXRlV2ViUGFnZSk6CisKIDIwMTktMDQtMjIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv
bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjQ0NTAyLgpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYjY3ZGMyMjI4MTY3MWNlYmQ1ZDAw
MGMyMDRkNTUwNjczNzNmM2I3Ny4uYmQ2NTQzNGIyMTY3ZDFjMDg0NjYyNjdhZjgwN2VlMDU0ODhm
MjhiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw
cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03Mjcs
NyArNzI3LDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpsYXVuY2hQcm9jZXNzKGNvbnN0IFJlZ2lz
dHJhYmxlRG9tYWluJiByZWdpc3RyYWJsZURvbWFpbikKICAgICBtX3Byb2Nlc3MtPnJlbW92ZU1l
c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1l
KCksIG1fcGFnZUlEKTsKIAogICAgIGF1dG8mIHByb2Nlc3NQb29sID0gbV9wcm9jZXNzLT5wcm9j
ZXNzUG9vbCgpOwotICAgIG1fcHJvY2VzcyA9IHByb2Nlc3NQb29sLnByb2Nlc3NGb3JSZWdpc3Ry
YWJsZURvbWFpbihtX3dlYnNpdGVEYXRhU3RvcmUuZ2V0KCksIHRoaXMsIHJlZ2lzdHJhYmxlRG9t
YWluKTsKKworICAgIGlmIChhdXRvKiByZWxhdGVkUGFnZSA9IG1fY29uZmlndXJhdGlvbi0+cmVs
YXRlZFBhZ2UoKSkKKyAgICAgICAgbV9wcm9jZXNzID0gcmVsYXRlZFBhZ2UtPmVuc3VyZVJ1bm5p
bmdQcm9jZXNzKCk7CisgICAgZWxzZQorICAgICAgICBtX3Byb2Nlc3MgPSBwcm9jZXNzUG9vbC5w
cm9jZXNzRm9yUmVnaXN0cmFibGVEb21haW4obV93ZWJzaXRlRGF0YVN0b3JlLmdldCgpLCB0aGlz
LCByZWdpc3RyYWJsZURvbWFpbik7CiAgICAgbV9oYXNSdW5uaW5nUHJvY2VzcyA9IHRydWU7CiAK
ICAgICBtX3Byb2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywgV2ViUHJvY2Vzc1Byb3h5
OjpCZWdpbnNVc2luZ0RhdGFTdG9yZTo6WWVzKTsKQEAgLTEwNzIsNiArMTA3NiwxNCBAQCB2b2lk
IFdlYlBhZ2VQcm94eTo6YWRkUGxhdGZvcm1Mb2FkUGFyYW1ldGVycyhMb2FkUGFyYW1ldGVycyYp
CiB9CiAjZW5kaWYKIAorV2ViUHJvY2Vzc1Byb3h5JiBXZWJQYWdlUHJveHk6OmVuc3VyZVJ1bm5p
bmdQcm9jZXNzKCkKK3sKKyAgICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkpCisgICAgICAgIGxh
dW5jaFByb2Nlc3MoeyB9KTsKKworICAgIHJldHVybiBtX3Byb2Nlc3M7Cit9CisKIFJlZlB0cjxB
UEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0
JiYgcmVxdWVzdCwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJu
YWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCiB7CiAgICAgaWYgKG1faXNDbG9z
ZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBi
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDM1N2RjMWI1YjI5
MDU2ZWIwMWQ3ZTFiMTZhNjk5NWJlMmM5MGFiYmUuLjNiYzZhMzcxZTk1YzhlZGU2ODk1YjBhOWUy
ZDBlYTFkYzVmNTYxNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh
Z2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBA
IC0xMDgzLDYgKzEwODMsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1ZhbGlkS2V5cHJlc3NDb21t
YW5kTmFtZShjb25zdCBTdHJpbmcmIG5hbWUpIGNvbnN0IHsgcmV0dXJuIG1fa25vd25LZXlwcmVz
c0NvbW1hbmROYW1lcy5jb250YWlucyhuYW1lKTsgfQogI2VuZGlmCiAKKyAgICBXZWJQcm9jZXNz
UHJveHkmIGVuc3VyZVJ1bm5pbmdQcm9jZXNzKCk7CiAgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9j
ZXNzKCkgeyByZXR1cm4gbV9wcm9jZXNzOyB9CiAgICAgUHJvY2Vzc0lEIHByb2Nlc3NJZGVudGlm
aWVyKCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBy
b2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNw
cAppbmRleCA3Y2IxYmI0MGFhODY0ODc5MjBmOWM0ZDE1MzUzNGMwMjZlNDdkNDg5Li45ZDY0YzAy
YTM1MTU4MmI2ZmJiY2VjMTZjNjVkN2ZjMjIwYzA1ZDI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0xMjEyLDcgKzEyMTIsNyBAQCBSZWY8V2ViUGFn
ZVByb3h5PiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xp
ZW50LCBSZWY8QVBJOgogICAgIFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+IHByb2Nlc3M7CiAgICAg
aWYgKHBhZ2VDb25maWd1cmF0aW9uLT5yZWxhdGVkUGFnZSgpKSB7CiAgICAgICAgIC8vIFNoYXJp
bmcgcHJvY2Vzc2VzLCBlLmcuIHdoZW4gY3JlYXRpbmcgdGhlIHBhZ2UgdmlhIHdpbmRvdy5vcGVu
KCkuCi0gICAgICAgIHByb2Nlc3MgPSAmcGFnZUNvbmZpZ3VyYXRpb24tPnJlbGF0ZWRQYWdlKCkt
PnByb2Nlc3MoKTsKKyAgICAgICAgcHJvY2VzcyA9ICZwYWdlQ29uZmlndXJhdGlvbi0+cmVsYXRl
ZFBhZ2UoKS0+ZW5zdXJlUnVubmluZ1Byb2Nlc3MoKTsKICAgICAgICAgLy8gV2UgZG8gbm90IHN1
cHBvcnQgc2V2ZXJhbCBXZWJzaXRlRGF0YVN0b3JlcyBzaGFyaW5nIGEgc2luZ2xlIHByb2Nlc3Mu
CiAgICAgICAgIEFTU0VSVChwcm9jZXNzLmdldCgpID09IG1fZHVtbXlQcm9jZXNzUHJveHkgfHwg
JnBhZ2VDb25maWd1cmF0aW9uLT53ZWJzaXRlRGF0YVN0b3JlKCktPndlYnNpdGVEYXRhU3RvcmUo
KSA9PSAmcHJvY2Vzcy0+d2Vic2l0ZURhdGFTdG9yZSgpKTsKICAgICAgICAgQVNTRVJUKCZwYWdl
Q29uZmlndXJhdGlvbi0+cmVsYXRlZFBhZ2UoKS0+d2Vic2l0ZURhdGFTdG9yZSgpID09ICZwYWdl
Q29uZmlndXJhdGlvbi0+d2Vic2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkpOwpk
aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDU0MTJi
Njc3OTE3YThkYzBhMmNmYTYzOWRjNTQ0ODU4NDBkYmRkZGYuLmVlYzg1YzU0NGZmMjE0MGU1ZWUz
ZWQ4OWMzOWI3MTMzYjRlOTQxNWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U
b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOS0wNC0yMiAgQ2hyaXMgRHVtZXog
IDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIERlbGF5ZWQgV2ViUHJvY2Vzc0xhdW5jaCBt
YXkgYnJlYWsgdGhlIF9yZWxhdGVkV2ViVmlldyBTUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzE2MAorCisgICAgICAgIFJldmlld2VkIGJ5IEFs
ZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0IGNvdmVyYWdlLgorCisgICAg
ICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdh
dGlvbi5tbToKKwogMjAxOS0wNC0yMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog
CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNDQ1MDIuCmRpZmYgLS1naXQgYS9U
b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0
aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dh
cE9uTmF2aWdhdGlvbi5tbQppbmRleCBmYzRmYTZhMWRjNTQ3M2Q5NDk0NTViZDk1MTZmZWIxZTMy
OTExYjVkLi42NDEzMjA5ODI0Zjg0YzZkOWU2N2MyNGMxMDMyNmQ4ZWE5NGRhMzVjIDEwMDY0NAot
LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25O
YXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev
UHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KQEAgLTQ1OTgsNiArNDU5OCw0NiBAQCBURVNUKFBy
b2Nlc3NTd2FwLCBOb1Byb2Nlc3NTd2FwRHVlVG9SZWxhdGVkVmlldykKICAgICBydW5Qcm9jZXNz
U3dhcER1ZVRvUmVsYXRlZFdlYlZpZXdUZXN0KFtOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjov
L3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwiXSwgW05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29u
Oi8vd3d3LndlYmtpdC5vcmcvbWFpbjIuaHRtbCJdLCBFeHBlY3RTd2FwOjpObyk7CiB9CiAKK1RF
U1QoUHJvY2Vzc1N3YXAsIFJlbGF0ZWRXZWJWaWV3QmVmb3JlV2ViUHJvY2Vzc0xhdW5jaCkKK3sK
KyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IHBzb25Qcm9jZXNzUG9vbENvbmZp
Z3VyYXRpb24oKTsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bv
b2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u
LmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXcxQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tX
S1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcxQ29uZmln
dXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5k
bGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldzFD
b25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hl
bWU6QCJQU09OIl07CisKKyAgICBhdXRvIHdlYlZpZXcxID0gYWRvcHROUyhbW1dLV2ViVmlldyBh
bGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0
aW9uOndlYlZpZXcxQ29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gZGVsZWdhdGUgPSBh
ZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJW
aWV3MSBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgYXV0byB3
ZWJWaWV3MkNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBh
bGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3MkNvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6
cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIFt3ZWJWaWV3MkNvbmZpZ3VyYXRpb24gc2V0VVJMU2No
ZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAIlBTT04iXTsKKyAgICB3ZWJW
aWV3MkNvbmZpZ3VyYXRpb24uZ2V0KCkuX3JlbGF0ZWRXZWJWaWV3ID0gd2ViVmlldzEuZ2V0KCk7
IC8vIHdlYlZpZXcyIHdpbGwgYmUgcmVsYXRlZCB0byB3ZWJWaWV3MSBhbmQgd2ViVmlldzEncyBV
Ukwgd2lsbCBiZSB1c2VkIGZvciBwcm9jZXNzIHN3YXAgZGVjaXNpb24uCisgICAgYXV0byB3ZWJW
aWV3MiA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVj
dCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3MkNvbmZpZ3VyYXRpb24uZ2V0
KCldKTsKKyAgICBbd2ViVmlldzIgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgp
XTsKKworICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdp
dGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbjEu
aHRtbCJdXTsKKyAgICBbd2ViVmlldzEgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0
V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1
dG8gcGlkMSA9IFt3ZWJWaWV3MSBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgcmVxdWVz
dCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJw
c29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbjIuaHRtbCJdXTsKKyAgICBbd2ViVmlldzIgbG9hZFJl
cXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwor
ICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1dG8gcGlkMiA9IFt3ZWJWaWV3MiBfd2ViUHJvY2Vz
c0lkZW50aWZpZXJdOworCisgICAgRVhQRUNUX0VRKHBpZDEsIHBpZDIpOyAvLyBXZWJWaWV3cyBh
cmUgcmVsYXRlZCBzbyB0aGV5IHNob3VsZCBzaGFyZSB0aGUgc2FtZSBwcm9jZXNzLgorfQorCiBU
RVNUKFByb2Nlc3NTd2FwLCBUZXJtaW5hdGVkU3VzcGVuZGVkUGFnZVByb2Nlc3MpCiB7CiAgICAg
YXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBwc29uUHJvY2Vzc1Bvb2xDb25maWd1cmF0
aW9uKCk7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>