<?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>228584</bug_id>
          
          <creation_ts>2021-07-29 08:27:12 -0700</creation_ts>
          <short_desc>[macOS] Remove unneeded sandbox extension member</short_desc>
          <delta_ts>2021-08-02 10:30:18 -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>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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Per Arne Vollan">pvollan</reporter>
          <assigned_to name="Per Arne Vollan">pvollan</assigned_to>
          <cc>darin</cc>
    
    <cc>mmaxfield</cc>
    
    <cc>sam</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1780378</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-07-29 08:27:12 -0700</bug_when>
    <thetext>The commit https://trac.webkit.org/changeset/272999/webkit disabled this, but after adopting API to switch from static font registry to user font registry, this can be re-enabled.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780379</commentid>
    <comment_count>1</comment_count>
      <attachid>434521</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-07-29 08:30:14 -0700</bug_when>
    <thetext>Created attachment 434521
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780412</commentid>
    <comment_count>2</comment_count>
      <attachid>434521</attachid>
    <who name="Sam Weinig">sam</who>
    <bug_when>2021-07-29 09:52:03 -0700</bug_when>
    <thetext>Comment on attachment 434521
Patch

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

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1282
&gt; +void WebProcess::switchFromStaticFontRegistryToUserFontRegistry(const WebKit::SandboxExtension::Handle&amp; fontMachExtensionHandle)

