<?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>225726</bug_id>
          
          <creation_ts>2021-05-12 18:05:19 -0700</creation_ts>
          <short_desc>[macOS] experimental &quot;Use theme color for scroll area background&quot; isn&apos;t working</short_desc>
          <delta_ts>2021-05-13 16:11:17 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Devin Rousso">hi</reporter>
          <assigned_to name="Devin Rousso">hi</assigned_to>
          <cc>bdakin</cc>
    
    <cc>changseok</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fred.wang</cc>
    
    <cc>glenn</cc>
    
    <cc>hi</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</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>1759485</commentid>
    <comment_count>0</comment_count>
    <who name="Devin Rousso">hi</who>
    <bug_when>2021-05-12 18:05:19 -0700</bug_when>
    <thetext>.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1759486</commentid>
    <comment_count>1</comment_count>
    <who name="Devin Rousso">hi</who>
    <bug_when>2021-05-12 18:05:35 -0700</bug_when>
    <thetext>&lt;rdar://problem/77933000&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1759488</commentid>
    <comment_count>2</comment_count>
      <attachid>428442</attachid>
    <who name="Devin Rousso">hi</who>
    <bug_when>2021-05-12 18:09:07 -0700</bug_when>
    <thetext>Created attachment 428442
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1759503</commentid>
    <comment_count>3</comment_count>
      <attachid>428442</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-05-12 19:34:55 -0700</bug_when>
    <thetext>Comment on attachment 428442
Patch

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

&gt; Source/WebCore/rendering/RenderLayerCompositor.cpp:-3997
&gt; -                m_layerForOverhangAreas-&gt;setCustomAppearance(GraphicsLayer::CustomAppearance::ScrollingOverhang);

&quot;CustomAppearance::ScrollingOverhang&quot; can we get rid of this now?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1759517</commentid>
    <comment_count>4</comment_count>
      <attachid>428442</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-05-12 20:38:05 -0700</bug_when>
    <thetext>Comment on attachment 428442
Patch

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

&gt; Source/WebCore/rendering/RenderLayerCompositor.cpp:3889
&gt; +        if (page().settings().useThemeColorForScrollAreaBackgroundColor())
&gt; +            backgroundColor = page().themeColor();
&gt; +        if (page().settings().useSampledPageTopColorForScrollAreaBackgroundColor() &amp;&amp; !backgroundColor.isValid())
&gt; +            backgroundColor = page().sampledPageTopColor();
&gt; +        if (!backgroundColor.isValid())
&gt; +            backgroundColor = m_rootExtendedBackgroundColor;

Would be nicer to wrap this in a lambda that returns a Color.

&gt;&gt; Source/WebCore/rendering/RenderLayerCompositor.cpp:-3997
&gt;&gt; -                m_layerForOverhangAreas-&gt;setCustomAppearance(GraphicsLayer::CustomAppearance::ScrollingOverhang);
&gt; 
&gt; &quot;CustomAppearance::ScrollingOverhang&quot; can we get rid of this now?

It seems no? The backgroundShouldExtendBeyondPage setting has a default value of false.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1759534</commentid>
    <comment_count>5</comment_count>
      <attachid>428442</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-05-12 21:09:49 -0700</bug_when>
    <thetext>Comment on attachment 428442
Patch

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

&gt;&gt;&gt; Source/WebCore/rendering/RenderLayerCompositor.cpp:-3997
&gt;&gt;&gt; -                m_layerForOverhangAreas-&gt;setCustomAppearance(GraphicsLayer::CustomAppearance::ScrollingOverhang);
&gt;&gt; 
&gt;&gt; &quot;CustomAppearance::ScrollingOverhang&quot; can we get rid of this now?
&gt; 
&gt; It seems no? The backgroundShouldExtendBeyondPage setting has a default value of false.

OH, I missed the code in updateLayerForOverhangAreasBackgroundColor that sets it, and thought this removed the setCustomAppearance() :D</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1759852</commentid>
    <comment_count>6</comment_count>
      <attachid>428567</attachid>
    <who name="Devin Rousso">hi</who>
    <bug_when>2021-05-13 15:06:59 -0700</bug_when>
    <thetext>Created attachment 428567
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1759872</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-05-13 16:11:14 -0700</bug_when>
    <thetext>Committed r277459 (237703@main): &lt;https://commits.webkit.org/237703@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 428567.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>428442</attachid>
            <date>2021-05-12 18:09:07 -0700</date>
            <delta_ts>2021-05-13 15:06:59 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225726-20210512190906.patch</filename>
            <type>text/plain</type>
            <size>3613</size>
            <attacher name="Devin Rousso">hi</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZwppbmRleCBjMzE0OWZkN2VhZWRhNmQ4MzUwZDVkNjhiMWIzNTg2NWZjZTU2NDZhLi41
