<?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>224883</bug_id>
          
          <creation_ts>2021-04-21 12:05:13 -0700</creation_ts>
          <short_desc>Introduce helper methods to map FloatQuads to and from content and root view coordinates</short_desc>
          <delta_ts>2021-04-22 19:33:27 -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>WebCore 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="Wenson Hsieh">wenson_hsieh</reporter>
          <assigned_to name="Wenson Hsieh">wenson_hsieh</assigned_to>
          <cc>darin</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>hi</cc>
    
    <cc>joepeck</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>1752847</commentid>
    <comment_count>0</comment_count>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-04-21 12:05:13 -0700</bug_when>
    <thetext>.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1752895</commentid>
    <comment_count>1</comment_count>
      <attachid>426735</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-04-21 13:15:06 -0700</bug_when>
    <thetext>Created attachment 426735
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1752963</commentid>
    <comment_count>2</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-21 16:06:57 -0700</bug_when>
    <thetext>Committed r276397 (236872@main): &lt;https://commits.webkit.org/236872@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 426735.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753359</commentid>
    <comment_count>3</comment_count>
      <attachid>426735</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-04-22 16:51:19 -0700</bug_when>
    <thetext>Comment on attachment 426735
Patch

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

&gt; Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:1076
&gt; +            for (size_t i = 0; i &lt; quads.size(); ++i)
&gt; +                quads[i] = view-&gt;contentsToRootView(quads[i]);

range-based for loop here:

    for (auto&amp; quad : quads)
        quad = -&gt;contentsToRootView(quad);</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753385</commentid>
    <comment_count>4</comment_count>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-04-22 17:13:38 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753386</commentid>
    <comment_count>5</comment_count>
      <attachid>426870</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-04-22 17:13:39 -0700</bug_when>
    <thetext>Created attachment 426870
Followup tweak</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753407</commentid>
    <comment_count>6</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-04-22 17:52:06 -0700</bug_when>
    <thetext>&lt;rdar://problem/77048060&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753439</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-22 19:33:26 -0700</bug_when>
    <thetext>Committed r276480 (236939@main): &lt;https://commits.webkit.org/236939@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 426870.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426735</attachid>
            <date>2021-04-21 13:15:06 -0700</date>
            <delta_ts>2021-04-21 16:06:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224883-20210421131505.patch</filename>
            <type>text/plain</type>
            <size>9796</size>
            <attacher name="Wenson Hsieh">wenson_hsieh</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDgwYzU3MzU2NzU3Njkx
