<?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>144061</bug_id>
          
          <creation_ts>2015-04-22 12:05:38 -0700</creation_ts>
          <short_desc>Web Inspector: Remove sidebar panel shortcut and image</short_desc>
          <delta_ts>2015-04-25 18:36:01 -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>Web Inspector</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>All</rep_platform>
          <op_sys>All</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>DoNotImportToRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Timothy Hatcher">timothy</reporter>
          <assigned_to name="Timothy Hatcher">timothy</assigned_to>
          <cc>graouts</cc>
    
    <cc>joepeck</cc>
    
    <cc>jonowells</cc>
    
    <cc>mattbaker</cc>
    
    <cc>nvasilyev</cc>
    
    <cc>timothy</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1087507</commentid>
    <comment_count>0</comment_count>
    <who name="Timothy Hatcher">timothy</who>
    <bug_when>2015-04-22 12:05:38 -0700</bug_when>
    <thetext>We don&apos;t need the shortcut or image anymore with tabs.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1087510</commentid>
    <comment_count>1</comment_count>
      <attachid>251350</attachid>
    <who name="Timothy Hatcher">timothy</who>
    <bug_when>2015-04-22 12:08:31 -0700</bug_when>
    <thetext>Created attachment 251350
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1087547</commentid>
    <comment_count>2</comment_count>
      <attachid>251350</attachid>
    <who name="Joseph Pecoraro">joepeck</who>
    <bug_when>2015-04-22 13:00:35 -0700</bug_when>
    <thetext>Comment on attachment 251350
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1088633</commentid>
    <comment_count>3</comment_count>
    <who name="Timothy Hatcher">timothy</who>
    <bug_when>2015-04-25 18:36:01 -0700</bug_when>
    <thetext>r183322 – r183342

http://trac.webkit.org/log/?revs=183322-183342</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>251350</attachid>
            <date>2015-04-22 12:08:31 -0700</date>
            <delta_ts>2015-04-22 13:00:35 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-144061-20150422120726.patch</filename>
            <type>text/plain</type>
            <size>23965</size>
            <attacher name="Timothy Hatcher">timothy</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj
dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm
OTlkZjliNDM5MTdlZTllYzgzMDI3YTk3ZGI0NDI0ZDI5OWE3ZDdhLi43OGQ0YjA4ODFiZGE3MjEx
MDE4NDkxY2NlMGU2OGM2Y2QwYTk1MTRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y
VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs
NSArMSw1MiBAQAogMjAxNS0wNC0yMiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j
b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIHNpZGViYXIgcGFuZWwgc2hvcnRj
dXQgYW5kIGltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNDQwNjEKKworICAgICAgICBTaWRlYmFyIHBhbmVscyBubyBsb25nZXIgbmVlZCBhIGtl
eWJvYXJkIHNob3J0Y3V0IG9yIGEgdG9vbGJhciBpbWFnZS4KKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGlj
YXRpb25DYWNoZURldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu
QXBwbGljYXRpb25DYWNoZURldGFpbHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAqIFVzZXJJbnRl
cmZhY2UvVmlld3MvQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2Vi
SW5zcGVjdG9yLkNTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbCk6CisgICAgICAgICogVXNlcklu
dGVyZmFjZS9WaWV3cy9ET01EZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5z
cGVjdG9yLkRPTURldGFpbHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv
Vmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0
b3IuRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv
Vmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9W
aWV3cy9EZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRldGFp
bHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVl
RGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXllclRyZWVE
ZXRhaWxzU2lkZWJhclBhbmVsKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05hdmln
YXRpb25TaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNp
ZGViYXJQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5l
bC5wcm90b3R5cGUucmVzdG9yZVN0YXRlRnJvbUNvb2tpZSk6CisgICAgICAgIChXZWJJbnNwZWN0
b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuc2hvd0VtcHR5Q29udGVudFBsYWNl
aG9sZGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnBy
b3RvdHlwZS5hcHBseUZpbHRlcnNUb1RyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rv
ci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdlYklu
c3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fdXBkYXRlQ29udGVudE92
ZXJmbG93U2hhZG93VmlzaWJpbGl0eSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Q
cm9iZURldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvYmVE
ZXRhaWxzU2lkZWJhclBhbmVsKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRl
cmluZ0ZyYW1lRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl
L1ZpZXdzL1Jlc291cmNlRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3Bl
Y3Rvci5SZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAqIFVzZXJJbnRlcmZh
Y2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu
UmVzb3VyY2VTaWRlYmFyUGFuZWwpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2Nv
cGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2Nv
cGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll
d3MvU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lbCk6
CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmVsLnByb3RvdHlwZS5hZGRlZCk6Cisg
ICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmVsLnByb3RvdHlwZS5yZW1vdmVkKToKKyAg
ICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFyUGFuZWwucHJvdG90eXBlLnZpc2liaWxpdHlEaWRD
aGFuZ2UpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFu
ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwpOgorICAg
ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZS5zaG93VGlt
ZWxpbmVWaWV3Rm9yVGltZWxpbmUpOgorCisyMDE1LTA0LTIyICBUaW1vdGh5IEhhdGNoZXIgIDx0
aW1vdGh5QGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgYWxsb3dl
ZE5hdmlnYXRpb25TaWRlYmFyUGFuZWxzLCBpdCBpc24ndCBuZWVkZWQKICAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDA1NgogCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hl
RGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm
YWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IDcy
YzFkMGM1ZjEzMzdhMWYwOThlNjYzYjQxNTZmNjZjZmRhNWMzMzIuLjJmZjdlY2FkY2YzYmQ2YTYw
NDg1OWEwYmU3ZDRlMGYzNDA3NTAxM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV
SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVEZXRhaWxzU2lkZWJhclBhbmVs
LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxp
Y2F0aW9uQ2FjaGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC0yNyw3ICsyNyw3IEBAIFdlYklu
c3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIEFwcGxp
Y2F0aW9uQ2FjaGVEZXRhaWxzCiB7CiAgICAgY29uc3RydWN0b3IoKQogICAgIHsKLSAgICAgICAg
c3VwZXIoImFwcGxpY2F0aW9uLWNhY2hlLWRldGFpbHMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco
IlN0b3JhZ2UiKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdG9yYWdlIiksICJJbWFnZXMvTmF2
aWdhdGlvbkl0ZW1TdG9yYWdlLnN2ZyIpOworICAgICAgICBzdXBlcigiYXBwbGljYXRpb24tY2Fj
aGUtZGV0YWlscyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RvcmFnZSIpLCBXZWJJbnNwZWN0
b3IuVUlTdHJpbmcoIlN0b3JhZ2UiKSk7CiAKICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlz
dC5hZGQoImFwcGxpY2F0aW9uLWNhY2hlIik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw
ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5q
cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0
YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCAyYmFkOTcyM2I5ZmVhOGExZGE3YzNlNGEzMWRhMzA1
M2NlMDU0MjNkLi5iZGVjNDBlM2VmMGIyYzRjYTQzNjZkZDZkNDE0ZjlhZTVkZWY0ZTM4IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHls
ZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ
bnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC0yNyw3ICsy
Nyw3IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBD
U1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0CiB7CiAgICAgY29uc3RydWN0b3IoKQogICAg
IHsKLSAgICAgICAgc3VwZXIoImNzcy1zdHlsZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3R5
bGVzIiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3R5bGUiKSwgIkltYWdlcy9OYXZpZ2F0aW9u
SXRlbUJydXNoQW5kUnVsZXIuc3ZnIiwgIjQiKTsKKyAgICAgICAgc3VwZXIoImNzcy1zdHlsZSIs
IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3R5bGVzIiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygi
U3R5bGUiKSk7CiAKICAgICAgICAgdGhpcy5fc2VsZWN0ZWRQYW5lbCA9IG51bGw7CiAKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTURldGFp
bHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W
aWV3cy9ET01EZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IGRhYTdlZmYzNWM3ZDhjZTAzNzQx
ZjE0NjJlMzhhZTEwYmRiZjhmMjUuLmZkZTlhYjkxNmJjOTQ4OTQ1Y2M5OWNiMjNjMmI1N2U0NjEy
ZjQzN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp
ZXdzL0RPTURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ
L1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtMjUsOSAr
MjUsOSBAQAogCiBXZWJJbnNwZWN0b3IuRE9NRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIERP
TURldGFpbHNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NpZGViYXJQ
YW5lbAogewotICAgIGNvbnN0cnVjdG9yKGlkZW50aWZpZXIsIGRpc3BsYXlOYW1lLCBzaW5ndWxh
ckRpc3BsYXlOYW1lLCBpbWFnZSwga2V5Ym9hcmRTaG9ydGN1dEtleSwgZWxlbWVudCkKKyAgICBj
b25zdHJ1Y3RvcihpZGVudGlmaWVyLCBkaXNwbGF5TmFtZSwgc2luZ3VsYXJEaXNwbGF5TmFtZSwg
ZWxlbWVudCkKICAgICB7Ci0gICAgICAgIHN1cGVyKGlkZW50aWZpZXIsIGRpc3BsYXlOYW1lLCBz
aW5ndWxhckRpc3BsYXlOYW1lLCBpbWFnZSwga2V5Ym9hcmRTaG9ydGN1dEtleSwgZWxlbWVudCk7
CisgICAgICAgIHN1cGVyKGlkZW50aWZpZXIsIGRpc3BsYXlOYW1lLCBzaW5ndWxhckRpc3BsYXlO
YW1lLCBlbGVtZW50KTsKIAogICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi
Y2xpY2siLCB0aGlzLl9tb3VzZVdhc0NsaWNrZWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTU5vZGVE
ZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh
Y2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggZWY0NzI3MzJmMGVm
MjgyNDJlNTg2NmMzZTc2OTU1NzAzN2Y1ZDRkYS4uODFkYjIwMGQyYTk3MGI4MzkzZDQ3ODc5MzJm
ZDc4MzJiNTg2YTFmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl
cmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dl
Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFu
ZWwuanMKQEAgLTI3LDcgKzI3LDcgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGVEZXRhaWxzU2lkZWJh
clBhbmVsID0gY2xhc3MgRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0ZW4KIHsKICAgICBj
b25zdHJ1Y3RvcigpCiAgICAgewotICAgICAgICBzdXBlcigiZG9tLW5vZGUtZGV0YWlscyIsIFdl
Ykluc3BlY3Rvci5VSVN0cmluZygiTm9kZSIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5vZGUi
KSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRlbUFuZ2xlQnJhY2tldHMuc3ZnIiwgIjIiKTsKKyAgICAg
ICAgc3VwZXIoImRvbS1ub2RlLWRldGFpbHMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5vZGUi
KSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOb2RlIikpOwogCiAgICAgICAgIFdlYkluc3BlY3Rv
ci5kb21UcmVlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01UcmVlTWFu
YWdlci5FdmVudC5BdHRyaWJ1dGVNb2RpZmllZCwgdGhpcy5fYXR0cmlidXRlc0NoYW5nZWQsIHRo
aXMpOwogICAgICAgICBXZWJJbnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5l
cihXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuRXZlbnQuQXR0cmlidXRlUmVtb3ZlZCwgdGhp
cy5fYXR0cmlidXRlc0NoYW5nZWQsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl
Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMgYi9Tb3Vy
Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5l
bC5qcwppbmRleCAyZTU5MDEwNjhiN2UzYzA5YmNkMmQyNmUxZmFhZTE5NDBiNzUwMjk5Li5iOWZm
NmJmNDI2NzhhZWU4NTU4MzM5ZDA0ZDRhMDkyNDk5Yzk3OWFmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5q
cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dl
clNpZGViYXJQYW5lbC5qcwpAQCAtMjcsNyArMjcsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJT
aWRlYmFyUGFuZWwgPSBjbGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3Bl
YwogewogICAgIGNvbnN0cnVjdG9yKCkKICAgICB7Ci0gICAgICAgIHN1cGVyKCJkZWJ1Z2dlciIs
IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVidWdnZXIiKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRl
bUJ1Zy5zdmciLCAiMyIsIHRydWUpOworICAgICAgICBzdXBlcigiZGVidWdnZXIiLCBXZWJJbnNw
ZWN0b3IuVUlTdHJpbmcoIkRlYnVnZ2VyIiksIHRydWUpOwogCiAgICAgICAgIFdlYkluc3BlY3Rv
ci5GcmFtZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5NYWluUmVz
b3VyY2VEaWRDaGFuZ2UsIHRoaXMuX21haW5SZXNvdXJjZUNoYW5nZWQsIHRoaXMpOwogICAgICAg
ICBXZWJJbnNwZWN0b3IuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRnJhbWUu
RXZlbnQuUmVzb3VyY2VXYXNBZGRlZCwgdGhpcy5fcmVzb3VyY2VBZGRlZCwgdGhpcyk7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxz
U2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll
d3MvRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCBjMDA3YjVjZTMyMzNkOTMxMGIzYzdjZTVh
YjY1NDg4NmNmNzVkMWY3Li43MTJmY2I0ZTdlZDU0ZmI4YzllMzVhM2ViZjdmZTJmY2YzM2ViZTY5
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E
ZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50
ZXJmYWNlL1ZpZXdzL0RldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTI1LDI1ICsyNSw5IEBACiAK
IFdlYkluc3BlY3Rvci5EZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgRGV0YWlsc1NpZGViYXJQ
YW5lbCBleHRlbmRzIFdlYkluc3BlY3Rvci5TaWRlYmFyUGFuZWwKIHsKLSAgICBjb25zdHJ1Y3Rv
cihpZGVudGlmaWVyLCBkaXNwbGF5TmFtZSwgc2luZ3VsYXJEaXNwbGF5TmFtZSwgaW1hZ2UsIGtl
eWJvYXJkU2hvcnRjdXRLZXksIGVsZW1lbnQpCisgICAgY29uc3RydWN0b3IoaWRlbnRpZmllciwg
ZGlzcGxheU5hbWUsIHNpbmd1bGFyRGlzcGxheU5hbWUsIGVsZW1lbnQpCiAgICAgewotICAgICAg
ICB2YXIga2V5Ym9hcmRTaG9ydGN1dCA9IG51bGw7Ci0gICAgICAgIGlmIChrZXlib2FyZFNob3J0
Y3V0S2V5KQotICAgICAgICAgICAga2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3Iu
S2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5D
b250cm9sIHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQsIGtl
eWJvYXJkU2hvcnRjdXRLZXkpOwotCi0gICAgICAgIGlmIChrZXlib2FyZFNob3J0Y3V0KSB7Ci0g
ICAgICAgICAgICB2YXIgc2hvd1Rvb2xUaXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cg
dGhlICVzIGRldGFpbHMgc2lkZWJhciAoJXMpIikuZm9ybWF0KHNpbmd1bGFyRGlzcGxheU5hbWUs
IGtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpOwotICAgICAgICAgICAgdmFyIGhpZGVUb29s
VGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJIaWRlIHRoZSAlcyBkZXRhaWxzIHNpZGViYXIg
KCVzKSIpLmZvcm1hdChzaW5ndWxhckRpc3BsYXlOYW1lLCBrZXlib2FyZFNob3J0Y3V0LmRpc3Bs
YXlOYW1lKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHZhciBzaG93VG9vbFRpcCA9
IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyB0aGUgJXMgZGV0YWlscyBzaWRlYmFyIikuZm9y
bWF0KHNpbmd1bGFyRGlzcGxheU5hbWUpOwotICAgICAgICAgICAgdmFyIGhpZGVUb29sVGlwID0g
V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJIaWRlIHRoZSAlcyBkZXRhaWxzIHNpZGViYXIiKS5mb3Jt
YXQoc2luZ3VsYXJEaXNwbGF5TmFtZSk7Ci0gICAgICAgIH0KLQotICAgICAgICBzdXBlcihpZGVu
dGlmaWVyLCBkaXNwbGF5TmFtZSwgc2hvd1Rvb2xUaXAsIGhpZGVUb29sVGlwLCBpbWFnZSwgZWxl
bWVudCk7Ci0KLSAgICAgICAgdGhpcy5fa2V5Ym9hcmRTaG9ydGN1dCA9IGtleWJvYXJkU2hvcnRj
dXQ7Ci0gICAgICAgIGlmICh0aGlzLl9rZXlib2FyZFNob3J0Y3V0KQotICAgICAgICAgICAgdGhp
cy5fa2V5Ym9hcmRTaG9ydGN1dC5jYWxsYmFjayA9IHRoaXMudG9nZ2xlLmJpbmQodGhpcyk7Cisg
ICAgICAgIHN1cGVyKGlkZW50aWZpZXIsIGRpc3BsYXlOYW1lLCBlbGVtZW50KTsKIAogICAgICAg
ICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiZGV0YWlscyIpOwogICAgIH0KZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURl
dGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj
ZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IGFhNWQyNWE3NGJk
ZGFmYjk5YThmNWU1NDQ5ZGRhZGQ0NWEwZThjZTMuLjY0YWExYTE3MTNkYWQ0MzkxOTFlZTRjODgy
YTgwZTVkZTA3ODk4YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50
ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNl
L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGVi
YXJQYW5lbC5qcwpAQCAtMjcsNyArMjcsNyBAQCBXZWJJbnNwZWN0b3IuTGF5ZXJUcmVlRGV0YWls
c1NpZGViYXJQYW5lbCA9IGNsYXNzIExheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwgZQogewog
ICAgIGNvbnN0cnVjdG9yKCkKICAgICB7Ci0gICAgICAgIHN1cGVyKCJsYXllci10cmVlIiwgV2Vi
SW5zcGVjdG9yLlVJU3RyaW5nKCJMYXllcnMiKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMYXll
ciIpLCAiSW1hZ2VzL05hdmlnYXRpb25JdGVtTGF5ZXJzLnN2ZyIsICIzIik7CisgICAgICAgIHN1
cGVyKCJsYXllci10cmVlIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMYXllcnMiKSwgV2ViSW5z
cGVjdG9yLlVJU3RyaW5nKCJMYXllciIpKTsKIAogICAgICAgICB0aGlzLl9kYXRhR3JpZE5vZGVz
QnlMYXllcklkID0ge307CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy
SW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5z
cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCmlu
ZGV4IGQxODlkMmUwYjAzOWFjMDFlNDhmM2E5MWZhYWMwMzI0YTRkNjZlOTguLjdkM2YyNWUwZDk4
ZjA4YTI3ZGNiNDhlNzQwOTExYjQ1NmM1ZTllMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw
ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKKysr
IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNp
ZGViYXJQYW5lbC5qcwpAQCAtMjUsMzIgKzI1LDEyIEBACiAKIFdlYkluc3BlY3Rvci5OYXZpZ2F0
aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFdl
Ykluc3BlY3Rvci5TaWRlYmFyUGFuZWwKIHsKLSAgICBjb25zdHJ1Y3RvcihpZGVudGlmaWVyLCBk
aXNwbGF5TmFtZSwgaW1hZ2UsIGtleWJvYXJkU2hvcnRjdXRLZXksIGF1dG9QcnVuZU9sZFRvcExl
dmVsUmVzb3VyY2VUcmVlRWxlbWVudHMsIGF1dG9IaWRlVG9vbGJhckl0ZW1XaGVuRW1wdHksIHdh
bnRzVG9wT3ZlcmZsb3dTaGFkb3csIGVsZW1lbnQsIHJvbGUsIGxhYmVsKQorICAgIGNvbnN0cnVj
dG9yKGlkZW50aWZpZXIsIGRpc3BsYXlOYW1lLCBhdXRvUHJ1bmVPbGRUb3BMZXZlbFJlc291cmNl
VHJlZUVsZW1lbnRzLCB3YW50c1RvcE92ZXJmbG93U2hhZG93LCBlbGVtZW50LCByb2xlLCBsYWJl
bCkKICAgICB7Ci0gICAgICAgIHZhciBrZXlib2FyZFNob3J0Y3V0ID0gbnVsbDsKLSAgICAgICAg
aWYgKGtleWJvYXJkU2hvcnRjdXRLZXkpCi0gICAgICAgICAgICBrZXlib2FyZFNob3J0Y3V0ID0g
bmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNo
b3J0Y3V0Lk1vZGlmaWVyLkNvbnRyb2wsIGtleWJvYXJkU2hvcnRjdXRLZXkpOwotCi0gICAgICAg
IGlmIChrZXlib2FyZFNob3J0Y3V0KSB7Ci0gICAgICAgICAgICB2YXIgc2hvd1Rvb2xUaXAgPSBX
ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgdGhlICVzIG5hdmlnYXRpb24gc2lkZWJhciAoJXMp
IikuZm9ybWF0KGRpc3BsYXlOYW1lLCBrZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lKTsKLSAg
ICAgICAgICAgIHZhciBoaWRlVG9vbFRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSGlkZSB0
aGUgJXMgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiKS5mb3JtYXQoZGlzcGxheU5hbWUsIGtleWJv
YXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg
dmFyIHNob3dUb29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IHRoZSAlcyBuYXZp
Z2F0aW9uIHNpZGViYXIiKS5mb3JtYXQoZGlzcGxheU5hbWUpOwotICAgICAgICAgICAgdmFyIGhp
ZGVUb29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJIaWRlIHRoZSAlcyBuYXZpZ2F0aW9u
IHNpZGViYXIiKS5mb3JtYXQoZGlzcGxheU5hbWUpOwotICAgICAgICB9Ci0KLSAgICAgICAgc3Vw
ZXIoaWRlbnRpZmllciwgZGlzcGxheU5hbWUsIHNob3dUb29sVGlwLCBoaWRlVG9vbFRpcCwgaW1h
Z2UsIGVsZW1lbnQsIHJvbGUsIGxhYmVsIHx8IGRpc3BsYXlOYW1lKTsKKyAgICAgICAgc3VwZXIo
aWRlbnRpZmllciwgZGlzcGxheU5hbWUsIGVsZW1lbnQsIHJvbGUsIGxhYmVsIHx8IGRpc3BsYXlO
YW1lKTsKIAogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibmF2aWdhdGlvbiIp
OwogCi0gICAgICAgIHRoaXMuX2tleWJvYXJkU2hvcnRjdXQgPSBrZXlib2FyZFNob3J0Y3V0Owot
ICAgICAgICB0aGlzLl9rZXlib2FyZFNob3J0Y3V0LmNhbGxiYWNrID0gdGhpcy50b2dnbGUuYmlu
ZCh0aGlzKTsKLQotICAgICAgICB0aGlzLl9hdXRvSGlkZVRvb2xiYXJJdGVtV2hlbkVtcHR5ID0g
YXV0b0hpZGVUb29sYmFySXRlbVdoZW5FbXB0eSB8fCBmYWxzZTsKLQotICAgICAgICBpZiAoYXV0
b0hpZGVUb29sYmFySXRlbVdoZW5FbXB0eSkKLSAgICAgICAgICAgIHRoaXMudG9vbGJhckl0ZW0u
aGlkZGVuID0gdHJ1ZTsKLQogICAgICAgICB0aGlzLl92aXNpYmxlQ29udGVudFRyZWVPdXRsaW5l
cyA9IG5ldyBTZXQ7CiAKICAgICAgICAgdGhpcy5jb250ZW50RWxlbWVudC5hZGRFdmVudExpc3Rl
bmVyKCJzY3JvbGwiLCB0aGlzLl91cGRhdGVDb250ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmlsaXR5
LmJpbmQodGhpcykpOwpAQCAtMjQ0LDcgKzIyNCw3IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9u
U2lkZWJhclBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFdlYklu
CiAgICAgICAgIHRoaXMuX2ZpbmFsQXR0ZW1wdFRvUmVzdG9yZVZpZXdTdGF0ZVRpbWVvdXQgPSBz
ZXRUaW1lb3V0KGZpbmFsQXR0ZW1wdFRvUmVzdG9yZVZpZXdTdGF0ZUZyb21Db29raWUuYmluZCh0
aGlzKSwgcmVsYXhlZE1hdGNoRGVsYXkpOwogICAgIH0KIAotICAgIHNob3dFbXB0eUNvbnRlbnRQ
bGFjZWhvbGRlcihtZXNzYWdlLCBoaWRlVG9vbGJhckl0ZW0pCisgICAgc2hvd0VtcHR5Q29udGVu
dFBsYWNlaG9sZGVyKG1lc3NhZ2UpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChtZXNz
YWdlKTsKIApAQCAtMjU0LDggKzIzNCw2IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJh
clBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluCiAgICAg
ICAgIHRoaXMuX2VtcHR5Q29udGVudFBsYWNlaG9sZGVyTWVzc2FnZUVsZW1lbnQudGV4dENvbnRl
bnQgPSBtZXNzYWdlOwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fZW1w
dHlDb250ZW50UGxhY2Vob2xkZXJFbGVtZW50KTsKIAotICAgICAgICB0aGlzLl9oaWRlVG9vbGJh
ckl0ZW1XaGVuRW1wdHkgPSBoaWRlVG9vbGJhckl0ZW0gfHwgZmFsc2U7Ci0gICAgICAgIHRoaXMu
X3VwZGF0ZVRvb2xiYXJJdGVtVmlzaWJpbGl0eSgpOwogICAgICAgICB0aGlzLl91cGRhdGVDb250
ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmlsaXR5KCk7CiAgICAgfQogCkBAIC0yNjYsMTUgKzI0NCwx
MSBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRp
b25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogCiAgICAgICAgIHRoaXMuX2VtcHR5Q29udGVu
dFBsYWNlaG9sZGVyRWxlbWVudC5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKHRoaXMuX2VtcHR5Q29u
dGVudFBsYWNlaG9sZGVyRWxlbWVudCk7CiAKLSAgICAgICAgdGhpcy5faGlkZVRvb2xiYXJJdGVt
V2hlbkVtcHR5ID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZVRvb2xiYXJJdGVtVmlzaWJp
bGl0eSgpOwogICAgICAgICB0aGlzLl91cGRhdGVDb250ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmls
aXR5KCk7CiAgICAgfQogCiAgICAgdXBkYXRlRW1wdHlDb250ZW50UGxhY2Vob2xkZXIobWVzc2Fn
ZSkKICAgICB7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZVRvb2xiYXJJdGVtVmlzaWJpbGl0eSgpOwot
CiAgICAgICAgIGlmICghdGhpcy5fY29udGVudFRyZWVPdXRsaW5lLmNoaWxkcmVuLmxlbmd0aCkg
ewogICAgICAgICAgICAgLy8gTm8gdHJlZSBlbGVtZW50cywgc28gbm8gcmVzdWx0cy4KICAgICAg
ICAgICAgIHRoaXMuc2hvd0VtcHR5Q29udGVudFBsYWNlaG9sZGVyKG1lc3NhZ2UpOwpAQCAtMzk4
LDI3ICszNzIsMTYgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFz
cyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAgaWYgKCF0aGlz
LnBhcmVudFNpZGViYXIpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgV2ViSW5zcGVj
dG9yLlNpZGViYXJQYW5lbC5wcm90b3R5cGUuc2hvdy5jYWxsKHRoaXMpOworICAgICAgICBzdXBl
ci5zaG93KCk7CiAKICAgICAgICAgdGhpcy5jb250ZW50VHJlZU91dGxpbmVFbGVtZW50LmZvY3Vz
KCk7CiAgICAgfQogCiAgICAgc2hvd24oKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLlNp
ZGViYXJQYW5lbC5wcm90b3R5cGUuc2hvd24uY2FsbCh0aGlzKTsKKyAgICAgICAgc3VwZXIuc2hv
d24oKTsKIAogICAgICAgICB0aGlzLl91cGRhdGVDb250ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmls
aXR5KCk7Ci0KLSAgICAgICAgLy8gRm9yY2UgdGhlIG5hdmlnYXRpb24gaXRlbSB0byBiZSB2aXNp
YmxlLiBUaGlzIG1ha2VzIHN1cmUgaXQgaXMKLSAgICAgICAgLy8gYWx3YXlzIHZpc2libGUgd2hl
biB0aGUgcGFuZWwgaXMgc2hvd24uCi0gICAgICAgIHRoaXMudG9vbGJhckl0ZW0uaGlkZGVuID0g
ZmFsc2U7Ci0gICAgfQotCi0gICAgaGlkZGVuKCkKLSAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rv
ci5TaWRlYmFyUGFuZWwucHJvdG90eXBlLmhpZGRlbi5jYWxsKHRoaXMpOwotCi0gICAgICAgIHRo
aXMuX3VwZGF0ZVRvb2xiYXJJdGVtVmlzaWJpbGl0eSgpOwogICAgIH0KIAogICAgIC8vIFByaXZh
dGUKQEAgLTQ2MCwxMyArNDIzLDYgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFu
ZWwgPSBjbGFzcyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAg
dGhpcy5fYm90dG9tT3ZlcmZsb3dTaGFkb3dFbGVtZW50LnN0eWxlLm9wYWNpdHkgPSAoMSAtIChi
b3R0b21Db3ZlcmFnZSAvIGVkZ2VUaHJlc2hvbGQpKS50b0ZpeGVkKDEpOwogICAgIH0KIAotICAg
IF91cGRhdGVUb29sYmFySXRlbVZpc2liaWxpdHkoKQotICAgIHsKLSAgICAgICAgLy8gSGlkZSB0
aGUgbmF2aWdhdGlvbiBpdGVtIGlmIHJlcXVlc3RlZCBvciBhdXRvLWhpZGluZyBhbmQgd2UgYXJl
IG5vdCB2aXNpYmxlIGFuZCB3ZSBhcmUgZW1wdHkuCi0gICAgICAgIHZhciBzaG91bGRIaWRlID0g
KCh0aGlzLl9oaWRlVG9vbGJhckl0ZW1XaGVuRW1wdHkgfHwgdGhpcy5fYXV0b0hpZGVUb29sYmFy
SXRlbVdoZW5FbXB0eSkgJiYgIXRoaXMuc2VsZWN0ZWQgJiYgIXRoaXMuX2NvbnRlbnRUcmVlT3V0
bGluZS5jaGlsZHJlbi5sZW5ndGgpOwotICAgICAgICB0aGlzLnRvb2xiYXJJdGVtLmhpZGRlbiA9
IHNob3VsZEhpZGU7Ci0gICAgfQotCiAgICAgX2NoZWNrRm9yRW1wdHlGaWx0ZXJSZXN1bHRzKCkK
ICAgICB7CiAgICAgICAgIC8vIE5vIHRyZWUgZWxlbWVudHMsIHNvIGRvbid0IHRvdWNoIHRoZSBl
bXB0eSBjb250ZW50IHBsYWNlaG9sZGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv
clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291
cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVEZXRhaWxzU2lkZWJh
clBhbmVsLmpzCmluZGV4IGFlNzRiZTJhNjkzYmE1ZGQ1NmM5NWZmMTZkMmY2OWNlNDE4MTVhYWIu
LmVhZTIyOTMyNDFmNmYwZmM3YmUyMWI3ZTQ5OGE1ZTJhMzlmOTM1ZmQgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlRGV0YWlsc1NpZGVi
YXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3
cy9Qcm9iZURldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTI4LDcgKzI4LDcgQEAgV2ViSW5zcGVj
dG9yLlByb2JlRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIFByb2JlRGV0YWlsc1NpZGViYXJQ
YW5lbCBleHRlbmRzIFcKIHsKICAgICBjb25zdHJ1Y3RvcigpCiAgICAgewotICAgICAgICBzdXBl
cigicHJvYmUiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlByb2JlcyIpLCBXZWJJbnNwZWN0b3Iu
VUlTdHJpbmcoIlByb2JlcyIpLCAiSW1hZ2VzL05hdmlnYXRpb25JdGVtUHJvYmVzLnN2ZyIsICI2
Iik7CisgICAgICAgIHN1cGVyKCJwcm9iZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUHJvYmVz
IiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUHJvYmVzIikpOwogCiAgICAgICAgIFdlYkluc3Bl
Y3Rvci5wcm9iZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUHJvYmVNYW5h
Z2VyLkV2ZW50LlByb2JlU2V0QWRkZWQsIHRoaXMuX3Byb2JlU2V0QWRkZWQsIHRoaXMpOwogICAg
ICAgICBXZWJJbnNwZWN0b3IucHJvYmVNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj
dG9yLlByb2JlTWFuYWdlci5FdmVudC5Qcm9iZVNldFJlbW92ZWQsIHRoaXMuX3Byb2JlU2V0UmVt
b3ZlZCwgdGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy
ZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZURldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2Uv
V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZURldGFpbHNT
aWRlYmFyUGFuZWwuanMKaW5kZXggN2EwYjgxZmFkZjg3N2NmNzk5ZTIyZTk0YmE0YzVjNzJiODM2
MTNhMi4uNTgwZmY4MmQyZjJkM2U1ZTFhZGMyZTI3Zjg0MDU4Y2IyYWQ4NThkYSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJh
bWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy
SW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAt
MjcsNyArMjcsNyBAQCBXZWJJbnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVEZXRhaWxzU2lkZWJhclBh
bmVsID0gY2xhc3MgUmVuZGVyaW5nRnJhbWVEZXRhaWxzU2lkZQogewogICAgIGNvbnN0cnVjdG9y
KCkKICAgICB7Ci0gICAgICAgIHN1cGVyKCJyZW5kZXJpbmctZnJhbWUtZGV0YWlscyIsIFdlYklu
c3BlY3Rvci5VSVN0cmluZygiRnJhbWVzIiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRnJhbWVz
IiksICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1Eb3VnaG51dENoYXJ0LnN2ZyIpOworICAgICAgICBz
dXBlcigicmVuZGVyaW5nLWZyYW1lLWRldGFpbHMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZy
YW1lcyIpKTsKIAogICAgICAgICB0aGlzLl9mcmFtZVJhbmdlUm93ID0gbmV3IFdlYkluc3BlY3Rv
ci5EZXRhaWxzU2VjdGlvblNpbXBsZVJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZyYW1lcyIp
KTsKICAgICAgICAgdGhpcy5fdGltZVJhbmdlUm93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxz
U2VjdGlvblNpbXBsZVJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWUiKSk7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZURl
dGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj
ZS9WaWV3cy9SZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggOTI2MzcxYTkxY2Q3
MDNiZDcyZjE1YmNiMDM2NjY2YjZiMTU2N2MxYy4uZTcxOWMwNzE0MDMyNTQxYjE0Nzk1NWY4MDQy
Y2UwYzFhZTU1ZGVkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl
cmZhY2UvVmlld3MvUmVzb3VyY2VEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9X
ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlRGV0YWlsc1NpZGViYXJQ
YW5lbC5qcwpAQCAtMjcsNyArMjcsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VEZXRhaWxzU2lk
ZWJhclBhbmVsID0gY2xhc3MgUmVzb3VyY2VEZXRhaWxzU2lkZWJhclBhbmVsIGV4dAogewogICAg
IGNvbnN0cnVjdG9yKCkKICAgICB7Ci0gICAgICAgIHN1cGVyKCJyZXNvdXJjZS1kZXRhaWxzIiwg
V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNvdXJjZSIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco
IlJlc291cmNlIiksICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1GaWxlLnN2ZyIsICIxIik7CisgICAg
ICAgIHN1cGVyKCJyZXNvdXJjZS1kZXRhaWxzIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNv
dXJjZSIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlc291cmNlIikpOwogCiAgICAgICAgIHRo
aXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJyZXNvdXJjZSIpOwogCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5l
bC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNl
U2lkZWJhclBhbmVsLmpzCmluZGV4IDhhMGI5MmFmOTk2MjY0ODA2NTQxMGY5MWRkNDE5YWQyNmNl
MzA2ODAuLmVlNjg2OWRhODJkYTIzZTFiYWNmZmRiN2I4M2E0ZjkwZDUxMzI5MDkgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lk
ZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp
ZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzCkBAIC0yNyw3ICsyNyw3IEBAIFdlYkluc3BlY3Rv
ci5SZXNvdXJjZVNpZGViYXJQYW5lbCA9IGNsYXNzIFJlc291cmNlU2lkZWJhclBhbmVsIGV4dGVu
ZHMgV2ViSW5zcGVjCiB7CiAgICAgY29uc3RydWN0b3IoKQogICAgIHsKLSAgICAgICAgc3VwZXIo
InJlc291cmNlIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNvdXJjZXMiKSwgIkltYWdlcy9O
YXZpZ2F0aW9uSXRlbVN0b3JhZ2Uuc3ZnIiwgIjEiLCB0cnVlLCBmYWxzZSwgdHJ1ZSk7CisgICAg
ICAgIHN1cGVyKCJyZXNvdXJjZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVzb3VyY2VzIiks
IHRydWUsIHRydWUpOwogCiAgICAgICAgIHZhciBzZWFyY2hFbGVtZW50ID0gZG9jdW1lbnQuY3Jl
YXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHNlYXJjaEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgi
c2VhcmNoLWJhciIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl
cmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2Vi
SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQ
YW5lbC5qcwppbmRleCA4YTM3NDE0NTFjODdmZjNiNTgwNDYwMDBjMjM1NTIyMjM4Y2I3OTg2Li40
MzZkOTRjNjUwYWIzNjEzYWY5ODgwNzQzYTFlYjhkYTg2ZjQwOWYyIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUNoYWluRGV0YWlsc1Np
ZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W
aWV3cy9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtMjcsNyArMjcsNyBAQCBX
ZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBTY29wZUNo
YWluRGV0YWlsc1NpZGViYXJQYW5lbAogewogICAgIGNvbnN0cnVjdG9yKCkKICAgICB7Ci0gICAg
ICAgIHN1cGVyKCJzY29wZS1jaGFpbiIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2NvcGUgQ2hh
aW4iKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY29wZSBDaGFpbiIpLCAiSW1hZ2VzL05hdmln
YXRpb25JdGVtVmFyaWFibGUuc3ZnIiwgIjUiKTsKKyAgICAgICAgc3VwZXIoInNjb3BlLWNoYWlu
IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY29wZSBDaGFpbiIpLCBXZWJJbnNwZWN0b3IuVUlT
dHJpbmcoIlNjb3BlIENoYWluIikpOwogCiAgICAgICAgIHRoaXMuX2NhbGxGcmFtZSA9IG51bGw7
CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz
L1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp
ZXdzL1NpZGViYXJQYW5lbC5qcwppbmRleCA3Y2UwMmEyNTlmMWJkZjNkODIxYjAwYzcwZDdjODc5
ZDMxZGIwODc5Li43M2ZmOGY4OTBkNWI4NDFjMGQxNGY4Y2Y2ZDNiMzVhZjVmYWM2NzU3IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFy
UGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv
U2lkZWJhclBhbmVsLmpzCkBAIC0yNSwxNiArMjUsMTIgQEAKIAogV2ViSW5zcGVjdG9yLlNpZGVi
YXJQYW5lbCA9IGNsYXNzIFNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QK
IHsKLSAgICBjb25zdHJ1Y3RvcihpZGVudGlmaWVyLCBkaXNwbGF5TmFtZSwgc2hvd1Rvb2xUaXAs
IGhpZGVUb29sVGlwLCBpbWFnZSwgZWxlbWVudCwgcm9sZSwgbGFiZWwpCisgICAgY29uc3RydWN0
b3IoaWRlbnRpZmllciwgZGlzcGxheU5hbWUsIGVsZW1lbnQsIHJvbGUsIGxhYmVsKQogICAgIHsK
ICAgICAgICAgc3VwZXIoKTsKIAogICAgICAgICB0aGlzLl9pZGVudGlmaWVyID0gaWRlbnRpZmll
cjsKIAotICAgICAgICB0aGlzLl90b29sYmFySXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQWN0aXZh
dGVCdXR0b25Ub29sYmFySXRlbShpZGVudGlmaWVyLCBzaG93VG9vbFRpcCwgaGlkZVRvb2xUaXAs
IGRpc3BsYXlOYW1lLCBpbWFnZSwgbnVsbCwgInRhYiIpOwotICAgICAgICB0aGlzLl90b29sYmFy
SXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5F
dmVudC5DbGlja2VkLCB0aGlzLnRvZ2dsZSwgdGhpcyk7Ci0gICAgICAgIHRoaXMuX3Rvb2xiYXJJ
dGVtLmVuYWJsZWQgPSBmYWxzZTsKLQogICAgICAgICB0aGlzLl9lbGVtZW50ID0gZWxlbWVudCB8
fCBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5j
bGFzc0xpc3QuYWRkKCJwYW5lbCIpOwogICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5h
ZGQoaWRlbnRpZmllcik7CkBAIC01NCwxMSArNTAsNiBAQCBXZWJJbnNwZWN0b3IuU2lkZWJhclBh
bmVsID0gY2xhc3MgU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAg
ICAgICByZXR1cm4gdGhpcy5faWRlbnRpZmllcjsKICAgICB9CiAKLSAgICBnZXQgdG9vbGJhckl0
ZW0oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Rvb2xiYXJJdGVtOwotICAgIH0KLQog
ICAgIGdldCBlbGVtZW50KCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9lbGVtZW50OwpA
QCAtMTIxLDE1ICsxMTIsMTUgQEAgV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lbCA9IGNsYXNzIFNp
ZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICBhZGRlZCgpCiAgICAg
ewogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9wYXJlbnRTaWRlYmFyKTsKLSAgICAgICAg
dGhpcy5fdG9vbGJhckl0ZW0uZW5hYmxlZCA9IHRydWU7Ci0gICAgICAgIHRoaXMuX3Rvb2xiYXJJ
dGVtLmFjdGl2YXRlZCA9IHRoaXMudmlzaWJsZTsKKworICAgICAgICAvLyBJbXBsZW1lbnRlZCBi
eSBzdWJjbGFzc2VzLgogICAgIH0KIAogICAgIHJlbW92ZWQoKQogICAgIHsKICAgICAgICAgY29u
c29sZS5hc3NlcnQoIXRoaXMuX3BhcmVudFNpZGViYXIpOwotICAgICAgICB0aGlzLl90b29sYmFy
SXRlbS5lbmFibGVkID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuX3Rvb2xiYXJJdGVtLmFjdGl2YXRl
ZCA9IGZhbHNlOworCisgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCiAgICAg
fQogCiAgICAgd2lsbFJlbW92ZSgpCkBAIC0xNTQsNyArMTQ1LDcgQEAgV2ViSW5zcGVjdG9yLlNp
ZGViYXJQYW5lbCA9IGNsYXNzIFNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmpl
Y3QKIAogICAgIHZpc2liaWxpdHlEaWRDaGFuZ2UoKQogICAgIHsKLSAgICAgICAgdGhpcy5fdG9v
bGJhckl0ZW0uYWN0aXZhdGVkID0gdGhpcy52aXNpYmxlOworICAgICAgICAvLyBJbXBsZW1lbnRl
ZCBieSBzdWJjbGFzc2VzLgogICAgIH0KIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw
ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzIGIvU291
cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFu
ZWwuanMKaW5kZXggNmE0YWU4YWVlZTdmYTFiZTgwZmQ2ZDFjNGI3NzRiODE4MmM4MjlmZC4uZmUx
Njc2ZWVhNjI3YWI5YWU4NzY4MTk5MzUzZDU2YmVlYmJlZjMwMCAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwu
anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxp
bmVTaWRlYmFyUGFuZWwuanMKQEAgLTI3LDcgKzI3LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l
U2lkZWJhclBhbmVsID0gY2xhc3MgVGltZWxpbmVTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbnNw
ZWMKIHsKICAgICBjb25zdHJ1Y3RvcigpCiAgICAgewotICAgICAgICBzdXBlcigidGltZWxpbmUi
LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWVsaW5lcyIpLCAiSW1hZ2VzL05hdmlnYXRpb25J
dGVtU3RvcHdhdGNoLnN2ZyIsICIyIik7CisgICAgICAgIHN1cGVyKCJ0aW1lbGluZSIsIFdlYklu
c3BlY3Rvci5VSVN0cmluZygiVGltZWxpbmVzIikpOwogCiAgICAgICAgIHRoaXMuX3RpbWVsaW5l
RXZlbnRzVGl0bGVCYXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAg
ICAgICAgIHRoaXMuX3RpbWVsaW5lRXZlbnRzVGl0bGVCYXJFbGVtZW50LmNsYXNzTGlzdC5hZGQo
V2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLlRpdGxlQmFyU3R5bGVDbGFzcyk7CkBA
IC0xMjksNyArMTI5LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsID0gY2xh
c3MgVGltZWxpbmVTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbnNwZWMKIAogICAgIHNob3duKCkK
ICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3Rv
dHlwZS5zaG93bi5jYWxsKHRoaXMpOworICAgICAgICBzdXBlci5zaG93bigpOwogCiAgICAgICAg
IGlmICh0aGlzLl9kaXNwbGF5ZWRDb250ZW50VmlldykKICAgICAgICAgICAgIFdlYkluc3BlY3Rv
ci5jb250ZW50QnJvd3Nlci5zaG93Q29udGVudFZpZXcodGhpcy5fZGlzcGxheWVkQ29udGVudFZp
ZXcpOwpAQCAtMjU0LDcgKzI1NCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5l
bCA9IGNsYXNzIFRpbWVsaW5lU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAKICAgICB1
cGRhdGVGaWx0ZXIoKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRl
YmFyUGFuZWwucHJvdG90eXBlLnVwZGF0ZUZpbHRlci5jYWxsKHRoaXMpOworICAgICAgICBzdXBl
ci51cGRhdGVGaWx0ZXIoKTsKIAogICAgICAgICB0aGlzLl9kaXNwbGF5ZWRDb250ZW50Vmlldy5m
aWx0ZXJEaWRDaGFuZ2UoKTsKICAgICB9Cg==
</data>
<flag name="review"
          id="276142"
          type_id="1"
          status="+"
          setter="joepeck"
    />
    <flag name="commit-queue"
          id="276143"
          type_id="3"
          status="-"
          setter="timothy"
    />
          </attachment>
      

    </bug>

</bugzilla>