NTkzZGM1NWZkZGFmMjk2YTljZGJkNWVjZGI5MWU0MTgyMTZkMmQ2IDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x
LDMgKzEsMTggQEAKKzIwMjEtMDUtMTIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t
PgorCisgICAgICAgIFttYWNPU10gZXhwZXJpbWVudGFsICJVc2UgdGhlbWUgY29sb3IgZm9yIHNj
cm9sbCBhcmVhIGJhY2tncm91bmQiIGlzbid0IHdvcmtpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTcyNgorICAgICAgICA8cmRhcjovL3Byb2Js
ZW0vNzc5MzMwMDA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFz
QmFja2dyb3VuZENvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRv
cjo6dXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycyk6CisgICAgICAgIEZpeCBsYXN0IHJlbWFp
bmluZyBgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEJhY2tncm91bmRDb2xvcmAgdG8gdXNl
IHRoZSBoZWxwZXIgZnVuY3Rpb24KKyAgICAgICAgYFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBk
YXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yYCBpbnN0ZWFkIHNvIHRoYXQg
YWxsCisgICAgICAgIHBhdGhzIHRoYXQgdXBkYXRlIHRoZSBvdmVyc2Nyb2xsIGFyZWEgY29sb3Ig
Y2hlY2sgdGhlIGV4cGVyaW1lbnRhbCBzZXR0aW5ncyB0b28uCisKIDIwMjEtMDUtMTIgIEplciBO
b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgSFRNTE1lZGlhRWxlbWVudDo6
bWVkaWFMb2FkaW5nRmFpbGVkRmF0YWxseSgpIGRvZXMgZGlyZWN0IGRpc3BhdGNoIG9mIGV2ZW50
czsgc2hvdWxkIGVucXVldWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggOWIxNzBkZWZkMDYzYmM3NjNmMWUzZjQ2NmJkZmEw
N2YxNGFhYTYyYy4uNjk4ZTZlNjRlOWFkYTE3MGZhY2RkYTQ0OTc0MGVhMGI1NmE5ZTk1MSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j
cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j
cHAKQEAgLTM4NzksMTQgKzM4NzksMTYgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVw
ZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0JhY2tncm91bmRDb2xvcigpCiAgICAgICAgIHJldHVy
bjsKIAogICAgIENvbG9yIGJhY2tncm91bmRDb2xvcjsKLSAgICBpZiAocGFnZSgpLnNldHRpbmdz
KCkudXNlVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSkKLSAgICAgICAg
YmFja2dyb3VuZENvbG9yID0gcGFnZSgpLnRoZW1lQ29sb3IoKTsKLSAgICBpZiAocGFnZSgpLnNl
dHRpbmdzKCkudXNlU2FtcGxlZFBhZ2VUb3BDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29s
b3IoKSAmJiAhYmFja2dyb3VuZENvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgYmFja2dyb3VuZENv
bG9yID0gcGFnZSgpLnNhbXBsZWRQYWdlVG9wQ29sb3IoKTsKLSAgICBpZiAoIWJhY2tncm91bmRD
b2xvci5pc1ZhbGlkKCkpCi0gICAgICAgIGJhY2tncm91bmRDb2xvciA9IG1fcm9vdEV4dGVuZGVk
QmFja2dyb3VuZENvbG9yOwogCi0gICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEJhY2tn
cm91bmRDb2xvcihiYWNrZ3JvdW5kQ29sb3IpOworICAgIGlmIChtX3JlbmRlclZpZXcuc2V0dGlu
Z3MoKS5iYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZSgpKSB7CisgICAgICAgIGlmIChw
YWdlKCkuc2V0dGluZ3MoKS51c2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xv
cigpKQorICAgICAgICAgICAgYmFja2dyb3VuZENvbG9yID0gcGFnZSgpLnRoZW1lQ29sb3IoKTsK
KyAgICAgICAgaWYgKHBhZ2UoKS5zZXR0aW5ncygpLnVzZVNhbXBsZWRQYWdlVG9wQ29sb3JGb3JT
Y3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkgJiYgIWJhY2tncm91bmRDb2xvci5pc1ZhbGlkKCkp
CisgICAgICAgICAgICBiYWNrZ3JvdW5kQ29sb3IgPSBwYWdlKCkuc2FtcGxlZFBhZ2VUb3BDb2xv
cigpOworICAgICAgICBpZiAoIWJhY2tncm91bmRDb2xvci5pc1ZhbGlkKCkpCisgICAgICAgICAg
ICBiYWNrZ3JvdW5kQ29sb3IgPSBtX3Jvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsKKyAgICAg
ICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEJhY2tncm91bmRDb2xvcihiYWNrZ3JvdW5k
Q29sb3IpOworICAgIH0KIAogICAgIGlmICghYmFja2dyb3VuZENvbG9yLmlzVmFsaWQoKSkKICAg
ICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEN1c3RvbUFwcGVhcmFuY2UoR3JhcGhp
Y3NMYXllcjo6Q3VzdG9tQXBwZWFyYW5jZTo6U2Nyb2xsaW5nT3ZlcmhhbmcpOwpAQCAtMzk5MCwx
MSArMzk5Miw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVPdmVyZmxvd0Nv
bnRyb2xzTGF5ZXJzKCkKICAgICAgICAgICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRT
aXplKG92ZXJoYW5nQXJlYVNpemUpOwogICAgICAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJl
YXMtPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoMCwgdG9wQ29udGVudEluc2V0KSk7CiAgICAgICAg
ICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+c2V0QW5jaG9yUG9pbnQoRmxvYXRQb2ludDNE
KCkpOwotCi0gICAgICAgICAgICBpZiAobV9yZW5kZXJWaWV3LnNldHRpbmdzKCkuYmFja2dyb3Vu
ZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UoKSkKLSAgICAgICAgICAgICAgICBtX2xheWVyRm9yT3Zl
cmhhbmdBcmVhcy0+c2V0QmFja2dyb3VuZENvbG9yKG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKS5k
b2N1bWVudEJhY2tncm91bmRDb2xvcigpKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAg
ICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+c2V0Q3VzdG9tQXBwZWFyYW5jZShHcmFwaGlj
c0xheWVyOjpDdXN0b21BcHBlYXJhbmNlOjpTY3JvbGxpbmdPdmVyaGFuZyk7CisgICAgICAgICAg
ICB1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5kQ29sb3IoKTsKIAogICAgICAg
ICAgICAgLy8gV2Ugd2FudCB0aGUgb3ZlcmhhbmcgYXJlYXMgbGF5ZXIgdG8gYmUgcG9zaXRpb25l
ZCBiZWxvdyB0aGUgZnJhbWUgY29udGVudHMsCiAgICAgICAgICAgICAvLyBzbyBpbnNlcnQgaXQg
YmVsb3cgdGhlIGNsaXAgbGF5ZXIuCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>428567</attachid>
            <date>2021-05-13 15:06:59 -0700</date>
            <delta_ts>2021-05-13 16:11:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>225726.diff</filename>
            <type>text/plain</type>
            <size>3644</size>
            <attacher name="Devin Rousso">hi</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZwppbmRleCAzZGQyOWZiNDRkYmQuLjMyZjNiMDA1YjUxYyAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt
MSwzICsxLDE4IEBACisyMDIxLTA1LTEyICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv
bT4KKworICAgICAgICBbbWFjT1NdIGV4cGVyaW1lbnRhbCAiVXNlIHRoZW1lIGNvbG9yIGZvciBz
Y3JvbGwgYXJlYSBiYWNrZ3JvdW5kIiBpc24ndCB3b3JraW5nCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU3MjYKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzc3OTMzMDAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVh
c0JhY2tncm91bmRDb2xvcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0
b3I6OnVwZGF0ZU92ZXJmbG93Q29udHJvbHNMYXllcnMpOgorICAgICAgICBGaXggbGFzdCByZW1h
aW5pbmcgYG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRCYWNrZ3JvdW5kQ29sb3JgIHRvIHVz
ZSB0aGUgaGVscGVyIGZ1bmN0aW9uCisgICAgICAgIGBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVw
ZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0JhY2tncm91bmRDb2xvcmAgaW5zdGVhZCBzbyB0aGF0
IGFsbAorICAgICAgICBwYXRocyB0aGF0IHVwZGF0ZSB0aGUgb3ZlcnNjcm9sbCBhcmVhIGNvbG9y
IGNoZWNrIHRoZSBleHBlcmltZW50YWwgc2V0dGluZ3MgdG9vLgorCiAyMDIxLTA1LTEyICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgTm90aWZpY2F0aW9uLnJlcXVl
c3RQZXJtaXNzaW9uKCkgc2hvdWxkIHJldHVybiBhIFByb21pc2UKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggOWIxNzBkZWZk
MDYzLi5lNDY4NGU4M2IxZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0zODc5LDE0ICszODc5LDIzIEBAIHZvaWQgUmVu
ZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5k
Q29sb3IoKQogICAgICAgICByZXR1cm47CiAKICAgICBDb2xvciBiYWNrZ3JvdW5kQ29sb3I7Ci0g
ICAgaWYgKHBhZ2UoKS5zZXR0aW5ncygpLnVzZVRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dy
b3VuZENvbG9yKCkpCi0gICAgICAgIGJhY2tncm91bmRDb2xvciA9IHBhZ2UoKS50aGVtZUNvbG9y
KCk7Ci0gICAgaWYgKHBhZ2UoKS5zZXR0aW5ncygpLnVzZVNhbXBsZWRQYWdlVG9wQ29sb3JGb3JT
Y3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkgJiYgIWJhY2tncm91bmRDb2xvci5pc1ZhbGlkKCkp
Ci0gICAgICAgIGJhY2tncm91bmRDb2xvciA9IHBhZ2UoKS5zYW1wbGVkUGFnZVRvcENvbG9yKCk7
Ci0gICAgaWYgKCFiYWNrZ3JvdW5kQ29sb3IuaXNWYWxpZCgpKQotICAgICAgICBiYWNrZ3JvdW5k
Q29sb3IgPSBtX3Jvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsKIAotICAgIG1fbGF5ZXJGb3JP
dmVyaGFuZ0FyZWFzLT5zZXRCYWNrZ3JvdW5kQ29sb3IoYmFja2dyb3VuZENvbG9yKTsKKyAgICBp
ZiAobV9yZW5kZXJWaWV3LnNldHRpbmdzKCkuYmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9uZFBh
Z2UoKSkgeworICAgICAgICBiYWNrZ3JvdW5kQ29sb3IgPSAoWyZdIHsKKyAgICAgICAgICAgIGlm
IChwYWdlKCkuc2V0dGluZ3MoKS51c2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRD
b2xvcigpKSB7CisgICAgICAgICAgICAgICAgaWYgKGF1dG8gdGhlbWVDb2xvciA9IHBhZ2UoKS50
aGVtZUNvbG9yKCk7IHRoZW1lQ29sb3IuaXNWYWxpZCgpKQorICAgICAgICAgICAgICAgICAgICBy
ZXR1cm4gdGhlbWVDb2xvcjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKHBhZ2Uo
KS5zZXR0aW5ncygpLnVzZVNhbXBsZWRQYWdlVG9wQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3Vu
ZENvbG9yKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoYXV0byBzYW1wbGVkUGFnZVRvcENvbG9y
ID0gcGFnZSgpLnNhbXBsZWRQYWdlVG9wQ29sb3IoKTsgc2FtcGxlZFBhZ2VUb3BDb2xvci5pc1Zh
bGlkKCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBzYW1wbGVkUGFnZVRvcENvbG9yOwor
ICAgICAgICAgICAgfQorCisgICAgICAgICAgICByZXR1cm4gbV9yb290RXh0ZW5kZWRCYWNrZ3Jv
dW5kQ29sb3I7CisgICAgICAgIH0pKCk7CisgICAgICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFz
LT5zZXRCYWNrZ3JvdW5kQ29sb3IoYmFja2dyb3VuZENvbG9yKTsKKyAgICB9CiAKICAgICBpZiAo
IWJhY2tncm91bmRDb2xvci5pc1ZhbGlkKCkpCiAgICAgICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0Fy
ZWFzLT5zZXRDdXN0b21BcHBlYXJhbmNlKEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFwcGVhcmFuY2U6
OlNjcm9sbGluZ092ZXJoYW5nKTsKQEAgLTM5OTAsMTEgKzM5OTksNyBAQCB2b2lkIFJlbmRlckxh
eWVyQ29tcG9zaXRvcjo6dXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycygpCiAgICAgICAgICAg
ICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+c2V0U2l6ZShvdmVyaGFuZ0FyZWFTaXplKTsKICAg
ICAgICAgICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50
KDAsIHRvcENvbnRlbnRJbnNldCkpOwogICAgICAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJl
YXMtPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQzRCgpKTsKLQotICAgICAgICAgICAgaWYgKG1f
cmVuZGVyVmlldy5zZXR0aW5ncygpLmJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlKCkp
Ci0gICAgICAgICAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEJhY2tncm91bmRD
b2xvcihtX3JlbmRlclZpZXcuZnJhbWVWaWV3KCkuZG9jdW1lbnRCYWNrZ3JvdW5kQ29sb3IoKSk7
Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJl
YXMtPnNldEN1c3RvbUFwcGVhcmFuY2UoR3JhcGhpY3NMYXllcjo6Q3VzdG9tQXBwZWFyYW5jZTo6
U2Nyb2xsaW5nT3ZlcmhhbmcpOworICAgICAgICAgICAgdXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0Fy
ZWFzQmFja2dyb3VuZENvbG9yKCk7CiAKICAgICAgICAgICAgIC8vIFdlIHdhbnQgdGhlIG92ZXJo
YW5nIGFyZWFzIGxheWVyIHRvIGJlIHBvc2l0aW9uZWQgYmVsb3cgdGhlIGZyYW1lIGNvbnRlbnRz
LAogICAgICAgICAgICAgLy8gc28gaW5zZXJ0IGl0IGJlbG93IHRoZSBjbGlwIGxheWVyLgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>