Mjg2OThlMWU4YWQyZDA3YmQxNmU3MWQzNy4uMmNiMGJiMmFlOTc5YWU5YjkzMTYyNmM4ZTRiNDE2
OTVlNDBmZjAxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA0LTIxICBXZW5z
b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEludHJvZHVjZSBo
ZWxwZXIgbWV0aG9kcyB0byBtYXAgRmxvYXRRdWFkcyB0byBhbmQgZnJvbSBjb250ZW50IGFuZCBy
b290IHZpZXcgY29vcmRpbmF0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIyNDg4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgIEFkZCBuZXcgaGVscGVyIG1ldGhvZHMgdG8gdHJhbnNmb3JtIEZsb2F0UXVh
ZHMgZnJvbSBjb250ZW50IGNvb3JkaW5hdGVzIHRvIHJvb3QgdmlldyBjb29yZGluYXRlcywgYW5k
IHZpY2UKKyAgICAgICAgdmVyc2E7IHVzZSB0aGVzZSBtZXRob2RzIGluIHNldmVyYWwgcGxhY2Vz
IHRocm91Z2hvdXQgV2ViS2l0IHRvIGF2b2lkIGNvZGUgZHVwbGljYXRpb24uCisKKyAgICAgICAg
Tm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNw
ZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVs
aW5lQWdlbnQ6OmRpZFBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5l
QWdlbnQ6OmxvY2FsVG9QYWdlUXVhZCk6IERlbGV0ZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Fn
ZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50Lmg6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xs
Vmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojpyb290Vmlld1RvQ29udGVu
dHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6Y29udGVudHNUb1Jvb3RW
aWV3IGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6CisKIDIwMjEtMDQt
MjEgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lP
U10gVGV4dCBzZWxlY3Rpb24gaW4gaW1hZ2Ugb3ZlcmxheXMgc2hvdWxkIG5vdCBiZSBsaW1pdGVk
IHRvIHJlY3RpbGluZWFyIHF1YWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv
ZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA3NmJmNzljNDI1ODA5NGE3YzkwM2Zi
Nzg2YTg0NDdmMmQ1NWFlZGQuLjZlOTA5MzM5OGFhYzk4YjBkMjM3MzdjMWVjNDJlN2M5NzNjYjEx
NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDQtMjEgIFdlbnNvbiBIc2llaCAg
PHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgSW50cm9kdWNlIGhlbHBlciBtZXRo
b2RzIHRvIG1hcCBGbG9hdFF1YWRzIHRvIGFuZCBmcm9tIGNvbnRlbnQgYW5kIHJvb3QgdmlldyBj
b29yZGluYXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjI0ODgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgVXNlIHRoZSBuZXcgaGVscGVyIG1ldGhvZHMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl
YlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OmNvbnZlcnRDb250ZW50
VG9Sb290Vmlldyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNlbmRUYXBIaWdobGlnaHRG
b3JOb2RlSWZOZWNlc3NhcnkpOgorCisgICAgICAgIE5vdGUgdGhhdCB3ZSBwcmV2aW91c2x5IHJv
dW5kZWQgYWJzb2x1dGUgcXVhZHMgdG8gdGhlIG5lYXJlc3QgaW50ZWdlciB3aGVuIG1hcHBpbmcg
dGhyb3VnaCByb290IHZpZXcKKyAgICAgICAgY29vcmRpbmF0ZXMuIEZyb20gPGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgyNzcjYzI+LCB0aGlzIHNlZW1lZCB1bmlu
dGVudGlvbmFsIHRvIGJlZ2luIHdpdGgsCisgICAgICAgIGFuZCB3ZSBzaG91bGQgYmUgYWJsZSB0
byB1c2UgdGhlIGBGbG9hdFBvaW50YCBjb252ZXJzaW9uIG1ldGhvZHMgaW5zdGVhZC4KKwogMjAy
MS0wNC0yMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAg
ICBbaU9TXSBUZXh0IHNlbGVjdGlvbiBpbiBpbWFnZSBvdmVybGF5cyBzaG91bGQgbm90IGJlIGxp
bWl0ZWQgdG8gcmVjdGlsaW5lYXIgcXVhZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu
c3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29y
ZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCmluZGV4IGNmNDZh
OTgzZmI3MGQ3YjljMWI5YjBmNTU4NjlhZTE3NGJjMDBlZDAuLjkwNmE4ZTg0M2JmNzQ1ZDBlNGQz
MGNkMWRlMjRiZWZlYzVjNTkwOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv
ci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv
aW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcApAQCAtNDMyLDkgKzQz
Miw4IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkUGFpbnQoUmVuZGVyT2JqZWN0
JiByZW5kZXJlciwgY29uc3QgTGF5b3V0UmVjdCYKIAogICAgIFRpbWVsaW5lUmVjb3JkRW50cnkm
IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0KCk7CiAgICAgQVNTRVJUKGVudHJ5LnR5cGUgPT0g
VGltZWxpbmVSZWNvcmRUeXBlOjpQYWludCk7Ci0gICAgRmxvYXRRdWFkIHF1YWQ7Ci0gICAgbG9j
YWxUb1BhZ2VRdWFkKHJlbmRlcmVyLCBjbGlwUmVjdCwgJnF1YWQpOwotICAgIGVudHJ5LmRhdGEg
PSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVBhaW50RGF0YShxdWFkKTsKKyAgICBhdXRv
IGNsaXBRdWFkSW5Sb290VmlldyA9IHJlbmRlcmVyLnZpZXcoKS5mcmFtZVZpZXcoKS5jb250ZW50
c1RvUm9vdFZpZXcocmVuZGVyZXIubG9jYWxUb0Fic29sdXRlUXVhZCh7IGNsaXBSZWN0IH0pKTsK
KyAgICBlbnRyeS5kYXRhID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVQYWludERhdGEo
Y2xpcFF1YWRJblJvb3RWaWV3KTsKICAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxp
bmVSZWNvcmRUeXBlOjpQYWludCk7CiB9CiAKQEAgLTgyMSwxNCArODIwLDQgQEAgdm9pZCBJbnNw
ZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ3VycmVudFJlY29yZChSZWY8SlNPTjo6T2JqZWN0PiYm
IGRhdGEsIFRpbWVsaW4KICAgICBwdXNoQ3VycmVudFJlY29yZChjcmVhdGVSZWNvcmRFbnRyeShX
VEZNb3ZlKGRhdGEpLCB0eXBlLCBjYXB0dXJlQ2FsbFN0YWNrLCBmcmFtZSkpOwogfQogCi12b2lk
IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmxvY2FsVG9QYWdlUXVhZChjb25zdCBSZW5kZXJPYmpl
Y3QmIHJlbmRlcmVyLCBjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBGbG9hdFF1YWQqIHF1YWQpCi17
Ci0gICAgY29uc3QgRnJhbWVWaWV3JiBmcmFtZVZpZXcgPSByZW5kZXJlci52aWV3KCkuZnJhbWVW
aWV3KCk7Ci0gICAgRmxvYXRRdWFkIGFic29sdXRlID0gcmVuZGVyZXIubG9jYWxUb0Fic29sdXRl
UXVhZChGbG9hdFF1YWQocmVjdCkpOwotICAgIHF1YWQtPnNldFAxKGZyYW1lVmlldy5jb250ZW50
c1RvUm9vdFZpZXcocm91bmRlZEludFBvaW50KGFic29sdXRlLnAxKCkpKSk7Ci0gICAgcXVhZC0+
c2V0UDIoZnJhbWVWaWV3LmNvbnRlbnRzVG9Sb290Vmlldyhyb3VuZGVkSW50UG9pbnQoYWJzb2x1
dGUucDIoKSkpKTsKLSAgICBxdWFkLT5zZXRQMyhmcmFtZVZpZXcuY29udGVudHNUb1Jvb3RWaWV3
KHJvdW5kZWRJbnRQb2ludChhYnNvbHV0ZS5wMygpKSkpOwotICAgIHF1YWQtPnNldFA0KGZyYW1l
Vmlldy5jb250ZW50c1RvUm9vdFZpZXcocm91bmRlZEludFBvaW50KGFic29sdXRlLnA0KCkpKSk7
Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIGIvU291cmNlL1dlYkNv
cmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKaW5kZXggZmU3NWU0
MGI0MzRmODVkOTczYWVkYmI0Mjk3YTk0YmFlMThmYmIyYy4uOTRmN2VmZjczNTVmOGM1Y2EwYzNi
YmViNTY0ZDBiNTU2YmFmMTRmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y
L2FnZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z
cGVjdG9yL2FnZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKQEAgLTE5MCw4ICsxOTAsNiBA
QCBwcml2YXRlOgogCiAgICAgdm9pZCBhZGRSZWNvcmRUb1RpbWVsaW5lKFJlZjxKU09OOjpPYmpl
Y3Q+JiYsIFRpbWVsaW5lUmVjb3JkVHlwZSk7CiAKLSAgICB2b2lkIGxvY2FsVG9QYWdlUXVhZChj
b25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBMYXlvdXRSZWN0JiwgRmxvYXRRdWFkKik7Ci0KICAg
ICBzdGQ6OnVuaXF1ZV9wdHI8SW5zcGVjdG9yOjpUaW1lbGluZUZyb250ZW5kRGlzcGF0Y2hlcj4g
bV9mcm9udGVuZERpc3BhdGNoZXI7CiAgICAgUmVmUHRyPEluc3BlY3Rvcjo6VGltZWxpbmVCYWNr
ZW5kRGlzcGF0Y2hlcj4gbV9iYWNrZW5kRGlzcGF0Y2hlcjsKICAgICBQYWdlJiBtX2luc3BlY3Rl
ZFBhZ2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNw
cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCmluZGV4IGVkZjA1NDg2
YjE2OTMwZWVmYWFlYmUwM2U1MDJmMTA1NTIwMzRiMWMuLjA1NzVkMjE5MWJhZTJiNzQ4MTJiM2I5
MmFhYmEzM2JmMzVmMDJhYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj
cm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3Bw
CkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2Nyb2xs
Vmlldy5oIgogCisjaW5jbHVkZSAiRmxvYXRRdWFkLmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250
ZXh0LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NMYXllci5oIgogI2luY2x1ZGUgIkhvc3RXaW5kb3cu
aCIKQEAgLTk4NCw2ICs5ODUsMzAgQEAgRmxvYXRSZWN0IFNjcm9sbFZpZXc6OmNvbnRlbnRzVG9S
b290Vmlldyhjb25zdCBGbG9hdFJlY3QmIGNvbnRlbnRzUmVjdCkgY29uc3QKICAgICByZXR1cm4g
Y29udmVydFRvUm9vdFZpZXcoY29udGVudHNUb1ZpZXcoY29udGVudHNSZWN0KSk7CiB9CiAKK0Zs
b2F0UXVhZCBTY3JvbGxWaWV3Ojpyb290Vmlld1RvQ29udGVudHMoY29uc3QgRmxvYXRRdWFkJiBx
dWFkKSBjb25zdAoreworICAgIC8vIEZJWE1FOiBUaGlzIGNvdWxkIGJlIG9wdGltaXplZCBieSBh
ZGRpbmcgYW5kIGFkb3B0aW5nIGEgdmVyc2lvbiBvZiByb290Vmlld1RvQ29udGVudHMoKSB0aGF0
CisgICAgLy8gbWFwcyBtdWx0aXBsZSBGbG9hdFBvaW50cyB0byBjb250ZW50IGNvb3JkaW5hdGVz
IGF0IHRoZSBzYW1lIHRpbWUuCisgICAgYXV0byByZXN1bHQgPSBxdWFkOworICAgIHJlc3VsdC5z
ZXRQMShyb290Vmlld1RvQ29udGVudHMocmVzdWx0LnAxKCkpKTsKKyAgICByZXN1bHQuc2V0UDIo
cm9vdFZpZXdUb0NvbnRlbnRzKHJlc3VsdC5wMigpKSk7CisgICAgcmVzdWx0LnNldFAzKHJvb3RW
aWV3VG9Db250ZW50cyhyZXN1bHQucDMoKSkpOworICAgIHJlc3VsdC5zZXRQNChyb290Vmlld1Rv
Q29udGVudHMocmVzdWx0LnA0KCkpKTsKKyAgICByZXR1cm4gcmVzdWx0OworfQorCitGbG9hdFF1
YWQgU2Nyb2xsVmlldzo6Y29udGVudHNUb1Jvb3RWaWV3KGNvbnN0IEZsb2F0UXVhZCYgcXVhZCkg
Y29uc3QKK3sKKyAgICAvLyBGSVhNRTogVGhpcyBjb3VsZCBiZSBvcHRpbWl6ZWQgYnkgYWRkaW5n
IGFuZCBhZG9wdGluZyBhIHZlcnNpb24gb2YgY29udGVudHNUb1Jvb3RWaWV3KCkgdGhhdAorICAg
IC8vIG1hcHMgbXVsdGlwbGUgRmxvYXRQb2ludHMgdG8gcm9vdCB2aWV3IGNvb3JkaW5hdGVzIGF0
IHRoZSBzYW1lIHRpbWUuCisgICAgYXV0byByZXN1bHQgPSBxdWFkOworICAgIHJlc3VsdC5zZXRQ
MShjb250ZW50c1RvUm9vdFZpZXcocmVzdWx0LnAxKCkpKTsKKyAgICByZXN1bHQuc2V0UDIoY29u
dGVudHNUb1Jvb3RWaWV3KHJlc3VsdC5wMigpKSk7CisgICAgcmVzdWx0LnNldFAzKGNvbnRlbnRz
VG9Sb290VmlldyhyZXN1bHQucDMoKSkpOworICAgIHJlc3VsdC5zZXRQNChjb250ZW50c1RvUm9v
dFZpZXcocmVzdWx0LnA0KCkpKTsKKyAgICByZXR1cm4gcmVzdWx0OworfQorCiBJbnRQb2ludCBT
Y3JvbGxWaWV3Ojpyb290Vmlld1RvVG90YWxDb250ZW50cyhjb25zdCBJbnRQb2ludCYgcm9vdFZp
ZXdQb2ludCkgY29uc3QKIHsKICAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmggYi9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKaW5kZXggNDgyYmU0MjBjMjg0YTViZDIyNDdkOTM3MjY1
Y2JlNzgxN2ZkZjYyNS4uOWY0Y2VlZTFmN2JhOTNmZGI4ODU4NzE5MWFhNmJhYzRkOTAyODc0NCAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaApAQCAtNTgsNiArNTgsNyBAQCBPQkpD
X0NMQVNTIFdBS1ZpZXc7CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEV2ZW50UmVnaW9u
Q29udGV4dDsKK2NsYXNzIEZsb2F0UXVhZDsKIGNsYXNzIEhvc3RXaW5kb3c7CiBjbGFzcyBMZWdh
Y3lUaWxlQ2FjaGU7CiBjbGFzcyBTY3JvbGxiYXI7CkBAIC0yOTksNiArMzAwLDggQEAgcHVibGlj
OgogICAgIFdFQkNPUkVfRVhQT1JUIEludFJlY3QgY29udGVudHNUb1Jvb3RWaWV3KGNvbnN0IElu
dFJlY3QmKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCBGbG9hdFJlY3Qgcm9vdFZpZXdUb0Nv
bnRlbnRzKGNvbnN0IEZsb2F0UmVjdCYpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIEZsb2F0
UmVjdCBjb250ZW50c1RvUm9vdFZpZXcoY29uc3QgRmxvYXRSZWN0JikgY29uc3Q7CisgICAgV0VC
Q09SRV9FWFBPUlQgRmxvYXRRdWFkIHJvb3RWaWV3VG9Db250ZW50cyhjb25zdCBGbG9hdFF1YWQm
KSBjb25zdDsKKyAgICBXRUJDT1JFX0VYUE9SVCBGbG9hdFF1YWQgY29udGVudHNUb1Jvb3RWaWV3
KGNvbnN0IEZsb2F0UXVhZCYpIGNvbnN0OwogCiAgICAgSW50UG9pbnQgdmlld1RvQ29udGVudHMo
Y29uc3QgSW50UG9pbnQmKSBjb25zdDsKICAgICBJbnRQb2ludCBjb250ZW50c1RvVmlldyhjb25z
dCBJbnRQb2ludCYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi
UGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCBkODFlMjE4YmU4YjFhNzI1MWE4YmMzNzUwYjVi
NmVjNTljN2VhNTgyLi40ODk1NjU1ZTI5ZGE2MzY4MTQ0NGYxMzc2MTM0YWQ4MmNiMmI0YTVlIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlP
Uy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlP
Uy5tbQpAQCAtMjYwLDE0ICsyNjAsOCBAQCBib29sIFdlYlBhZ2U6OnBsYXRmb3JtTmVlZHNMYXlv
dXRGb3JFZGl0b3JTdGF0ZShjb25zdCBGcmFtZSYgZnJhbWUpIGNvbnN0CiAKIHN0YXRpYyB2b2lk
IGNvbnZlcnRDb250ZW50VG9Sb290Vmlldyhjb25zdCBGcmFtZVZpZXcmIHZpZXcsIFZlY3RvcjxT
ZWxlY3Rpb25HZW9tZXRyeT4mIGdlb21ldHJpZXMpCiB7Ci0gICAgZm9yIChhdXRvJiBnZW9tZXRy
eSA6IGdlb21ldHJpZXMpIHsKLSAgICAgICAgYXV0byBjb252ZXJ0ZWRRdWFkID0gZ2VvbWV0cnku
cXVhZCgpOwotICAgICAgICBjb252ZXJ0ZWRRdWFkLnNldFAxKHZpZXcuY29udGVudHNUb1Jvb3RW
aWV3KGNvbnZlcnRlZFF1YWQucDEoKSkpOwotICAgICAgICBjb252ZXJ0ZWRRdWFkLnNldFAyKHZp
ZXcuY29udGVudHNUb1Jvb3RWaWV3KGNvbnZlcnRlZFF1YWQucDIoKSkpOwotICAgICAgICBjb252
ZXJ0ZWRRdWFkLnNldFAzKHZpZXcuY29udGVudHNUb1Jvb3RWaWV3KGNvbnZlcnRlZFF1YWQucDMo
KSkpOwotICAgICAgICBjb252ZXJ0ZWRRdWFkLnNldFA0KHZpZXcuY29udGVudHNUb1Jvb3RWaWV3
KGNvbnZlcnRlZFF1YWQucDQoKSkpOwotICAgICAgICBnZW9tZXRyeS5zZXRRdWFkKGNvbnZlcnRl
ZFF1YWQpOwotICAgIH0KKyAgICBmb3IgKGF1dG8mIGdlb21ldHJ5IDogZ2VvbWV0cmllcykKKyAg
ICAgICAgZ2VvbWV0cnkuc2V0UXVhZCh2aWV3LmNvbnRlbnRzVG9Sb290VmlldyhnZW9tZXRyeS5x
dWFkKCkpKTsKIH0KIAogdm9pZCBXZWJQYWdlOjpnZXRQbGF0Zm9ybUVkaXRvclN0YXRlKEZyYW1l
JiBmcmFtZSwgRWRpdG9yU3RhdGUmIHJlc3VsdCkgY29uc3QKQEAgLTEwNzgsMTMgKzEwNzIsOCBA
QCB2b2lkIFdlYlBhZ2U6OnNlbmRUYXBIaWdobGlnaHRGb3JOb2RlSWZOZWNlc3NhcnkodWludDY0
X3QgcmVxdWVzdElELCBOb2RlKiBub2RlKQogICAgICAgICBDb2xvciBoaWdobGlnaHRDb2xvciA9
IHJlbmRlcmVyLT5zdHlsZSgpLnRhcEhpZ2hsaWdodENvbG9yKCk7CiAgICAgICAgIGlmICghbm9k
ZS0+ZG9jdW1lbnQoKS5mcmFtZSgpLT5pc01haW5GcmFtZSgpKSB7CiAgICAgICAgICAgICBGcmFt
ZVZpZXcqIHZpZXcgPSBub2RlLT5kb2N1bWVudCgpLmZyYW1lKCktPnZpZXcoKTsKLSAgICAgICAg
ICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcXVhZHMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAg
ICAgICAgICBGbG9hdFF1YWQmIGN1cnJlbnRRdWFkID0gcXVhZHNbaV07Ci0gICAgICAgICAgICAg
ICAgY3VycmVudFF1YWQuc2V0UDEodmlldy0+Y29udGVudHNUb1Jvb3RWaWV3KHJvdW5kZWRJbnRQ
b2ludChjdXJyZW50UXVhZC5wMSgpKSkpOwotICAgICAgICAgICAgICAgIGN1cnJlbnRRdWFkLnNl
dFAyKHZpZXctPmNvbnRlbnRzVG9Sb290Vmlldyhyb3VuZGVkSW50UG9pbnQoY3VycmVudFF1YWQu
cDIoKSkpKTsKLSAgICAgICAgICAgICAgICBjdXJyZW50UXVhZC5zZXRQMyh2aWV3LT5jb250ZW50
c1RvUm9vdFZpZXcocm91bmRlZEludFBvaW50KGN1cnJlbnRRdWFkLnAzKCkpKSk7Ci0gICAgICAg
ICAgICAgICAgY3VycmVudFF1YWQuc2V0UDQodmlldy0+Y29udGVudHNUb1Jvb3RWaWV3KHJvdW5k
ZWRJbnRQb2ludChjdXJyZW50UXVhZC5wNCgpKSkpOwotICAgICAgICAgICAgfQorICAgICAgICAg
ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBxdWFkcy5zaXplKCk7ICsraSkKKyAgICAgICAgICAg
ICAgICBxdWFkc1tpXSA9IHZpZXctPmNvbnRlbnRzVG9Sb290VmlldyhxdWFkc1tpXSk7CiAgICAg
ICAgIH0KIAogICAgICAgICBSb3VuZGVkUmVjdDo6UmFkaWkgYm9yZGVyUmFkaWk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426870</attachid>
            <date>2021-04-22 17:13:39 -0700</date>
            <delta_ts>2021-04-22 19:33:26 -0700</delta_ts>
            <desc>Followup tweak</desc>
            <filename>bug-224883-20210422171338.patch</filename>
            <type>text/plain</type>
            <size>1722</size>
            <attacher name="Wenson Hsieh">wenson_hsieh</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNhMDIxNmMyZDlhMzcyZjFh
