<?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>237052</bug_id>
          
          <creation_ts>2022-02-22 13:10:18 -0800</creation_ts>
          <short_desc>Prevent use of PDFKit when using PDF.js</short_desc>
          <delta_ts>2022-02-23 11:04:08 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit Misc.</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>
          
          <blocked>235969</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="pascoe@apple.com">pascoe</reporter>
          <assigned_to name="pascoe@apple.com">pascoe</assigned_to>
          <cc>ntim</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1844844</commentid>
    <comment_count>0</comment_count>
    <who name="pascoe@apple.com">pascoe</who>
    <bug_when>2022-02-22 13:10:18 -0800</bug_when>
    <thetext>PDFKit is still used when PDF.js is enabled for embeds. This bug is to fix that issue.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844845</commentid>
    <comment_count>1</comment_count>
    <who name="pascoe@apple.com">pascoe</who>
    <bug_when>2022-02-22 13:10:23 -0800</bug_when>
    <thetext>rdar://89251696</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844846</commentid>
    <comment_count>2</comment_count>
      <attachid>452897</attachid>
    <who name="pascoe@apple.com">pascoe</who>
    <bug_when>2022-02-22 13:11:48 -0800</bug_when>
    <thetext>Created attachment 452897
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844871</commentid>
    <comment_count>3</comment_count>
      <attachid>452897</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-02-22 14:13:36 -0800</bug_when>
    <thetext>Comment on attachment 452897
Patch

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

&gt; Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1709
&gt; +        if (webPage-&gt;corePage()-&gt;settings().pdfJSViewerEnabled() &amp;&amp; MIMETypeRegistry::isPDFOrPostScriptMIMEType(mimeType))
&gt; +            return ObjectContentType::Frame;

The test says &quot;isPDFOrPostScriptMIMEType&quot; but PDF.js doesn&apos;t appear to be able to handle PostScript, so this doesn&apos;t seem quite right. Also, we should test PostScript if we don&apos;t already.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844872</commentid>
    <comment_count>4</comment_count>
      <attachid>452897</attachid>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2022-02-22 14:14:25 -0800</bug_when>
    <thetext>Comment on attachment 452897
Patch

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

&gt; Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1708
&gt; +        if (webPage-&gt;corePage()-&gt;settings().pdfJSViewerEnabled() &amp;&amp; MIMETypeRegistry::isPDFOrPostScriptMIMEType(mimeType))

