211486 2020-05-05 20:17:23 -0700 Web Inspector: Layers: the text at the bottom of the details sidebar can get squished 2020-05-06 13:34:10 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1649471 0 hi 2020-05-05 20:17:23 -0700 # STEPS TO REPRODUCE 1. inspect any page 2. go to the Layers Tab 3. make the details sidebar as small as possible => the text at the bottom of the details sidebar overlaps 1649477 1 398583 hi 2020-05-05 20:39:29 -0700 Created attachment 398583 Patch 1649670 2 398583 bburg 2020-05-06 09:51:12 -0700 Comment on attachment 398583 Patch r=me 1649680 3 ews-feeder 2020-05-06 10:14:31 -0700 Committed r261237: <https://trac.webkit.org/changeset/261237> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398583. 1649681 4 webkit-bug-importer 2020-05-06 10:15:16 -0700 <rdar://problem/62935351> 1649773 5 hi 2020-05-06 13:34:10 -0700 *** Bug 211485 has been marked as a duplicate of this bug. *** 398583 2020-05-05 20:39:29 -0700 2020-05-06 10:14:32 -0700 Patch 211486.diff text/plain 11327 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGFmODYxZGZjZTFkLi5iYWQ5OGZlMDkwZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMjAtMDUtMDUgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IExh eWVyczogdGhlIHRleHQgYXQgdGhlIGJvdHRvbSBvZiB0aGUgZGV0YWlscyBzaWRlYmFyIGNhbiBn ZXQgc3F1aXNoZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxMTQ4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFyLmpzOgorICAgICAgICAoV0kuU2lkZWJh ci5wcm90b3R5cGUuZ2V0IG1pbmltdW1XaWR0aCk6CisgICAgICAgIEFzayBib3RoIHRoZSBgdGhp cy5fbmF2aWdhdGlvbkJhcmAgYW5kIGB0aGlzLl9zZWxlY3RlZFNpZGViYXJQYW5lbGAgaW5zdGVh ZCBvZiBqdXN0IG9uZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFN0 eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLkdlbmVyYWxTdHlsZURldGFp bHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLmdldCBtaW5pbXVtV2lkdGgpOiBBZGRlZC4KKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwuanM6Cisg ICAgICAgIChXSS5Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5nZXQgbWluaW11 bVdpZHRoKTogQWRkZWRlLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9kZWxE ZXRhaWxzU2VjdGlvblJvdy5qczoKKyAgICAgICAgKFdJLkJveE1vZGVsRGV0YWlsc1NlY3Rpb25S b3cpOgorICAgICAgICAoV0kuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5wcm90b3R5cGUuZ2V0 IG1pbmltdW1XaWR0aCk6IEFkZGVkLgorICAgICAgICAoV0kuQm94TW9kZWxEZXRhaWxzU2VjdGlv blJvdy5wcm90b3R5cGUuX3VwZGF0ZU1ldHJpY3MpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5jc3M6CisgICAgICAgICguZGV0YWlscy1z ZWN0aW9uIC5yb3cuYm94LW1vZGVsKToKKyAgICAgICAgS2VlcCB0cmFjayBvZiB0aGUgb3V0ZXJt b3N0IGJveCBhbmQgcHJvdmlkZSBhIHdheSB0byByZXBvcnQgaXRzIHdpZHRoLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9MYXllckRldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAg ICAgIChXSS5MYXllckRldGFpbHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAoV0kuTGF5ZXJEZXRh aWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5nZXQgbWluaW11bVdpZHRoKTogQWRkZWQuCisgICAg ICAgIChXSS5MYXllckRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9idWlsZEJvdHRvbUJh cik6CisgICAgICAgIChXSS5MYXllckRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl91cGRh dGVCb3R0b21CYXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJEZXRhaWxz U2lkZWJhclBhbmVsLmNzczoKKyAgICAgICAgKC5wYW5lbC5kZXRhaWxzLmxheWVyIC5ib3R0b20t YmFyKToKKyAgICAgICAgKC5wYW5lbC5kZXRhaWxzLmxheWVyIC5ib3R0b20tYmFyID4gZGl2KToK KyAgICAgICAgQ2FjaGUgdGhlIHdpZHRoIG9mIHRoZSBpdGVtcyBpbiB0aGUgYm90dG9tIGJhciBh bmQgdXNlIGl0IGluIGBnZXQgbWluaW11bVdpZHRoYC4KKwogMjAyMC0wNS0wNSAgRGV2aW4gUm91 c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVW5jYXVn aHQgRXhjZXB0aW9uOiB1bmRlZmluZWQgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAndGhp cy5JbnNwZWN0b3JBZ2VudC5pbml0aWFsaXplZCcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LmNz cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JveE1vZGVsRGV0 YWlsc1NlY3Rpb25Sb3cuY3NzCmluZGV4IGNmN2FkNGI5ZjZiLi5iZDA3MmI4ZDVmZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9kZWxE ZXRhaWxzU2VjdGlvblJvdy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5jc3MKQEAgLTI0LDcgKzI0LDcg QEAKICAqLwogCiAuZGV0YWlscy1zZWN0aW9uIC5yb3cuYm94LW1vZGVsIHsKLSAgICBwYWRkaW5n OiA2cHg7CisgICAgcGFkZGluZy1ib3R0b206IDZweDsKICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7 CiAgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKIH0KQEAgLTMyLDcgKzMyLDcgQEAKIC5kZXRhaWxz LXNlY3Rpb24gLnJvdy5ib3gtbW9kZWwgLmJveCB7CiAgICAgZGlzcGxheTogaW5saW5lLWJsb2Nr OwogICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKLSAgICBtYXJnaW46IDNweDsKKyAgICBtYXJnaW46 IDNweDsgLyogS2VlcCB0aGlzIGluIHN5bmMgd2l0aCBgV0kuQm94TW9kZWxEZXRhaWxzU2VjdGlv blJvdy5wcm90b3R5cGUuZ2V0IG1pbmltdW1XaWR0aGAuICovCiAgICAgcGFkZGluZzogM3B4Owog ICAgIHRleHQtYWxpZ246IGNlbnRlcjsKICAgICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9k ZWxEZXRhaWxzU2VjdGlvblJvdy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMKaW5kZXggMDRiODNmMGRhNjIu LjUwOTQwOWVjMzFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cu anMKQEAgLTMyLDYgKzMyLDkgQEAgV0kuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdyA9IGNsYXNz IEJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cgZXh0ZW5kcyBXSS5EZXRhaWwKICAgICAgICAgdGhp cy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImJveC1tb2RlbCIpOwogCiAgICAgICAgIHRoaXMuX25v ZGVTdHlsZXMgPSBudWxsOworCisgICAgICAgIHRoaXMuX291dGVybW9zdEJveCA9IG51bGw7Cisg ICAgICAgIHRoaXMuX291dGVybW9zdEJveFdpZHRoID0gTmFOOwogICAgIH0KIAogICAgIC8vIFB1 YmxpYwpAQCAtNTMsNiArNTYsMTUgQEAgV0kuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdyA9IGNs YXNzIEJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cgZXh0ZW5kcyBXSS5EZXRhaWwKICAgICAgICAg dGhpcy5fcmVmcmVzaCgpOwogICAgIH0KIAorICAgIGdldCBtaW5pbXVtV2lkdGgoKQorICAgIHsK KyAgICAgICAgaWYgKGlzTmFOKHRoaXMuX291dGVybW9zdEJveFdpZHRoKSAmJiB0aGlzLl9vdXRl cm1vc3RCb3gpIHsKKyAgICAgICAgICAgIGNvbnN0IG1hcmdpbiA9IDY7IC8vIEtlZXAgdGhpcyBp biBzeW5jIHdpdGggYC5kZXRhaWxzLXNlY3Rpb24gLnJvdy5ib3gtbW9kZWwgLmJveGAuCisgICAg ICAgICAgICB0aGlzLl9vdXRlcm1vc3RCb3hXaWR0aCA9IHRoaXMuX291dGVybW9zdEJveC5yZWFs T2Zmc2V0V2lkdGggKyBtYXJnaW47CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHRoaXMuX291 dGVybW9zdEJveFdpZHRoIHx8IDA7CisgICAgfQorCiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX3Jl ZnJlc2goKQpAQCAtMjM1LDcgKzI0Nyw5IEBAIFdJLkJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cg PSBjbGFzcyBCb3hNb2RlbERldGFpbHNTZWN0aW9uUm93IGV4dGVuZHMgV0kuRGV0YWlsCiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgcHJldmlvdXNCb3ggPSBu dWxsOworICAgICAgICB0aGlzLl9vdXRlcm1vc3RCb3ggPSBudWxsOworICAgICAgICB0aGlzLl9v dXRlcm1vc3RCb3hXaWR0aCA9IE5hTjsKKwogICAgICAgICBmb3IgKGxldCBuYW1lIG9mIFsiY29u dGVudCIsICJwYWRkaW5nIiwgImJvcmRlciIsICJtYXJnaW4iLCAicG9zaXRpb24iXSkgewogCiAg ICAgICAgICAgICBpZiAobmFtZSA9PT0gIm1hcmdpbiIgJiYgbm9NYXJnaW5EaXNwbGF5VHlwZVtk aXNwbGF5UHJvcGVydHkudmFsdWVdKQpAQCAtMzAzLDggKzMxNyw4IEBAIFdJLkJveE1vZGVsRGV0 YWlsc1NlY3Rpb25Sb3cgPSBjbGFzcyBCb3hNb2RlbERldGFpbHNTZWN0aW9uUm93IGV4dGVuZHMg V0kuRGV0YWlsCiAgICAgICAgICAgICAgICAgYm94RWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJiciIpKTsKICAgICAgICAgICAgICAgICBib3hFbGVtZW50LmFwcGVu ZENoaWxkKGxlZnRFbGVtZW50KTsKIAotICAgICAgICAgICAgICAgIGlmIChwcmV2aW91c0JveCkK LSAgICAgICAgICAgICAgICAgICAgYm94RWxlbWVudC5hcHBlbmRDaGlsZChwcmV2aW91c0JveCk7 CisgICAgICAgICAgICAgICAgaWYgKHRoaXMuX291dGVybW9zdEJveCkKKyAgICAgICAgICAgICAg ICAgICAgYm94RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9vdXRlcm1vc3RCb3gpOwogCiAgICAg ICAgICAgICAgICAgYm94RWxlbWVudC5hcHBlbmRDaGlsZChyaWdodEVsZW1lbnQpOwogICAgICAg ICAgICAgICAgIGJveEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi YnIiKSk7CkBAIC0zMTgsMTAgKzMzMiwxMCBAQCBXSS5Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93 ID0gY2xhc3MgQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdyBleHRlbmRzIFdJLkRldGFpbAogICAg ICAgICAgICAgICAgICAgICBib3hFbGVtZW50LmFwcGVuZENoaWxkKGJvcmRlckJvdHRvbVJpZ2h0 UmFkaXVzRWxlbWVudCk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHByZXZpb3VzQm94 ID0gYm94RWxlbWVudDsKKyAgICAgICAgICAgIHRoaXMuX291dGVybW9zdEJveCA9IGJveEVsZW1l bnQ7CiAgICAgICAgIH0KIAotICAgICAgICBtZXRyaWNzRWxlbWVudC5hcHBlbmRDaGlsZChwcmV2 aW91c0JveCk7CisgICAgICAgIG1ldHJpY3NFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX291dGVy bW9zdEJveCk7CiAgICAgICAgIG1ldHJpY3NFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNl b3ZlciIsIHRoaXMuX2hpZ2hsaWdodERPTU5vZGUuYmluZCh0aGlzLCBmYWxzZSwgIiIpLCBmYWxz ZSk7CiAKICAgICAgICAgdGhpcy5oaWRlRW1wdHlNZXNzYWdlKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWls c1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29t cHV0ZWRTdHlsZURldGFpbHNQYW5lbC5qcwppbmRleCA0MWRkY2YzNThjYy4uOGViMzdiNzcwNDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nv bXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbC5qcwpAQCAtMzcsNiAr MzcsMTEgQEAgV0kuQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIENvbXB1dGVkU3R5 bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXSS5TdHlsZUQKIAogICAgIC8vIFB1YmxpYwogCisgICAg Z2V0IG1pbmltdW1XaWR0aCgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fYm94TW9kZWxE aWFncmFtUm93Lm1pbmltdW1XaWR0aDsKKyAgICB9CisKICAgICByZWZyZXNoKHNpZ25pZmljYW50 Q2hhbmdlKQogICAgIHsKICAgICAgICAgLy8gV2Ugb25seSBuZWVkIHRvIGRvIGEgcmVidWlsZCBv biBzaWduaWZpY2FudCBjaGFuZ2VzLiBPdGhlciBjaGFuZ2VzIGFyZSBoYW5kbGVkCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsU3R5 bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvR2VuZXJhbFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCAxZDQ5 NTI3NTdjZS4uODhmMjk2NWZmYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFN0eWxl RGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtNDMsNiArNDMsMTEgQEAgV0kuR2VuZXJhbFN0eWxl RGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIEdlbmVyYWxTdHlsZURldGFpbHNTaWRlYmFyUGFu ZWwgZXh0ZW4KIAogICAgIGdldCBwYW5lbCgpIHsgcmV0dXJuIHRoaXMuX3BhbmVsOyB9CiAKKyAg ICBnZXQgbWluaW11bVdpZHRoKCkKKyAgICB7CisgICAgICAgIHJldHVybiBNYXRoLm1heChzdXBl ci5taW5pbXVtV2lkdGgsIHRoaXMuX3BhbmVsLm1pbmltdW1XaWR0aCB8fCAwKTsKKyAgICB9CisK ICAgICBzdXBwb3J0c0RPTU5vZGUobm9kZVRvSW5zcGVjdCkKICAgICB7CiAgICAgICAgIHJldHVy biBub2RlVG9JbnNwZWN0Lm5vZGVUeXBlKCkgPT09IE5vZGUuRUxFTUVOVF9OT0RFOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJEZXRh aWxzU2lkZWJhclBhbmVsLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKaW5kZXggNmExZDZkZTI1NjcuLjFm OThhNzc2MWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9MYXllckRldGFpbHNTaWRlYmFyUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MK QEAgLTU1LDYgKzU1LDcgQEAKIC5wYW5lbC5kZXRhaWxzLmxheWVyIC5ib3R0b20tYmFyIHsKICAg ICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgZGlzcGxheTogZmxleDsKKyAgICBqdXN0aWZ5LWNv bnRlbnQ6IHNwYWNlLWJldHdlZW47CiAgICAgYm90dG9tOiAwOwogICAgIGhlaWdodDogdmFyKC0t Y29uc29sZS1wcm9tcHQtbWluLWhlaWdodCk7CiAgICAgd2lkdGg6IDEwMCU7CkBAIC02Myw3ICs2 NCw2IEBACiAKIC5wYW5lbC5kZXRhaWxzLmxheWVyIC5ib3R0b20tYmFyID4gZGl2IHsKICAgICBk aXNwbGF5OiBmbGV4OwotICAgIGZsZXg6IDE7CiAgICAgcGFkZGluZzogNHB4IDZweDsKICAgICBs aW5lLWhlaWdodDogMjBweDsKICAgICB3aGl0ZS1zcGFjZTogbm93cmFwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJEZXRhaWxzU2lk ZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IDMyMzMyOTAyZjhjLi5iZjJhYzNlMjY3 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtNDAsMTIg KzQwLDI1IEBAIFdJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIExheWVyRGV0YWls c1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLkRldGFpbHNTCiAgICAgICAgIHRoaXMuX2RhdGFHcmlk Tm9kZXNCeUxheWVySWQgPSBuZXcgTWFwOwogCiAgICAgICAgIHRoaXMuX2JvdHRvbUJhciA9IG51 bGw7CisgICAgICAgIHRoaXMuX2JvdHRvbUJhcldpZHRoID0gTmFOOwogICAgICAgICB0aGlzLl9s YXllcnNDb3VudExhYmVsID0gbnVsbDsKICAgICAgICAgdGhpcy5fbGF5ZXJzTWVtb3J5TGFiZWwg PSBudWxsOwogICAgIH0KIAogICAgIC8vIFB1YmxpYwogCisgICAgZ2V0IG1pbmltdW1XaWR0aCgp CisgICAgeworICAgICAgICBsZXQgbWluaW11bVdpZHRoID0gc3VwZXIubWluaW11bVdpZHRoOwor CisgICAgICAgIGlmIChpc05hTih0aGlzLl9ib3R0b21CYXJXaWR0aCkgJiYgdGhpcy5fbGF5ZXJz Q291bnRMYWJlbCAmJiB0aGlzLl9sYXllcnNNZW1vcnlMYWJlbCkKKyAgICAgICAgICAgIHRoaXMu X2JvdHRvbUJhcldpZHRoID0gdGhpcy5fbGF5ZXJzQ291bnRMYWJlbC5yZWFsT2Zmc2V0V2lkdGgg KyB0aGlzLl9sYXllcnNNZW1vcnlMYWJlbC5yZWFsT2Zmc2V0V2lkdGg7CisgICAgICAgIGlmICgh aXNOYU4odGhpcy5fYm90dG9tQmFyV2lkdGgpKQorICAgICAgICAgICAgbWluaW11bVdpZHRoID0g TWF0aC5tYXgobWluaW11bVdpZHRoLCB0aGlzLl9ib3R0b21CYXJXaWR0aCk7CisKKyAgICAgICAg cmV0dXJuIG1pbmltdW1XaWR0aDsKKyAgICB9CisKICAgICBpbnNwZWN0KG9iamVjdHMpCiAgICAg ewogICAgICAgICBpZiAoIShvYmplY3RzIGluc3RhbmNlb2YgQXJyYXkpKQpAQCAtMTI2LDYgKzEz OSw4IEBAIFdJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIExheWVyRGV0YWlsc1Np ZGViYXJQYW5lbCBleHRlbmRzIFdJLkRldGFpbHNTCiAKICAgICAgICAgdGhpcy5fbGF5ZXJzTWVt b3J5TGFiZWwgPSB0aGlzLl9ib3R0b21CYXIuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2IikpOwogICAgICAgICB0aGlzLl9sYXllcnNNZW1vcnlMYWJlbC5jbGFzc05hbWUg PSAibGF5ZXJzLW1lbW9yeS1sYWJlbCI7CisKKyAgICAgICAgdGhpcy5fYm90dG9tQmFyV2lkdGgg PSBOYU47CiAgICAgfQogCiAgICAgX3NvcnREYXRhR3JpZCgpCkBAIC0yMzIsNiArMjQ3LDggQEAg V0kuTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgTGF5ZXJEZXRhaWxzU2lkZWJhclBh bmVsIGV4dGVuZHMgV0kuRGV0YWlsc1MKIAogICAgICAgICBsZXQgdG90YWxNZW1vcnkgPSBuZXdM YXllcnMucmVkdWNlKCh0b3RhbCwgbGF5ZXIpID0+IHRvdGFsICsgKGxheWVyLm1lbW9yeSB8fCAw KSwgMCk7CiAgICAgICAgIHRoaXMuX2xheWVyc01lbW9yeUxhYmVsLnRleHRDb250ZW50ID0gV0ku VUlTdHJpbmcoIk1lbW9yeTogJXMiKS5mb3JtYXQoTnVtYmVyLmJ5dGVzVG9TdHJpbmcodG90YWxN ZW1vcnkpKTsKKworICAgICAgICB0aGlzLl9ib3R0b21CYXJXaWR0aCA9IE5hTjsKICAgICB9CiB9 OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9MYXllcnNUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0xheWVyc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDM0ODYzM2QzYmIyLi41 NDJmNzBiYjRhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTGF5ZXJzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzVGFiQ29udGVudFZpZXcuanMKQEAgLTI5LDYg KzI5LDcgQEAgV0kuTGF5ZXJzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBMYXllcnNUYWJDb250ZW50 VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyVGEKICAgICB7CiAgICAgICAgIHN1cGVyKExh eWVyc1RhYkNvbnRlbnRWaWV3LnRhYkluZm8oKSwgewogICAgICAgICAgICAgZGV0YWlsc1NpZGVi YXJQYW5lbENvbnN0cnVjdG9yczogW1dJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbF0sCisgICAg ICAgICAgICBkaXNhYmxlQmFja0ZvcndhcmQ6IHRydWUsCiAgICAgICAgIH0pOwogCiAgICAgICAg IHRoaXMuX2xheWVyRGV0YWlsc1NpZGViYXJQYW5lbCA9IHRoaXMuZGV0YWlsc1NpZGViYXJQYW5l bHNbMF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TaWRlYmFyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2lkZWJhci5qcwppbmRleCA2NGRjODk1MzA1OC4uNjIxYTQzNDFhNzkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5qcwpA QCAtMTQ4LDExICsxNDgsMTIgQEAgV0kuU2lkZWJhciA9IGNsYXNzIFNpZGViYXIgZXh0ZW5kcyBX SS5WaWV3CiAKICAgICBnZXQgbWluaW11bVdpZHRoKCkKICAgICB7CisgICAgICAgIGxldCBtaW5p bXVtV2lkdGggPSBXSS5TaWRlYmFyLkFic29sdXRlTWluaW11bVdpZHRoOwogICAgICAgICBpZiAo dGhpcy5fbmF2aWdhdGlvbkJhcikKLSAgICAgICAgICAgIHJldHVybiBNYXRoLm1heChXSS5TaWRl YmFyLkFic29sdXRlTWluaW11bVdpZHRoLCB0aGlzLl9uYXZpZ2F0aW9uQmFyLm1pbmltdW1XaWR0 aCk7CisgICAgICAgICAgICBtaW5pbXVtV2lkdGggPSBNYXRoLm1heChtaW5pbXVtV2lkdGgsIHRo aXMuX25hdmlnYXRpb25CYXIubWluaW11bVdpZHRoKTsKICAgICAgICAgaWYgKHRoaXMuX3NlbGVj dGVkU2lkZWJhclBhbmVsKQotICAgICAgICAgICAgcmV0dXJuIE1hdGgubWF4KFdJLlNpZGViYXIu QWJzb2x1dGVNaW5pbXVtV2lkdGgsIHRoaXMuX3NlbGVjdGVkU2lkZWJhclBhbmVsLm1pbmltdW1X aWR0aCk7Ci0gICAgICAgIHJldHVybiBXSS5TaWRlYmFyLkFic29sdXRlTWluaW11bVdpZHRoOwor ICAgICAgICAgICAgbWluaW11bVdpZHRoID0gTWF0aC5tYXgobWluaW11bVdpZHRoLCB0aGlzLl9z ZWxlY3RlZFNpZGViYXJQYW5lbC5taW5pbXVtV2lkdGgpOworICAgICAgICByZXR1cm4gbWluaW11 bVdpZHRoOwogICAgIH0KIAogICAgIGdldCBtYXhpbXVtV2lkdGgoKQo=