YzQ5NTdkMmVmZGVjMTZiNzJiYmFlZmMuLjU3NTU4NGNkMGFlNmVlMDkwMjg0MDY1OTEyNjJjODBl
OWQyNTQ3MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDQtMjIgIFdlbnNvbiBI
c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgRm9sbG93dXAgdG8gcjI3
NjM5NworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0
ODgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNl
IGEgcmFuZ2UtYmFzZWQgZm9yIGxvb3Agd2hlbiBtYXBwaW5nIEZsb2F0UXVhZHMgaW4gYHNlbmRU
YXBIaWdobGlnaHRGb3JOb2RlSWZOZWNlc3NhcnlgLgorICAgICAgICBObyBjaGFuZ2UgaW4gYmVo
YXZpb3IuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06
CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNlbmRUYXBIaWdobGlnaHRGb3JOb2RlSWZOZWNl
c3NhcnkpOgorCiAyMDIxLTA0LTIxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUu
Y29tPgogCiAgICAgICAgIFtpT1NdIFRoZSBMb29rIFVwIHRleHQgc2VydmljZSBwb3BvdmVyIHNo
b3VsZCBhdm9pZCBjb3ZlcmluZyBzZWxlY3RlZCB0ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4IDQ4OTU2NTVlMjlkYTYz
NjgxNDQ0ZjEzNzYxMzRhZDgyY2IyYjRhNWUuLjNmNTY4NTdiZTFiYWY2MTUxMzAzOTIwZDdkMWYz
YTQ4NTFlMjc4ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0xMDcyLDggKzEwNzIsOCBAQCB2b2lkIFdlYlBhZ2U6OnNl
bmRUYXBIaWdobGlnaHRGb3JOb2RlSWZOZWNlc3NhcnkodWludDY0X3QgcmVxdWVzdElELCBOb2Rl
KiBub2RlKQogICAgICAgICBDb2xvciBoaWdobGlnaHRDb2xvciA9IHJlbmRlcmVyLT5zdHlsZSgp
LnRhcEhpZ2hsaWdodENvbG9yKCk7CiAgICAgICAgIGlmICghbm9kZS0+ZG9jdW1lbnQoKS5mcmFt
ZSgpLT5pc01haW5GcmFtZSgpKSB7CiAgICAgICAgICAgICBGcmFtZVZpZXcqIHZpZXcgPSBub2Rl
LT5kb2N1bWVudCgpLmZyYW1lKCktPnZpZXcoKTsKLSAgICAgICAgICAgIGZvciAoc2l6ZV90IGkg
PSAwOyBpIDwgcXVhZHMuc2l6ZSgpOyArK2kpCi0gICAgICAgICAgICAgICAgcXVhZHNbaV0gPSB2
aWV3LT5jb250ZW50c1RvUm9vdFZpZXcocXVhZHNbaV0pOworICAgICAgICAgICAgZm9yIChhdXRv
JiBxdWFkIDogcXVhZHMpCisgICAgICAgICAgICAgICAgcXVhZCA9IHZpZXctPmNvbnRlbnRzVG9S
b290VmlldyhxdWFkKTsKICAgICAgICAgfQogCiAgICAgICAgIFJvdW5kZWRSZWN0OjpSYWRpaSBi
b3JkZXJSYWRpaTsK
</data>

          </attachment>
      

    </bug>

</bugzilla>