Should this be `MIMETypeRegistry::isPDFMIMEType(mimeType)` ? PDF.js doesn&apos;t support PostScript: https://github.com/mozilla/pdf.js/issues/1594 (though we should figure out what to do in this case to avoid using PDFKit)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844885</commentid>
    <comment_count>5</comment_count>
      <attachid>452905</attachid>
    <who name="pascoe@apple.com">pascoe</who>
    <bug_when>2022-02-22 14:53:54 -0800</bug_when>
    <thetext>Created attachment 452905
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844886</commentid>
    <comment_count>6</comment_count>
    <who name="pascoe@apple.com">pascoe</who>
    <bug_when>2022-02-22 14:54:33 -0800</bug_when>
    <thetext>Although there&apos;s references of PDFKit supposedly supporting Postscript, I haven&apos;t get it to render files locally, so it seems fine pdfjs doesn&apos;t either.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844901</commentid>
    <comment_count>7</comment_count>
      <attachid>452906</attachid>
    <who name="pascoe@apple.com">pascoe</who>
    <bug_when>2022-02-22 15:23:16 -0800</bug_when>
    <thetext>Created attachment 452906
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844925</commentid>
    <comment_count>8</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2022-02-22 16:34:44 -0800</bug_when>
    <thetext>(In reply to j_pascoe@apple.com from comment #6)
&gt; Although there&apos;s references of PDFKit supposedly supporting Postscript, I
&gt; haven&apos;t get it to render files locally, so it seems fine pdfjs doesn&apos;t
&gt; either.

Per Arne removed our PS-&gt;PDF translation a few weeks ago.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1845008</commentid>
    <comment_count>9</comment_count>
      <attachid>452906</attachid>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2022-02-22 22:26:05 -0800</bug_when>
    <thetext>Comment on attachment 452906
Patch

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

&gt; Source/WebKit/ChangeLog:29
&gt; +2022-02-22  J Pascoe  &lt;j_pascoe@apple.com&gt;
&gt; +
&gt; +        Prevent use of PDFKit when using PDF.js
&gt; +        https://bugs.webkit.org/show_bug.cgi?id=237052
&gt; +
&gt; +        Reviewed by NOBODY (OOPS!).
&gt; +
&gt; +        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
&gt; +        (WebKit::WebFrameLoaderClient::objectContentType):
&gt; +        * WebProcess/WebPage/mac/WebPageMac.mm:
&gt; +        (WebKit::WebPage::shouldUsePDFPlugin const):
&gt; +
&gt; +2022-02-22  J Pascoe  &lt;j_pascoe@apple.com&gt;
&gt; +
&gt; +        Prevent use of PDFKit when using PDF.js
&gt; +        https://bugs.webkit.org/show_bug.cgi?id=237052
&gt; +        rdar://89251696
&gt; +
&gt; +        Reviewed by NOBODY (OOPS!).
&gt; +
&gt; +        PDFKit was still being used by embeds, this patch fixes that issue by treating
&gt; +        pdf embeds as frames if PDF.js is enabled and also prevents the loading of
&gt; +        the PDFKit plugin entirely by modifying shouldUsePDFPlugin.
&gt; +
&gt; +        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
&gt; +        (WebKit::WebFrameLoaderClient::objectContentType):
&gt; +        * WebProcess/WebPage/mac/WebPageMac.mm:
&gt; +        (WebKit::WebPage::shouldUsePDFPlugin const):
&gt; +

nit: Double changelog</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1845013</commentid>
    <comment_count>10</comment_count>
      <attachid>452906</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2022-02-22 22:49:45 -0800</bug_when>
    <thetext>Comment on attachment 452906
Patch

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

&gt; Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm:209
&gt;      return pdfPluginEnabled()
&gt; +        &amp;&amp; !corePage()-&gt;settings().pdfJSViewerEnabled()

Does anyone call pdfPluginEnabled() (as opposed to shouldUsePDFPlugin) that might motivate you to move this check down a level?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1845173</commentid>
    <comment_count>11</comment_count>
    <who name="pascoe@apple.com">pascoe</who>
    <bug_when>2022-02-23 09:31:17 -0800</bug_when>
    <thetext>(In reply to Tim Horton from comment #10)
&gt; Comment on attachment 452906 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=452906&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm:209
&gt; &gt;      return pdfPluginEnabled()
&gt; &gt; +        &amp;&amp; !corePage()-&gt;settings().pdfJSViewerEnabled()
&gt; 
&gt; Does anyone call pdfPluginEnabled() (as opposed to shouldUsePDFPlugin) that
&gt; might motivate you to move this check down a level?

No, there aren&apos;t other usages of pdfPluginEnabled() wrt using the plugin.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1845174</commentid>
    <comment_count>12</comment_count>
      <attachid>452990</attachid>
    <who name="pascoe@apple.com">pascoe</who>
    <bug_when>2022-02-23 09:31:53 -0800</bug_when>
    <thetext>Created attachment 452990
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1845228</commentid>
    <comment_count>13</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-02-23 11:04:05 -0800</bug_when>
    <thetext>Committed r290384 (247699@main): &lt;https://commits.webkit.org/247699@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 452990.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452897</attachid>
            <date>2022-02-22 13:11:48 -0800</date>
            <delta_ts>2022-02-22 14:53:52 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-237052-20220222131148.patch</filename>
            <type>text/plain</type>
            <size>2653</size>
            <attacher name="pascoe@apple.com">pascoe</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQxOTc5YjRkMmNhN2E0ODUw
ZGFjMjc3YzcxMDQ4NGNjOTM5ZWUzOGQuLjI1NWRlODUyYzcyYjZjZDkxMTZlNDZkMGU2NTMxNGFj
YzkwOWZlMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjItMDItMjIgIEogUGFzY29l
ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFByZXZlbnQgdXNlIG9mIFBERktpdCB3
aGVuIHVzaW5nIFBERi5qcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjM3MDUyCisgICAgICAgIHJkYXI6Ly84OTI1MTY5NgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBERktpdCB3YXMgc3RpbGwgYmVpbmcg
dXNlZCBieSBlbWJlZHMsIHRoaXMgcGF0Y2ggZml4ZXMgdGhhdCBpc3N1ZSBieSB0cmVhdGluZwor
ICAgICAgICBwZGYgZW1iZWRzIGFzIGZyYW1lcyBpZiBQREYuanMgaXMgZW5hYmxlZCBhbmQgYWxz
byBwcmV2ZW50cyB0aGUgbG9hZGluZyBvZgorICAgICAgICB0aGUgUERGS2l0IHBsdWdpbiBlbnRp
cmVseSBieSBtb2RpZnlpbmcgc2hvdWxkVXNlUERGUGx1Z2luLgorCisgICAgICAgICogV2ViUHJv
Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChX
ZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6CisgICAgICAg
ICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tOgorICAgICAgICAoV2ViS2l0
OjpXZWJQYWdlOjpzaG91bGRVc2VQREZQbHVnaW4gY29uc3QpOgorCiAyMDIyLTAyLTIyICBKIFBh
c2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViQXV0aG5dIEZpeCBsaWZl
dGltZSBpc3N1ZSBvbiBpT1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDNi
OGFjMzZkMGFlOWQxNzRjZmE2NjZiNGJmYzQxNWE4MzBkYTcwZWIuLmRjNDU2OGEyZjhkZTAyYjk4
MThlYzQzMWUwMWZiZGI0ZDM5YzE2NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw
cApAQCAtMTcwNCw2ICsxNzA0LDEwIEBAIE9iamVjdENvbnRlbnRUeXBlIFdlYkZyYW1lTG9hZGVy
Q2xpZW50OjpvYmplY3RDb250ZW50VHlwZShjb25zdCBVUkwmIHVybCwgY29uc3QKICAgICAgICAg
ICAgIHJldHVybiBPYmplY3RDb250ZW50VHlwZTo6RnJhbWU7CiAgICAgICAgIH0KICAgICB9Cisg
ICAgaWYgKGF1dG8qIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCkpIHsKKyAgICAgICAgaWYgKHdl
YlBhZ2UtPmNvcmVQYWdlKCktPnNldHRpbmdzKCkucGRmSlNWaWV3ZXJFbmFibGVkKCkgJiYgTUlN
RVR5cGVSZWdpc3RyeTo6aXNQREZPclBvc3RTY3JpcHRNSU1FVHlwZShtaW1lVHlwZSkpCisgICAg
ICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudFR5cGU6OkZyYW1lOworICAgIH0KIAogICAgIGlm
IChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGUobWltZVR5cGUpKQog
ICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudFR5cGU6OkltYWdlOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0gYi9Tb3VyY2Uv
V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQppbmRleCA5ZGMwMGRh
Mjc3MGMxOTM5ODkxYTMwMGYyMzM3NDk2YTljOGU3MDFkLi5jMWExOGNlYmIyNWIwZWNiMzEzZmJi
N2ExMDA0MWI5Yjk2Yzg5NDQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQpAQCAtMjA2LDYgKzIwNiw3IEBAIE5TT2JqZWN0ICpX
ZWJQYWdlOjphY2Nlc3NpYmlsaXR5T2JqZWN0Rm9yTWFpbkZyYW1lUGx1Z2luKCkKIGJvb2wgV2Vi
UGFnZTo6c2hvdWxkVXNlUERGUGx1Z2luKGNvbnN0IFN0cmluZyYgY29udGVudFR5cGUsIFN0cmlu
Z1ZpZXcgcGF0aCkgY29uc3QKIHsKICAgICByZXR1cm4gcGRmUGx1Z2luRW5hYmxlZCgpCisgICAg
ICAgICYmICFjb3JlUGFnZSgpLT5zZXR0aW5ncygpLnBkZkpTVmlld2VyRW5hYmxlZCgpCiAgICAg
ICAgICYmIGdldFBERkxheWVyQ29udHJvbGxlckNsYXNzKCkKICAgICAgICAgJiYgKE1JTUVUeXBl
UmVnaXN0cnk6OmlzUERGT3JQb3N0U2NyaXB0TUlNRVR5cGUoY29udGVudFR5cGUpCiAgICAgICAg
ICAgICB8fCAoY29udGVudFR5cGUuaXNFbXB0eSgpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452905</attachid>
            <date>2022-02-22 14:53:54 -0800</date>
            <delta_ts>2022-02-22 15:27:26 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-237052-20220222145353.patch</filename>
            <type>text/plain</type>
            <size>2681</size>
            <attacher name="pascoe@apple.com">pascoe</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJmYjRhYmExMWRiNWVkYjhm
MjM2M2VhNDFjYTFhOGQ0MDE1NDc3NTAuLjNjNDJlMWU4NWRmZGQ3ZDMwMTRmYzViMWQ0YzcwYjUw
ZGQwMTBiNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjItMDItMjIgIEogUGFzY29l
ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFByZXZlbnQgdXNlIG9mIFBERktpdCB3
aGVuIHVzaW5nIFBERi5qcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjM3MDUyCisgICAgICAgIHJkYXI6Ly84OTI1MTY5NgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBERktpdCB3YXMgc3RpbGwgYmVpbmcg
dXNlZCBieSBlbWJlZHMsIHRoaXMgcGF0Y2ggZml4ZXMgdGhhdCBpc3N1ZSBieSB0cmVhdGluZwor
ICAgICAgICBwZGYgZW1iZWRzIGFzIGZyYW1lcyBpZiBQREYuanMgaXMgZW5hYmxlZCBhbmQgYWxz
byBwcmV2ZW50cyB0aGUgbG9hZGluZyBvZgorICAgICAgICB0aGUgUERGS2l0IHBsdWdpbiBlbnRp
cmVseSBieSBtb2RpZnlpbmcgc2hvdWxkVXNlUERGUGx1Z2luLgorCisgICAgICAgICogV2ViUHJv
Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChX
ZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6CisgICAgICAg
ICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tOgorICAgICAgICAoV2ViS2l0
OjpXZWJQYWdlOjpzaG91bGRVc2VQREZQbHVnaW4gY29uc3QpOgorCiAyMDIyLTAyLTIyICBGdWpp
aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5DYWly
b11bV0syXSBhbmltYXRpb25zL2JhY2tncm91bmQtcG9zaXRpb24uaHRtbCBpcyB0aW1pbmcgb3V0
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi
RnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVT
dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCAzYjhhYzM2ZDBhZTlkMTc0Y2Zh
NjY2YjRiZmM0MTVhODMwZGE3MGViLi42YzRlOTk0Yzk2ZjQ2YzI5NTZhNmM5N2E1ZGJhYWJkZmNk
MTdhYzJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv
cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTE3MDQsNiArMTcw
NCwxMCBAQCBPYmplY3RDb250ZW50VHlwZSBXZWJGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29u
dGVudFR5cGUoY29uc3QgVVJMJiB1cmwsIGNvbnN0CiAgICAgICAgICAgICByZXR1cm4gT2JqZWN0
Q29udGVudFR5cGU6OkZyYW1lOwogICAgICAgICB9CiAgICAgfQorICAgIGlmIChhdXRvKiB3ZWJQ
YWdlID0gbV9mcmFtZS0+cGFnZSgpKSB7CisgICAgICAgIGlmICh3ZWJQYWdlLT5jb3JlUGFnZSgp
LT5zZXR0aW5ncygpLnBkZkpTVmlld2VyRW5hYmxlZCgpICYmIE1JTUVUeXBlUmVnaXN0cnk6Omlz
UERGTUlNRVR5cGUobWltZVR5cGUpKQorICAgICAgICAgICAgcmV0dXJuIE9iamVjdENvbnRlbnRU
eXBlOjpGcmFtZTsKKyAgICB9CiAKICAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0
ZWRJbWFnZU1JTUVUeXBlKG1pbWVUeXBlKSkKICAgICAgICAgcmV0dXJuIE9iamVjdENvbnRlbnRU
eXBlOjpJbWFnZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L21hYy9XZWJQYWdlTWFjLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj
L1dlYlBhZ2VNYWMubW0KaW5kZXggYmQzNjcyMDc1Yjc1NzY4Yzg0MTQ3NzhmYzY2NWY1ZDc1YjRl
MjRhZS4uYThkZGI1ZjMyNzQ1N2YxMmJlYTAyOWFjNDFhY2Y4MWZiOGYwMTg4NCAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KKysr
IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KQEAg
LTIwNiw2ICsyMDYsNyBAQCBOU09iamVjdCAqV2ViUGFnZTo6YWNjZXNzaWJpbGl0eU9iamVjdEZv
ck1haW5GcmFtZVBsdWdpbigpCiBib29sIFdlYlBhZ2U6OnNob3VsZFVzZVBERlBsdWdpbihjb25z
dCBTdHJpbmcmIGNvbnRlbnRUeXBlLCBTdHJpbmdWaWV3IHBhdGgpIGNvbnN0CiB7CiAgICAgcmV0
dXJuIHBkZlBsdWdpbkVuYWJsZWQoKQorICAgICAgICAmJiAhY29yZVBhZ2UoKS0+c2V0dGluZ3Mo
KS5wZGZKU1ZpZXdlckVuYWJsZWQoKQogICAgICAgICAmJiBnZXRQREZMYXllckNvbnRyb2xsZXJD
bGFzcygpCiAgICAgICAgICYmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1BERk9yUG9zdFNjcmlwdE1J
TUVUeXBlKGNvbnRlbnRUeXBlKQogICAgICAgICAgICAgfHwgKGNvbnRlbnRUeXBlLmlzRW1wdHko
KQo=
</data>
<flag name="commit-queue"
          id="480098"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452906</attachid>
            <date>2022-02-22 15:23:16 -0800</date>
            <delta_ts>2022-02-23 09:31:51 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-237052-20220222152316.patch</filename>
            <type>text/plain</type>
            <size>4509</size>
            <attacher name="pascoe@apple.com">pascoe</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGJjZWUxYTYwMzAwYzMz
YzMzMzM1Y2E1N2ZlOTY4ZTQ5Y2MzNGFmNy4uNTZkNWQyODUyN2Y0N2M4Y2Q2YWJlM2I1Y2YxZDA5
Yjk2YjBhYmNkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAyLTIyICBKIFBh
c2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IHVzZSBvZiBQREZL
aXQgd2hlbiB1c2luZyBQREYuanMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIzNzA1MgorICAgICAgICByZGFyOi8vODkyNTE2OTYKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgV0VCQ09SRV9FWFBPUlQg
aW4gb3JkZXIgdG8gdXNlIGlzUERGTUlNRVR5cGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9NSU1F
VHlwZVJlZ2lzdHJ5Lmg6CisKIDIwMjItMDItMjIgIEZyw6lkw6lyaWMgV2FuZyAgPGZ3YW5nQGln
YWxpYS5jb20+CiAKICAgICAgICAgbnVsbCBwdHIgZGVyZWYgdmlhIFdlYlhSU3lzdGVtOjpyZXF1
ZXN0U2Vzc2lvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZwppbmRleCAyZmI0YWJhMTFkYjVlZGI4ZjIzNjNlYTQxY2ExYThkNDAx
NTQ3NzUwLi4yMTdhODI4YmY5NWI5YmMyZjM2YTUzMDhmZjU5ZTkyM2JhN2Q3OWJlIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDMyIEBACisyMDIyLTAyLTIyICBKIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxl
LmNvbT4KKworICAgICAgICBQcmV2ZW50IHVzZSBvZiBQREZLaXQgd2hlbiB1c2luZyBQREYuanMK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzA1Mgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJv
Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChX
ZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6CisgICAgICAg
ICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tOgorICAgICAgICAoV2ViS2l0
OjpXZWJQYWdlOjpzaG91bGRVc2VQREZQbHVnaW4gY29uc3QpOgorCisyMDIyLTAyLTIyICBKIFBh
c2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IHVzZSBvZiBQREZL
aXQgd2hlbiB1c2luZyBQREYuanMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIzNzA1MgorICAgICAgICByZGFyOi8vODkyNTE2OTYKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQREZLaXQgd2FzIHN0aWxsIGJl
aW5nIHVzZWQgYnkgZW1iZWRzLCB0aGlzIHBhdGNoIGZpeGVzIHRoYXQgaXNzdWUgYnkgdHJlYXRp
bmcKKyAgICAgICAgcGRmIGVtYmVkcyBhcyBmcmFtZXMgaWYgUERGLmpzIGlzIGVuYWJsZWQgYW5k
IGFsc28gcHJldmVudHMgdGhlIGxvYWRpbmcgb2YKKyAgICAgICAgdGhlIFBERktpdCBwbHVnaW4g
ZW50aXJlbHkgYnkgbW9kaWZ5aW5nIHNob3VsZFVzZVBERlBsdWdpbi4KKworICAgICAgICAqIFdl
YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAg
ICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUpOgorICAg
ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbToKKyAgICAgICAgKFdl
YktpdDo6V2ViUGFnZTo6c2hvdWxkVXNlUERGUGx1Z2luIGNvbnN0KToKKwogMjAyMi0wMi0yMiAg
RnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2lu
Q2Fpcm9dW1dLMl0gYW5pbWF0aW9ucy9iYWNrZ3JvdW5kLXBvc2l0aW9uLmh0bWwgaXMgdGltaW5n
IG91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3Ry
eS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5oCmluZGV4IDdl
ZTYwOWMzZjE4YzQ1NGU5ZTI0OTM5ZTU4MzIwODhlNjQ1ZjYxM2EuLjk0YzQ1MDkxZDRhY2FiOWY5
NWVhMTliYWJjMDQ5OTY2OGQ1ODFiMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL01JTUVUeXBlUmVnaXN0cnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1F
VHlwZVJlZ2lzdHJ5LmgKQEAgLTEwNSw3ICsxMDUsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGJv
b2wgaXNBcHBsaWNhdGlvblBsdWdpbk1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwog
CiAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIGEgTUlNRSB0eXBlIGlzIG9uZSBvZiB0aGUgY29tbW9u
IFBERi9QUyB0eXBlcy4KLSAgICBzdGF0aWMgYm9vbCBpc1BERk1JTUVUeXBlKGNvbnN0IFN0cmlu
ZyYgbWltZVR5cGUpOworICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBib29sIGlzUERGTUlNRVR5
cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgc3RhdGljIGJvb2wgaXNQb3N0U2NyaXB0
TUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3Rh
dGljIGJvb2wgaXNQREZPclBvc3RTY3JpcHRNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBl
KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0
L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggM2I4YWMzNmQwYWU5ZDE3
NGNmYTY2NmI0YmZjNDE1YTgzMGRhNzBlYi4uNmM0ZTk5NGM5NmY0NmMyOTU2YTZjOTdhNWRiYWFi
ZGZjZDE3YWMyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVT
dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC0xNzA0LDYg
KzE3MDQsMTAgQEAgT2JqZWN0Q29udGVudFR5cGUgV2ViRnJhbWVMb2FkZXJDbGllbnQ6Om9iamVj
dENvbnRlbnRUeXBlKGNvbnN0IFVSTCYgdXJsLCBjb25zdAogICAgICAgICAgICAgcmV0dXJuIE9i
amVjdENvbnRlbnRUeXBlOjpGcmFtZTsKICAgICAgICAgfQogICAgIH0KKyAgICBpZiAoYXV0byog
d2ViUGFnZSA9IG1fZnJhbWUtPnBhZ2UoKSkgeworICAgICAgICBpZiAod2ViUGFnZS0+Y29yZVBh
Z2UoKS0+c2V0dGluZ3MoKS5wZGZKU1ZpZXdlckVuYWJsZWQoKSAmJiBNSU1FVHlwZVJlZ2lzdHJ5
Ojppc1BERk1JTUVUeXBlKG1pbWVUeXBlKSkKKyAgICAgICAgICAgIHJldHVybiBPYmplY3RDb250
ZW50VHlwZTo6RnJhbWU7CisgICAgfQogCiAgICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzU3Vw
cG9ydGVkSW1hZ2VNSU1FVHlwZShtaW1lVHlwZSkpCiAgICAgICAgIHJldHVybiBPYmplY3RDb250
ZW50VHlwZTo6SW1hZ2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi
UGFnZS9tYWMvV2ViUGFnZU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L21hYy9XZWJQYWdlTWFjLm1tCmluZGV4IGJkMzY3MjA3NWI3NTc2OGM4NDE0Nzc4ZmM2NjVmNWQ3
NWI0ZTI0YWUuLmE4ZGRiNWYzMjc0NTdmMTJiZWEwMjlhYzQxYWNmODFmYjhmMDE4ODQgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1t
CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1t
CkBAIC0yMDYsNiArMjA2LDcgQEAgTlNPYmplY3QgKldlYlBhZ2U6OmFjY2Vzc2liaWxpdHlPYmpl
Y3RGb3JNYWluRnJhbWVQbHVnaW4oKQogYm9vbCBXZWJQYWdlOjpzaG91bGRVc2VQREZQbHVnaW4o
Y29uc3QgU3RyaW5nJiBjb250ZW50VHlwZSwgU3RyaW5nVmlldyBwYXRoKSBjb25zdAogewogICAg
IHJldHVybiBwZGZQbHVnaW5FbmFibGVkKCkKKyAgICAgICAgJiYgIWNvcmVQYWdlKCktPnNldHRp
bmdzKCkucGRmSlNWaWV3ZXJFbmFibGVkKCkKICAgICAgICAgJiYgZ2V0UERGTGF5ZXJDb250cm9s
bGVyQ2xhc3MoKQogICAgICAgICAmJiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNQREZPclBvc3RTY3Jp
cHRNSU1FVHlwZShjb250ZW50VHlwZSkKICAgICAgICAgICAgIHx8IChjb250ZW50VHlwZS5pc0Vt
cHR5KCkK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452990</attachid>
            <date>2022-02-23 09:31:53 -0800</date>
            <delta_ts>2022-02-23 11:04:07 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-237052-20220223093152.patch</filename>
            <type>text/plain</type>
            <size>4094</size>
            <attacher name="pascoe@apple.com">pascoe</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjA5M2U1ZjI2MTY1MDI3
MGI3NTc2ZTQ2YTg3YzFkMWQ4OTAyMGRiZC4uZGU4NGE2MWYyYTFiNWMyYTViMzc0ZmM1NTYxOWQ4
ZDAyYTZjMzY5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAyLTIzICBKIFBh
c2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IHVzZSBvZiBQREZL
aXQgd2hlbiB1c2luZyBQREYuanMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIzNzA1MgorICAgICAgICByZGFyOi8vODkyNTE2OTYKKworICAgICAgICBS
ZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEFkZCBXRUJDT1JFX0VYUE9SVCBpbiBv
cmRlciB0byB1c2UgaXNQREZNSU1FVHlwZS4KKworICAgICAgICAqIHBsYXRmb3JtL01JTUVUeXBl
UmVnaXN0cnkuaDoKKwogMjAyMi0wMi0yMyAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2Fs
aWEuY29tPgogCiAgICAgICAgIFtHVEtdIFVucmV2aWV3ZWQsIGJ1aWxkIGZpeCBmb3IgRGViaWFu
IFN0YWJsZSBhZnRlciByMjkwMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv
ZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2Y2ZiZWQ1N2UxMzlmNGI4OGM5MzVm
OGVjNDk1ZjljNjVhMzdmNGMuLmY0MjRkZTNlMzI2NDBjNjBlYWMyZGIzYzg1Y2VlYWMwYzk2M2Fi
NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjItMDItMjIgIEogUGFzY29lICA8al9w
YXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFByZXZlbnQgdXNlIG9mIFBERktpdCB3aGVuIHVz
aW5nIFBERi5qcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjM3MDUyCisgICAgICAgIHJkYXI6Ly84OTI1MTY5NgorCisgICAgICAgIFJldmlld2VkIGJ5
IFRpbSBIb3J0b24uCisKKyAgICAgICAgUERGS2l0IHdhcyBzdGlsbCBiZWluZyB1c2VkIGJ5IGVt
YmVkcywgdGhpcyBwYXRjaCBmaXhlcyB0aGF0IGlzc3VlIGJ5IHRyZWF0aW5nCisgICAgICAgIHBk
ZiBlbWJlZHMgYXMgZnJhbWVzIGlmIFBERi5qcyBpcyBlbmFibGVkIGFuZCBhbHNvIHByZXZlbnRz
IHRoZSBsb2FkaW5nIG9mCisgICAgICAgIHRoZSBQREZLaXQgcGx1Z2luIGVudGlyZWx5IGJ5IG1v
ZGlmeWluZyBzaG91bGRVc2VQREZQbHVnaW4uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNv
cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi
RnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENvbnRlbnRUeXBlKToKKyAgICAgICAgKiBXZWJQcm9j
ZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6
OnNob3VsZFVzZVBERlBsdWdpbiBjb25zdCk6CisKIDIwMjItMDItMjMgIFBoaWxpcHBlIE5vcm1h
bmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIERlLWluaXRp
YWxpemUgR1N0cmVhbWVyIGJlZm9yZSB0ZXJtaW5hdGluZyBXZWJQcm9jZXNzCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmggYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmgKaW5kZXggN2VlNjA5YzNmMThjNDU0ZTll
MjQ5MzllNTgzMjA4OGU2NDVmNjEzYS4uOTRjNDUwOTFkNGFjYWI5Zjk1ZWExOWJhYmMwNDk5NjY4
ZDU4MWIwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdp
c3RyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuaApA
QCAtMTA1LDcgKzEwNSw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgYm9vbCBpc0FwcGxpY2F0aW9u
UGx1Z2luTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAKICAgICAvLyBDaGVjayB0
byBzZWUgaWYgYSBNSU1FIHR5cGUgaXMgb25lIG9mIHRoZSBjb21tb24gUERGL1BTIHR5cGVzLgot
ICAgIHN0YXRpYyBib29sIGlzUERGTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7Cisg
ICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIGJvb2wgaXNQREZNSU1FVHlwZShjb25zdCBTdHJpbmcm
IG1pbWVUeXBlKTsKICAgICBzdGF0aWMgYm9vbCBpc1Bvc3RTY3JpcHRNSU1FVHlwZShjb25zdCBT
dHJpbmcmIG1pbWVUeXBlKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgYm9vbCBpc1BERk9y
UG9zdFNjcmlwdE1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwogCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD
bGllbnQuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy
YW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCAzYjhhYzM2ZDBhZTlkMTc0Y2ZhNjY2YjRiZmM0MTVh
ODMwZGE3MGViLi42YzRlOTk0Yzk2ZjQ2YzI5NTZhNmM5N2E1ZGJhYWJkZmNkMTdhYzJiIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM
b2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw
cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTE3MDQsNiArMTcwNCwxMCBAQCBPYmpl
Y3RDb250ZW50VHlwZSBXZWJGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUoY29u
c3QgVVJMJiB1cmwsIGNvbnN0CiAgICAgICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudFR5cGU6
OkZyYW1lOwogICAgICAgICB9CiAgICAgfQorICAgIGlmIChhdXRvKiB3ZWJQYWdlID0gbV9mcmFt
ZS0+cGFnZSgpKSB7CisgICAgICAgIGlmICh3ZWJQYWdlLT5jb3JlUGFnZSgpLT5zZXR0aW5ncygp
LnBkZkpTVmlld2VyRW5hYmxlZCgpICYmIE1JTUVUeXBlUmVnaXN0cnk6OmlzUERGTUlNRVR5cGUo
bWltZVR5cGUpKQorICAgICAgICAgICAgcmV0dXJuIE9iamVjdENvbnRlbnRUeXBlOjpGcmFtZTsK
KyAgICB9CiAKICAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVU
eXBlKG1pbWVUeXBlKSkKICAgICAgICAgcmV0dXJuIE9iamVjdENvbnRlbnRUeXBlOjpJbWFnZTsK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdl
TWFjLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMu
bW0KaW5kZXggYmQzNjcyMDc1Yjc1NzY4Yzg0MTQ3NzhmYzY2NWY1ZDc1YjRlMjRhZS4uYThkZGI1
ZjMyNzQ1N2YxMmJlYTAyOWFjNDFhY2Y4MWZiOGYwMTg4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KKysrIGIvU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KQEAgLTIwNiw2ICsyMDYs
NyBAQCBOU09iamVjdCAqV2ViUGFnZTo6YWNjZXNzaWJpbGl0eU9iamVjdEZvck1haW5GcmFtZVBs
dWdpbigpCiBib29sIFdlYlBhZ2U6OnNob3VsZFVzZVBERlBsdWdpbihjb25zdCBTdHJpbmcmIGNv
bnRlbnRUeXBlLCBTdHJpbmdWaWV3IHBhdGgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHBkZlBsdWdp
bkVuYWJsZWQoKQorICAgICAgICAmJiAhY29yZVBhZ2UoKS0+c2V0dGluZ3MoKS5wZGZKU1ZpZXdl
ckVuYWJsZWQoKQogICAgICAgICAmJiBnZXRQREZMYXllckNvbnRyb2xsZXJDbGFzcygpCiAgICAg
ICAgICYmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1BERk9yUG9zdFNjcmlwdE1JTUVUeXBlKGNvbnRl
bnRUeXBlKQogICAgICAgICAgICAgfHwgKGNvbnRlbnRUeXBlLmlzRW1wdHkoKQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>