What is the point of changing this to an l-value? In general, handles should always be passed by r-value.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780446</commentid>
    <comment_count>3</comment_count>
      <attachid>434537</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-07-29 11:02:33 -0700</bug_when>
    <thetext>Created attachment 434537
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780447</commentid>
    <comment_count>4</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-07-29 11:03:01 -0700</bug_when>
    <thetext>(In reply to Sam Weinig from comment #2)
&gt; Comment on attachment 434521 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=434521&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1282
&gt; &gt; +void WebProcess::switchFromStaticFontRegistryToUserFontRegistry(const WebKit::SandboxExtension::Handle&amp; fontMachExtensionHandle)
&gt; 
&gt; What is the point of changing this to an l-value? In general, handles should
&gt; always be passed by r-value.

Ah, good point. I have reverted back to the previous signature.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780483</commentid>
    <comment_count>5</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-07-29 11:45:07 -0700</bug_when>
    <thetext>Does this actually improve performance on OSes which have a static registry?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780497</commentid>
    <comment_count>6</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-07-29 12:04:47 -0700</bug_when>
    <thetext>(In reply to Myles C. Maxfield from comment #5)
&gt; Does this actually improve performance on OSes which have a static registry?

Good point, I will start testing this now.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780532</commentid>
    <comment_count>7</comment_count>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-07-29 13:17:27 -0700</bug_when>
    <thetext>My review+ assumes that this works as expected and improves performance.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780542</commentid>
    <comment_count>8</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-07-29 13:30:42 -0700</bug_when>
    <thetext>(In reply to Darin Adler from comment #7)
&gt; My review+ assumes that this works as expected and improves performance.

Will test performance before landing.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781115</commentid>
    <comment_count>9</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2021-07-31 18:12:10 -0700</bug_when>
    <thetext>*** Bug 228583 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781285</commentid>
    <comment_count>10</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-08-02 09:56:37 -0700</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #8)
&gt; (In reply to Darin Adler from comment #7)
&gt; &gt; My review+ assumes that this works as expected and improves performance.
&gt; 
&gt; Will test performance before landing.
&gt; 
&gt; Thanks for reviewing!

Landing just the sandbox extension bits, since re-enabling the font pre-warming does not show a meaningful performance improvement.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781286</commentid>
    <comment_count>11</comment_count>
      <attachid>434765</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-08-02 09:59:15 -0700</bug_when>
    <thetext>Created attachment 434765
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781301</commentid>
    <comment_count>12</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-02 10:29:12 -0700</bug_when>
    <thetext>Committed r280542 (240169@main): &lt;https://commits.webkit.org/240169@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 434765.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781302</commentid>
    <comment_count>13</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-08-02 10:30:18 -0700</bug_when>
    <thetext>&lt;rdar://problem/81418101&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434521</attachid>
            <date>2021-07-29 08:30:14 -0700</date>
            <delta_ts>2021-07-29 11:02:31 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228584-20210729083013.patch</filename>
            <type>text/plain</type>
            <size>4417</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3OTEwNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA3LTI5ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFJlZW5hYmxl
IGZvbnQgcHJlLXdhcm1pbmcgZm9yIHByZS13YXJtZWQgV2ViQ29udGVudCBwcm9jZXNzZXMKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODU4NAorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjb21taXQg
aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI3Mjk5OS93ZWJraXQgZGlzYWJsZWQg
dGhpcywgYnV0IGFmdGVyIGFkb3B0aW5nIEFQSSB0byBzd2l0Y2ggZnJvbQorICAgICAgICBzdGF0
aWMgZm9udCByZWdpc3RyeSB0byB1c2VyIGZvbnQgcmVnaXN0cnksIHRoaXMgY2FuIGJlIHJlLWVu
YWJsZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3Rz
LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpwcmV3YXJtR2xvYmFsbHkpOgorCiAy
MDIxLTA2LTIxICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAgICAg
U2FmYXJpIDE1IGJyZWFrcyBhbGwgV2ViIEF1ZGlvIGNvbnRlbnQgdXNpbmcgV2ViTSBPcHVzCklu
ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3Jl
VGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv
Y29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCShyZXZpc2lvbiAyNzkxMDQpCisrKyBTb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAJKHdv
cmtpbmcgY29weSkKQEAgLTE1ODQsNyArMTU4NCw2IEBAIHZvaWQgRm9udENhY2hlOjpwcmV3YXJt
KGNvbnN0IFByZXdhcm1JbmYKIAogdm9pZCBGb250Q2FjaGU6OnByZXdhcm1HbG9iYWxseSgpCiB7
Ci0jaWYgIUhBVkUoU1RBVElDX0ZPTlRfUkVHSVNUUlkpCiAgICAgaWYgKE1lbW9yeVByZXNzdXJl
SGFuZGxlcjo6c2luZ2xldG9uKCkuaXNVbmRlck1lbW9yeVByZXNzdXJlKCkpCiAgICAgICAgIHJl
dHVybjsKIApAQCAtMTYwNCw3ICsxNjAzLDYgQEAgdm9pZCBGb250Q2FjaGU6OnByZXdhcm1HbG9i
YWxseSgpCiAgICAgRm9udENhY2hlOjpQcmV3YXJtSW5mb3JtYXRpb24gcHJld2FybUluZm87CiAg
ICAgcHJld2FybUluZm8uc2VlbkZhbWlsaWVzID0gV1RGTW92ZShmYW1pbGllcyk7CiAgICAgRm9u
dENhY2hlOjpzaW5nbGV0b24oKS5wcmV3YXJtKHByZXdhcm1JbmZvKTsKLSNlbmRpZgogfQogCiB9
CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjgwNDIzKQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VM
b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wNy0yOSAgUGVyIEFybmUg
Vm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBSZWVuYWJsZSBm
b250IHByZS13YXJtaW5nIGZvciBwcmUtd2FybWVkIFdlYkNvbnRlbnQgcHJvY2Vzc2VzCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg1ODQKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdW5uZWVk
ZWQgc2FuZGJveCBleHRlbnNpb24gaGFuZGxlIG1lbWJlciwgc2luY2UgdGhpcyBleHRlbnNpb24g
aXMgbmV2ZXIgcmV2b2tlZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgor
ICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAo
V2ViS2l0OjpXZWJQcm9jZXNzOjpzd2l0Y2hGcm9tU3RhdGljRm9udFJlZ2lzdHJ5VG9Vc2VyRm9u
dFJlZ2lzdHJ5KToKKwogMjAyMS0wNy0yOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j
b20+CiAKICAgICAgICAgTmV0d29ya1JUQ1VEUFNvY2tldENvY29hQ29ubmVjdGlvbnMgbndfbGlz
dGVuZXJfc2V0X3N0YXRlX2NoYW5nZWRfaGFuZGxlciBjYWxsYmFjayBzaG91bGQgaG9sZCBhIHJl
ZmVyZW5jZSB0byBpdHMgbGlzdGVuZXIKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X
ZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy
b2Nlc3MuaAkocmV2aXNpb24gMjc5MTA0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YlByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzY2LDcgKzM2Niw3IEBAIHB1YmxpYzoKIAog
ICAgIHZvaWQgZ3JhbnRBY2Nlc3NUb0Fzc2V0U2VydmljZXMoV2ViS2l0OjpTYW5kYm94RXh0ZW5z
aW9uOjpIYW5kbGUmJiBtb2JpbGVBc3NldFYySGFuZGxlKTsKICAgICB2b2lkIHJldm9rZUFjY2Vz
c1RvQXNzZXRTZXJ2aWNlcygpOwotICAgIHZvaWQgc3dpdGNoRnJvbVN0YXRpY0ZvbnRSZWdpc3Ry
eVRvVXNlckZvbnRSZWdpc3RyeShXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYmIGZv
bnRNYWNoRXh0ZW5zaW9uSGFuZGxlKTsKKyAgICB2b2lkIHN3aXRjaEZyb21TdGF0aWNGb250UmVn
aXN0cnlUb1VzZXJGb250UmVnaXN0cnkoY29uc3QgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpI
YW5kbGUmIGZvbnRNYWNoRXh0ZW5zaW9uSGFuZGxlKTsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAg
ICB2b2lkIHVwZGF0ZVBhZ2VTY3JlZW5Qcm9wZXJ0aWVzKCk7CkBAIC03MzksNyArNzM5LDYgQEAg
cHJpdmF0ZToKICNlbmRpZgogCiAgICAgUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+IG1fYXNzZXRT
ZXJ2aWNlVjJFeHRlbnNpb247Ci0gICAgUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+IG1fZm9udE1h
Y2hFeHRlbnNpb247CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBIYXNoQ291bnRlZFNldDxT
dHJpbmc+IG1fcGVuZGluZ1Bhc3RlYm9hcmRXcml0ZUNvdW50czsKSW5kZXg6IFNvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0KPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQkocmV2aXNpb24g
Mjc5MTA0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv
YS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTI3OSwxMiArMTI3OSw5IEBAIHZvaWQgV2ViUHJvY2Vz
czo6cmV2b2tlQWNjZXNzVG9Bc3NldFNlcnYKICAgICBtX2Fzc2V0U2VydmljZVYyRXh0ZW5zaW9u
ID0gbnVsbHB0cjsKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjpzd2l0Y2hGcm9tU3RhdGljRm9udFJl
Z2lzdHJ5VG9Vc2VyRm9udFJlZ2lzdHJ5KFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxl
JiYgZm9udE1hY2hFeHRlbnNpb25IYW5kbGUpCit2b2lkIFdlYlByb2Nlc3M6OnN3aXRjaEZyb21T
dGF0aWNGb250UmVnaXN0cnlUb1VzZXJGb250UmVnaXN0cnkoY29uc3QgV2ViS2l0OjpTYW5kYm94
RXh0ZW5zaW9uOjpIYW5kbGUmIGZvbnRNYWNoRXh0ZW5zaW9uSGFuZGxlKQogewotICAgIGlmICht
X2ZvbnRNYWNoRXh0ZW5zaW9uKQotICAgICAgICByZXR1cm47Ci0gICAgbV9mb250TWFjaEV4dGVu
c2lvbiA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShXVEZNb3ZlKGZvbnRNYWNoRXh0ZW5zaW9u
SGFuZGxlKSk7Ci0gICAgbV9mb250TWFjaEV4dGVuc2lvbi0+Y29uc3VtZSgpOworICAgIFNhbmRi
b3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShmb250TWFjaEV4dGVuc2lvbkhhbmRsZSk7
CiAjaWYgSEFWRShTVEFUSUNfRk9OVF9SRUdJU1RSWSkKICAgICBDVEZvbnRNYW5hZ2VyRW5hYmxl
QWxsVXNlckZvbnRzKHRydWUpOwogI2VuZGlmCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434537</attachid>
            <date>2021-07-29 11:02:33 -0700</date>
            <delta_ts>2021-07-29 13:15:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228584-20210729110232.patch</filename>
            <type>text/plain</type>
            <size>3775</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3OTEwNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA3LTI5ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFJlZW5hYmxl
IGZvbnQgcHJlLXdhcm1pbmcgZm9yIHByZS13YXJtZWQgV2ViQ29udGVudCBwcm9jZXNzZXMKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODU4NAorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjb21taXQg
aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI3Mjk5OS93ZWJraXQgZGlzYWJsZWQg
dGhpcywgYnV0IGFmdGVyIGFkb3B0aW5nIEFQSSB0byBzd2l0Y2ggZnJvbQorICAgICAgICBzdGF0
aWMgZm9udCByZWdpc3RyeSB0byB1c2VyIGZvbnQgcmVnaXN0cnksIHRoaXMgY2FuIGJlIHJlLWVu
YWJsZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3Rz
LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpwcmV3YXJtR2xvYmFsbHkpOgorCiAy
MDIxLTA2LTIxICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAgICAg
U2FmYXJpIDE1IGJyZWFrcyBhbGwgV2ViIEF1ZGlvIGNvbnRlbnQgdXNpbmcgV2ViTSBPcHVzCklu
ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3Jl
VGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv
Y29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCShyZXZpc2lvbiAyNzkxMDQpCisrKyBTb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAJKHdv
cmtpbmcgY29weSkKQEAgLTE1ODQsNyArMTU4NCw2IEBAIHZvaWQgRm9udENhY2hlOjpwcmV3YXJt
KGNvbnN0IFByZXdhcm1JbmYKIAogdm9pZCBGb250Q2FjaGU6OnByZXdhcm1HbG9iYWxseSgpCiB7
Ci0jaWYgIUhBVkUoU1RBVElDX0ZPTlRfUkVHSVNUUlkpCiAgICAgaWYgKE1lbW9yeVByZXNzdXJl
SGFuZGxlcjo6c2luZ2xldG9uKCkuaXNVbmRlck1lbW9yeVByZXNzdXJlKCkpCiAgICAgICAgIHJl
dHVybjsKIApAQCAtMTYwNCw3ICsxNjAzLDYgQEAgdm9pZCBGb250Q2FjaGU6OnByZXdhcm1HbG9i
YWxseSgpCiAgICAgRm9udENhY2hlOjpQcmV3YXJtSW5mb3JtYXRpb24gcHJld2FybUluZm87CiAg
ICAgcHJld2FybUluZm8uc2VlbkZhbWlsaWVzID0gV1RGTW92ZShmYW1pbGllcyk7CiAgICAgRm9u
dENhY2hlOjpzaW5nbGV0b24oKS5wcmV3YXJtKHByZXdhcm1JbmZvKTsKLSNlbmRpZgogfQogCiB9
CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjgwNDIzKQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VM
b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wNy0yOSAgUGVyIEFybmUg
Vm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBSZWVuYWJsZSBm
b250IHByZS13YXJtaW5nIGZvciBwcmUtd2FybWVkIFdlYkNvbnRlbnQgcHJvY2Vzc2VzCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg1ODQKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdW5uZWVk
ZWQgc2FuZGJveCBleHRlbnNpb24gaGFuZGxlIG1lbWJlciwgc2luY2UgdGhpcyBleHRlbnNpb24g
aXMgbmV2ZXIgcmV2b2tlZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgor
ICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAo
V2ViS2l0OjpXZWJQcm9jZXNzOjpzd2l0Y2hGcm9tU3RhdGljRm9udFJlZ2lzdHJ5VG9Vc2VyRm9u
dFJlZ2lzdHJ5KToKKwogMjAyMS0wNy0yOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j
b20+CiAKICAgICAgICAgTmV0d29ya1JUQ1VEUFNvY2tldENvY29hQ29ubmVjdGlvbnMgbndfbGlz
dGVuZXJfc2V0X3N0YXRlX2NoYW5nZWRfaGFuZGxlciBjYWxsYmFjayBzaG91bGQgaG9sZCBhIHJl
ZmVyZW5jZSB0byBpdHMgbGlzdGVuZXIKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X
ZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy
b2Nlc3MuaAkocmV2aXNpb24gMjc5MTA0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YlByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtNzM5LDcgKzczOSw2IEBAIHByaXZhdGU6CiAj
ZW5kaWYKIAogICAgIFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiBtX2Fzc2V0U2VydmljZVYyRXh0
ZW5zaW9uOwotICAgIFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiBtX2ZvbnRNYWNoRXh0ZW5zaW9u
OwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgSGFzaENvdW50ZWRTZXQ8U3RyaW5nPiBtX3Bl
bmRpbmdQYXN0ZWJvYXJkV3JpdGVDb3VudHM7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl
c3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI3OTEwNCkKKysr
IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtp
bmcgY29weSkKQEAgLTEyODEsMTAgKzEyODEsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnJldm9rZUFj
Y2Vzc1RvQXNzZXRTZXJ2CiAKIHZvaWQgV2ViUHJvY2Vzczo6c3dpdGNoRnJvbVN0YXRpY0ZvbnRS
ZWdpc3RyeVRvVXNlckZvbnRSZWdpc3RyeShXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRs
ZSYmIGZvbnRNYWNoRXh0ZW5zaW9uSGFuZGxlKQogewotICAgIGlmIChtX2ZvbnRNYWNoRXh0ZW5z
aW9uKQotICAgICAgICByZXR1cm47Ci0gICAgbV9mb250TWFjaEV4dGVuc2lvbiA9IFNhbmRib3hF
eHRlbnNpb246OmNyZWF0ZShXVEZNb3ZlKGZvbnRNYWNoRXh0ZW5zaW9uSGFuZGxlKSk7Ci0gICAg
bV9mb250TWFjaEV4dGVuc2lvbi0+Y29uc3VtZSgpOworICAgIFNhbmRib3hFeHRlbnNpb246OmNv
bnN1bWVQZXJtYW5lbnRseShmb250TWFjaEV4dGVuc2lvbkhhbmRsZSk7CiAjaWYgSEFWRShTVEFU
SUNfRk9OVF9SRUdJU1RSWSkKICAgICBDVEZvbnRNYW5hZ2VyRW5hYmxlQWxsVXNlckZvbnRzKHRy
dWUpOwogI2VuZGlmCg==
</data>
<flag name="review"
          id="457063"
          type_id="1"
          status="+"
          setter="darin"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434765</attachid>
            <date>2021-08-02 09:59:15 -0700</date>
            <delta_ts>2021-08-02 10:29:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228584-20210802095914.patch</filename>
            <type>text/plain</type>
            <size>2041</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODA0MDYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA4LTAyICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFJlbW92ZSB1bm5l
ZWRlZCBzYW5kYm94IGV4dGVuc2lvbiBtZW1iZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODU4NAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmlu
IEFkbGVyLgorCisgICAgICAgIFJlbW92ZSB1bm5lZWRlZCBzYW5kYm94IGV4dGVuc2lvbiBoYW5k
bGUgbWVtYmVyLCBzaW5jZSB0aGlzIGV4dGVuc2lvbiBpcyBuZXZlciByZXZva2VkLgorCisgICAg
ICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2Nv
YS9XZWJQcm9jZXNzQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnN3aXRj
aEZyb21TdGF0aWNGb250UmVnaXN0cnlUb1VzZXJGb250UmVnaXN0cnkpOgorCiAyMDIxLTA3LTI4
ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQ
VSBQcm9jZXNzXSBTdGFydCB0cmFja2luZyByZXNvdXJjZSB1c2VzIGZvciBJbWFnZUJ1ZmZlcnMK
SW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkocmV2aXNpb24gMjgwNDA2
KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkod29ya2luZyBjb3B5
KQpAQCAtNzQ5LDcgKzc0OSw2IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIFJlZlB0cjxTYW5k
Ym94RXh0ZW5zaW9uPiBtX2Fzc2V0U2VydmljZVYyRXh0ZW5zaW9uOwotICAgIFJlZlB0cjxTYW5k
Ym94RXh0ZW5zaW9uPiBtX2ZvbnRNYWNoRXh0ZW5zaW9uOwogCiAjaWYgUExBVEZPUk0oQ09DT0Ep
CiAgICAgSGFzaENvdW50ZWRTZXQ8U3RyaW5nPiBtX3BlbmRpbmdQYXN0ZWJvYXJkV3JpdGVDb3Vu
dHM7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29h
Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9j
ZXNzQ29jb2EubW0JKHJldmlzaW9uIDI4MDQwNikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyNjUsMTAgKzEy
NjUsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnJldm9rZUFjY2Vzc1RvQXNzZXRTZXJ2CiAKIHZvaWQg
V2ViUHJvY2Vzczo6c3dpdGNoRnJvbVN0YXRpY0ZvbnRSZWdpc3RyeVRvVXNlckZvbnRSZWdpc3Ry
eShXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYmIGZvbnRNYWNoRXh0ZW5zaW9uSGFu
ZGxlKQogewotICAgIGlmIChtX2ZvbnRNYWNoRXh0ZW5zaW9uKQotICAgICAgICByZXR1cm47Ci0g
ICAgbV9mb250TWFjaEV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShXVEZNb3Zl
KGZvbnRNYWNoRXh0ZW5zaW9uSGFuZGxlKSk7Ci0gICAgbV9mb250TWFjaEV4dGVuc2lvbi0+Y29u
c3VtZSgpOworICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShmb250TWFj
aEV4dGVuc2lvbkhhbmRsZSk7CiAjaWYgSEFWRShTVEFUSUNfRk9OVF9SRUdJU1RSWSkKICAgICBD
VEZvbnRNYW5hZ2VyRW5hYmxlQWxsVXNlckZvbnRzKHRydWUpOwogI2VuZGlmCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>