106893 2013-01-15 05:20:59 -0800 Web Inspector: refactor DefaultTextEditor's paintLine method 2013-01-15 08:03:18 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 lushnikov lushnikov apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 807211 0 lushnikov 2013-01-15 05:20:59 -0800 Refactor DefaultTextEditor's paintLine method: separate its range rendering functionality into a subroutine. It will be useful in future development. 807217 1 182744 lushnikov 2013-01-15 05:48:41 -0800 Created attachment 182744 Patch 807235 2 182750 lushnikov 2013-01-15 06:15:34 -0800 Created attachment 182750 Patch 807295 3 182750 webkit.review.bot 2013-01-15 07:51:38 -0800 Comment on attachment 182750 Patch Clearing flags on attachment: 182750 Committed r139740: <http://trac.webkit.org/changeset/139740> 807296 4 webkit.review.bot 2013-01-15 07:51:42 -0800 All reviewed patches have been landed. Closing bug. 807309 5 vsevik 2013-01-15 08:03:18 -0800 This patch made closure compiler fail. Source/WebCore/inspector/front-end/DefaultTextEditor.js:1893: WARNING - Property token never defined on {cssClass: string, endColumn: number, startColumn: number} var cssClass = ranges[i].token ? "webkit-" + ranges[i].token : ""; 182744 2013-01-15 05:48:41 -0800 2013-01-15 06:15:29 -0800 Patch bug-106893-20130115174540.patch text/plain 5333 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQ2OTUyYzc2MzNjOTRl MWRlODU1ZDAxY2U2NTkzMzZjMWYxZGIyZS4uMWYyZWQ3YTljMjExMTU0M2FmMzY3NmI0OWZiMDRm ZDc1Y2RhYzgwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDEzLTAxLTE1ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5z cGVjdG9yOiByZWZhY3RvciBEZWZhdWx0VGV4dEVkaXRvcidzIHBhaW50TGluZSBtZXRob2QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjg5MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgcmVuZGVy IHJhbmdlcyBmdW5jdGlvbmFsaXR5IG91dCBvZiBwYWludExpbmUgbWV0aG9kIGludG8gc2VwYXJh dGUgc3Vicm91dGluZS4KKworICAgICAgICBObyBuZXcgdGVzdHM6IG5vIGNoYW5nZSBpbiBiZWhh dmlvdXIuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9y LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBl Ll9yZW5kZXJSYW5nZXMpOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpblBhbmVsLnByb3RvdHlwZS5fcGFpbnRMaW5lKToKKworMjAxMy0wMS0xNSAgQW5kcmV5IEx1 c2huaWtvdiAgPGx1c2huaWtvdkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3Rv cjogcmVmYWN0b3IgRFRFIGhpZ2hsaWdodGVyIHRvIGdlbmVyYXRlIGNzc0NsYXNzZXMgaW5zdGVh ZCBvZiB0b2tlbnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwNjg5NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcwppbmRleCAyNTA4N2NjOGE4Mjg3MmI2NjQ0NmU2Nzky NmQ2M2QzY2NiOGE0MzdjLi4wOTE3YTA1ZjRkMzRiYzEwNTNhYzMxZjM0OTEzNDVkZDRhNTZiNTgx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRU ZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVm YXVsdFRleHRFZGl0b3IuanMKQEAgLTE4NjUsNiArMTg2NSw0OSBAQCBXZWJJbnNwZWN0b3IuVGV4 dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0g e0VsZW1lbnR9IGxpbmVSb3cKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gbGluZQorICAgICAqIEBw YXJhbSB7QXJyYXkuPHtzdGFydENvbHVtbjogbnVtYmVyLCBlbmRDb2x1bW46IG51bWJlciwgY3Nz Q2xhc3M6IHN0cmluZ30+fSByYW5nZXMKKyAgICAgKi8KKyAgICBfcmVuZGVyUmFuZ2VzOiBmdW5j dGlvbihsaW5lUm93LCBsaW5lLCByYW5nZXMpCisgICAgeworICAgICAgICB2YXIgZGVjb3JhdGlv bnNFbGVtZW50ID0gbGluZVJvdy5kZWNvcmF0aW9uc0VsZW1lbnQ7CisKKyAgICAgICAgaWYgKCFk ZWNvcmF0aW9uc0VsZW1lbnQpCisgICAgICAgICAgICBsaW5lUm93LnJlbW92ZUNoaWxkcmVuKCk7 CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgd2hpbGUgKHRydWUpIHsKKyAgICAgICAgICAg ICAgICB2YXIgY2hpbGQgPSBsaW5lUm93LmZpcnN0Q2hpbGQ7CisgICAgICAgICAgICAgICAgaWYg KCFjaGlsZCB8fCBjaGlsZCA9PT0gZGVjb3JhdGlvbnNFbGVtZW50KQorICAgICAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgICAgICBsaW5lUm93LnJlbW92ZUNoaWxkKGNoaWxkKTsK KyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGlmICghbGluZSkKKyAgICAgICAg ICAgIGxpbmVSb3cuaW5zZXJ0QmVmb3JlKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJyIiksIGRl Y29yYXRpb25zRWxlbWVudCk7CisKKyAgICAgICAgdmFyIHBsYWluVGV4dFN0YXJ0ID0gMDsKKyAg ICAgICAgZm9yKHZhciBpID0gMDsgaSA8IHJhbmdlcy5sZW5ndGg7IGkrKykgeworICAgICAgICAg ICAgdmFyIHJhbmdlU3RhcnQgPSByYW5nZXNbaV0uc3RhcnRDb2x1bW47CisgICAgICAgICAgICB2 YXIgcmFuZ2VFbmQgPSByYW5nZXNbaV0uZW5kQ29sdW1uOworICAgICAgICAgICAgdmFyIGNzc0Ns YXNzID0gcmFuZ2VzW2ldLmNzc0NsYXNzOworCisgICAgICAgICAgICBpZiAocGxhaW5UZXh0U3Rh cnQgPCByYW5nZVN0YXJ0KSB7CisgICAgICAgICAgICAgICAgdGhpcy5faW5zZXJ0VGV4dE5vZGVC ZWZvcmUobGluZVJvdywgZGVjb3JhdGlvbnNFbGVtZW50LCBsaW5lLnN1YnN0cmluZyhwbGFpblRl eHRTdGFydCwgcmFuZ2VTdGFydCkpOworICAgICAgICAgICAgICAgIC0tdGhpcy5fcGFpbnRMaW5l c09wZXJhdGlvbnNDcmVkaXQ7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB0aGlzLl9pbnNl cnRTcGFuQmVmb3JlKGxpbmVSb3csIGRlY29yYXRpb25zRWxlbWVudCwgbGluZS5zdWJzdHJpbmco cmFuZ2VTdGFydCwgcmFuZ2VFbmQgKyAxKSwgY3NzQ2xhc3MpOworICAgICAgICAgICAgLS10aGlz Ll9wYWludExpbmVzT3BlcmF0aW9uc0NyZWRpdDsKKyAgICAgICAgICAgIHBsYWluVGV4dFN0YXJ0 ID0gcmFuZ2VFbmQgKyAxOworICAgICAgICB9CisgICAgICAgIGlmIChwbGFpblRleHRTdGFydCA8 IGxpbmUubGVuZ3RoKSB7CisgICAgICAgICAgICB0aGlzLl9pbnNlcnRUZXh0Tm9kZUJlZm9yZShs aW5lUm93LCBkZWNvcmF0aW9uc0VsZW1lbnQsIGxpbmUuc3Vic3RyaW5nKHBsYWluVGV4dFN0YXJ0 LCBsaW5lLmxlbmd0aCkpOworICAgICAgICAgICAgLS10aGlzLl9wYWludExpbmVzT3BlcmF0aW9u c0NyZWRpdDsKKyAgICAgICAgfQorICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0Vs ZW1lbnR9IGxpbmVSb3cKICAgICAgKi8KICAgICBfcGFpbnRMaW5lOiBmdW5jdGlvbihsaW5lUm93 KQogICAgIHsKQEAgLTE4ODEsNDIgKzE5MjQsOSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1h aW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoIWhpZ2hsaWdodCkKICAgICAg ICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIHZhciBkZWNvcmF0aW9uc0VsZW1lbnQg PSBsaW5lUm93LmRlY29yYXRpb25zRWxlbWVudDsKLSAgICAgICAgICAgIGlmICghZGVjb3JhdGlv bnNFbGVtZW50KQotICAgICAgICAgICAgICAgIGxpbmVSb3cucmVtb3ZlQ2hpbGRyZW4oKTsKLSAg ICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgIHdoaWxlICh0cnVlKSB7Ci0gICAgICAg ICAgICAgICAgICAgIHZhciBjaGlsZCA9IGxpbmVSb3cuZmlyc3RDaGlsZDsKLSAgICAgICAgICAg ICAgICAgICAgaWYgKCFjaGlsZCB8fCBjaGlsZCA9PT0gZGVjb3JhdGlvbnNFbGVtZW50KQotICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgIGxpbmVSb3cu cmVtb3ZlQ2hpbGQoY2hpbGQpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0KLQog ICAgICAgICAgICAgdmFyIGxpbmUgPSB0aGlzLl90ZXh0TW9kZWwubGluZShsaW5lTnVtYmVyKTsK ICAgICAgICAgICAgIHZhciByYW5nZXMgPSB0aGlzLl9oaWdobGlnaHRlci5vcmRlcmVkUmFuZ2Vz UGVyTGluZShsaW5lTnVtYmVyKTsKLQotICAgICAgICAgICAgaWYgKCFsaW5lKQotICAgICAgICAg ICAgICAgIGxpbmVSb3cuaW5zZXJ0QmVmb3JlKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJyIiks IGRlY29yYXRpb25zRWxlbWVudCk7Ci0KLSAgICAgICAgICAgIHZhciBwbGFpblRleHRTdGFydCA9 IDA7Ci0gICAgICAgICAgICBmb3IodmFyIGkgPSAwOyBpIDwgcmFuZ2VzLmxlbmd0aDsgaSsrKSB7 Ci0gICAgICAgICAgICAgICAgdmFyIHJhbmdlU3RhcnQgPSByYW5nZXNbaV0uc3RhcnRDb2x1bW47 Ci0gICAgICAgICAgICAgICAgdmFyIHJhbmdlRW5kID0gcmFuZ2VzW2ldLmVuZENvbHVtbjsKLSAg ICAgICAgICAgICAgICB2YXIgY3NzQ2xhc3MgPSByYW5nZXNbaV0uY3NzQ2xhc3M7Ci0KLSAgICAg ICAgICAgICAgICBpZiAocGxhaW5UZXh0U3RhcnQgPCByYW5nZVN0YXJ0KSB7Ci0gICAgICAgICAg ICAgICAgICAgIHRoaXMuX2luc2VydFRleHROb2RlQmVmb3JlKGxpbmVSb3csIGRlY29yYXRpb25z RWxlbWVudCwgbGluZS5zdWJzdHJpbmcocGxhaW5UZXh0U3RhcnQsIHJhbmdlU3RhcnQpKTsKLSAg ICAgICAgICAgICAgICAgICAgLS10aGlzLl9wYWludExpbmVzT3BlcmF0aW9uc0NyZWRpdDsKLSAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgdGhpcy5faW5zZXJ0U3BhbkJlZm9yZShs aW5lUm93LCBkZWNvcmF0aW9uc0VsZW1lbnQsIGxpbmUuc3Vic3RyaW5nKHJhbmdlU3RhcnQsIHJh bmdlRW5kICsgMSksIGNzc0NsYXNzKTsKLSAgICAgICAgICAgICAgICAtLXRoaXMuX3BhaW50TGlu ZXNPcGVyYXRpb25zQ3JlZGl0OwotICAgICAgICAgICAgICAgIHBsYWluVGV4dFN0YXJ0ID0gcmFu Z2VFbmQgKyAxOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKHBsYWluVGV4dFN0YXJ0 IDwgbGluZS5sZW5ndGgpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9pbnNlcnRUZXh0Tm9kZUJl Zm9yZShsaW5lUm93LCBkZWNvcmF0aW9uc0VsZW1lbnQsIGxpbmUuc3Vic3RyaW5nKHBsYWluVGV4 dFN0YXJ0LCBsaW5lLmxlbmd0aCkpOwotICAgICAgICAgICAgICAgIC0tdGhpcy5fcGFpbnRMaW5l c09wZXJhdGlvbnNDcmVkaXQ7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICB0aGlzLl9yZW5k ZXJSYW5nZXMobGluZVJvdywgbGluZSwgcmFuZ2VzKTsKICAgICAgICAgfSBmaW5hbGx5IHsKICAg ICAgICAgICAgIGlmICh0aGlzLl9yYW5nZVRvTWFyayAmJiB0aGlzLl9yYW5nZVRvTWFyay5zdGFy dExpbmUgPT09IGxpbmVOdW1iZXIpCiAgICAgICAgICAgICAgICAgdGhpcy5fbWFya2VkUmFuZ2VF bGVtZW50ID0gV2ViSW5zcGVjdG9yLmhpZ2hsaWdodFNlYXJjaFJlc3VsdChsaW5lUm93LCB0aGlz Ll9yYW5nZVRvTWFyay5zdGFydENvbHVtbiwgdGhpcy5fcmFuZ2VUb01hcmsuZW5kQ29sdW1uIC0g dGhpcy5fcmFuZ2VUb01hcmsuc3RhcnRDb2x1bW4pOwo= 182750 2013-01-15 06:15:34 -0800 2013-01-15 07:51:38 -0800 Patch bug-106893-20130115181234.patch text/plain 5739 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTNiODU3NWFlM2I5MTI5 ZDc3NWQ2ODgwYzU0MjVlOGViNmNjNTRmZi4uMTdhZWE0MDk0MjYxNGFiZjFjMTY1NjIzZTUzYThl ZGQ0ZjRkYmEzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAxLTE1ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiByZWZhY3RvciBEZWZhdWx0VGV4dEVkaXRvcidzIHBhaW50TGluZSBtZXRob2QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjg5MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgcmVuZGVy IHJhbmdlcyBmdW5jdGlvbmFsaXR5IG91dCBvZiBwYWludExpbmUgbWV0aG9kIGludG8gc2VwYXJh dGUgc3Vicm91dGluZS4KKworICAgICAgICBObyBuZXcgdGVzdHM6IG5vIGNoYW5nZSBpbiBiZWhh dmlvdXIuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9y LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBl Ll9yZW5kZXJSYW5nZXMpOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpblBhbmVsLnByb3RvdHlwZS5fcGFpbnRMaW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U ZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5faW5zZXJ0U3BhbkJlZm9yZSk6CisKIDIwMTMt MDEtMTUgIFRvbW15IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAgICAg TWVkaWFTdHJlYW0gQVBJOiBGaXhpbmcgY3Jhc2hpbmcgYnVnIGluIE1lZGlhU3RyZWFtCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRp dG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVk aXRvci5qcwppbmRleCBiN2MxMDIyYTg5NzM4MzUxMDFiZWY0MWVmZGE4MDhkZjhkNTczZmYzLi5j ZjdjMjYyNjIyNTg5ZmU3N2Y3NTU4YjczZTk1ZTgyYWEzN2M3OTA0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanMK QEAgLTE4NjUsNiArMTg2NSw0OSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5w cm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0VsZW1lbnR9IGxpbmVSb3cK KyAgICAgKiBAcGFyYW0ge3N0cmluZ30gbGluZQorICAgICAqIEBwYXJhbSB7QXJyYXkuPHtzdGFy dENvbHVtbjogbnVtYmVyLCBlbmRDb2x1bW46IG51bWJlciwgY3NzQ2xhc3M6IHN0cmluZ30+fSBy YW5nZXMKKyAgICAgKi8KKyAgICBfcmVuZGVyUmFuZ2VzOiBmdW5jdGlvbihsaW5lUm93LCBsaW5l LCByYW5nZXMpCisgICAgeworICAgICAgICB2YXIgZGVjb3JhdGlvbnNFbGVtZW50ID0gbGluZVJv dy5kZWNvcmF0aW9uc0VsZW1lbnQ7CisKKyAgICAgICAgaWYgKCFkZWNvcmF0aW9uc0VsZW1lbnQp CisgICAgICAgICAgICBsaW5lUm93LnJlbW92ZUNoaWxkcmVuKCk7CisgICAgICAgIGVsc2Ugewor ICAgICAgICAgICAgd2hpbGUgKHRydWUpIHsKKyAgICAgICAgICAgICAgICB2YXIgY2hpbGQgPSBs aW5lUm93LmZpcnN0Q2hpbGQ7CisgICAgICAgICAgICAgICAgaWYgKCFjaGlsZCB8fCBjaGlsZCA9 PT0gZGVjb3JhdGlvbnNFbGVtZW50KQorICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgICAgICBsaW5lUm93LnJlbW92ZUNoaWxkKGNoaWxkKTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgfQorCisgICAgICAgIGlmICghbGluZSkKKyAgICAgICAgICAgIGxpbmVSb3cuaW5zZXJ0 QmVmb3JlKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJyIiksIGRlY29yYXRpb25zRWxlbWVudCk7 CisKKyAgICAgICAgdmFyIHBsYWluVGV4dFN0YXJ0ID0gMDsKKyAgICAgICAgZm9yKHZhciBpID0g MDsgaSA8IHJhbmdlcy5sZW5ndGg7IGkrKykgeworICAgICAgICAgICAgdmFyIHJhbmdlU3RhcnQg PSByYW5nZXNbaV0uc3RhcnRDb2x1bW47CisgICAgICAgICAgICB2YXIgcmFuZ2VFbmQgPSByYW5n ZXNbaV0uZW5kQ29sdW1uOworICAgICAgICAgICAgdmFyIGNzc0NsYXNzID0gcmFuZ2VzW2ldLnRv a2VuID8gIndlYmtpdC0iICsgcmFuZ2VzW2ldLnRva2VuIDogIiI7CisKKyAgICAgICAgICAgIGlm IChwbGFpblRleHRTdGFydCA8IHJhbmdlU3RhcnQpIHsKKyAgICAgICAgICAgICAgICB0aGlzLl9p bnNlcnRUZXh0Tm9kZUJlZm9yZShsaW5lUm93LCBkZWNvcmF0aW9uc0VsZW1lbnQsIGxpbmUuc3Vi c3RyaW5nKHBsYWluVGV4dFN0YXJ0LCByYW5nZVN0YXJ0KSk7CisgICAgICAgICAgICAgICAgLS10 aGlzLl9wYWludExpbmVzT3BlcmF0aW9uc0NyZWRpdDsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIHRoaXMuX2luc2VydFNwYW5CZWZvcmUobGluZVJvdywgZGVjb3JhdGlvbnNFbGVtZW50LCBs aW5lLnN1YnN0cmluZyhyYW5nZVN0YXJ0LCByYW5nZUVuZCArIDEpLCBjc3NDbGFzcyk7CisgICAg ICAgICAgICAtLXRoaXMuX3BhaW50TGluZXNPcGVyYXRpb25zQ3JlZGl0OworICAgICAgICAgICAg cGxhaW5UZXh0U3RhcnQgPSByYW5nZUVuZCArIDE7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHBs YWluVGV4dFN0YXJ0IDwgbGluZS5sZW5ndGgpIHsKKyAgICAgICAgICAgIHRoaXMuX2luc2VydFRl eHROb2RlQmVmb3JlKGxpbmVSb3csIGRlY29yYXRpb25zRWxlbWVudCwgbGluZS5zdWJzdHJpbmco cGxhaW5UZXh0U3RhcnQsIGxpbmUubGVuZ3RoKSk7CisgICAgICAgICAgICAtLXRoaXMuX3BhaW50 TGluZXNPcGVyYXRpb25zQ3JlZGl0OworICAgICAgICB9CisgICAgfSwKKworICAgIC8qKgorICAg ICAqIEBwYXJhbSB7RWxlbWVudH0gbGluZVJvdwogICAgICAqLwogICAgIF9wYWludExpbmU6IGZ1 bmN0aW9uKGxpbmVSb3cpCiAgICAgewpAQCAtMTg4MSw0MiArMTkyNCw5IEBAIFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmICghaGln aGxpZ2h0KQogICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgdmFyIGRlY29y YXRpb25zRWxlbWVudCA9IGxpbmVSb3cuZGVjb3JhdGlvbnNFbGVtZW50OwotICAgICAgICAgICAg aWYgKCFkZWNvcmF0aW9uc0VsZW1lbnQpCi0gICAgICAgICAgICAgICAgbGluZVJvdy5yZW1vdmVD aGlsZHJlbigpOwotICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgd2hpbGUgKHRy dWUpIHsKLSAgICAgICAgICAgICAgICAgICAgdmFyIGNoaWxkID0gbGluZVJvdy5maXJzdENoaWxk OwotICAgICAgICAgICAgICAgICAgICBpZiAoIWNoaWxkIHx8IGNoaWxkID09PSBkZWNvcmF0aW9u c0VsZW1lbnQpCi0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAg ICAgICAgbGluZVJvdy5yZW1vdmVDaGlsZChjaGlsZCk7Ci0gICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgfQotCiAgICAgICAgICAgICB2YXIgbGluZSA9IHRoaXMuX3RleHRNb2RlbC5saW5l KGxpbmVOdW1iZXIpOwogICAgICAgICAgICAgdmFyIHJhbmdlcyA9IHRoaXMuX2hpZ2hsaWdodGVy Lm9yZGVyZWRSYW5nZXNQZXJMaW5lKGxpbmVOdW1iZXIpOwotCi0gICAgICAgICAgICBpZiAoIWxp bmUpCi0gICAgICAgICAgICAgICAgbGluZVJvdy5pbnNlcnRCZWZvcmUoZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiYnIiKSwgZGVjb3JhdGlvbnNFbGVtZW50KTsKLQotICAgICAgICAgICAgdmFyIHBs YWluVGV4dFN0YXJ0ID0gMDsKLSAgICAgICAgICAgIGZvcih2YXIgaSA9IDA7IGkgPCByYW5nZXMu bGVuZ3RoOyBpKyspIHsKLSAgICAgICAgICAgICAgICB2YXIgcmFuZ2VTdGFydCA9IHJhbmdlc1tp XS5zdGFydENvbHVtbjsKLSAgICAgICAgICAgICAgICB2YXIgcmFuZ2VFbmQgPSByYW5nZXNbaV0u ZW5kQ29sdW1uOwotICAgICAgICAgICAgICAgIHZhciByYW5nZVRva2VuID0gcmFuZ2VzW2ldLnRv a2VuOwotCi0gICAgICAgICAgICAgICAgaWYgKHBsYWluVGV4dFN0YXJ0IDwgcmFuZ2VTdGFydCkg ewotICAgICAgICAgICAgICAgICAgICB0aGlzLl9pbnNlcnRUZXh0Tm9kZUJlZm9yZShsaW5lUm93 LCBkZWNvcmF0aW9uc0VsZW1lbnQsIGxpbmUuc3Vic3RyaW5nKHBsYWluVGV4dFN0YXJ0LCByYW5n ZVN0YXJ0KSk7Ci0gICAgICAgICAgICAgICAgICAgIC0tdGhpcy5fcGFpbnRMaW5lc09wZXJhdGlv bnNDcmVkaXQ7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHRoaXMuX2luc2Vy dFNwYW5CZWZvcmUobGluZVJvdywgZGVjb3JhdGlvbnNFbGVtZW50LCBsaW5lLnN1YnN0cmluZyhy YW5nZVN0YXJ0LCByYW5nZUVuZCArIDEpLCByYW5nZVRva2VuKTsKLSAgICAgICAgICAgICAgICAt LXRoaXMuX3BhaW50TGluZXNPcGVyYXRpb25zQ3JlZGl0OwotICAgICAgICAgICAgICAgIHBsYWlu VGV4dFN0YXJ0ID0gcmFuZ2VFbmQgKyAxOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYg KHBsYWluVGV4dFN0YXJ0IDwgbGluZS5sZW5ndGgpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9p bnNlcnRUZXh0Tm9kZUJlZm9yZShsaW5lUm93LCBkZWNvcmF0aW9uc0VsZW1lbnQsIGxpbmUuc3Vi c3RyaW5nKHBsYWluVGV4dFN0YXJ0LCBsaW5lLmxlbmd0aCkpOwotICAgICAgICAgICAgICAgIC0t dGhpcy5fcGFpbnRMaW5lc09wZXJhdGlvbnNDcmVkaXQ7Ci0gICAgICAgICAgICB9CisgICAgICAg ICAgICB0aGlzLl9yZW5kZXJSYW5nZXMobGluZVJvdywgbGluZSwgcmFuZ2VzKTsKICAgICAgICAg fSBmaW5hbGx5IHsKICAgICAgICAgICAgIGlmICh0aGlzLl9yYW5nZVRvTWFyayAmJiB0aGlzLl9y YW5nZVRvTWFyay5zdGFydExpbmUgPT09IGxpbmVOdW1iZXIpCiAgICAgICAgICAgICAgICAgdGhp cy5fbWFya2VkUmFuZ2VFbGVtZW50ID0gV2ViSW5zcGVjdG9yLmhpZ2hsaWdodFNlYXJjaFJlc3Vs dChsaW5lUm93LCB0aGlzLl9yYW5nZVRvTWFyay5zdGFydENvbHVtbiwgdGhpcy5fcmFuZ2VUb01h cmsuZW5kQ29sdW1uIC0gdGhpcy5fcmFuZ2VUb01hcmsuc3RhcnRDb2x1bW4pOwpAQCAtMjEyMyw3 ICsyMTMzLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlID0g ewogICAgICAgICB9CiAKICAgICAgICAgdmFyIHNwYW4gPSB0aGlzLl9jYWNoZWRTcGFucy5wb3Ao KSB8fCBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgIHNwYW4uY2xhc3NO YW1lID0gIndlYmtpdC0iICsgY2xhc3NOYW1lOworICAgICAgICBzcGFuLmNsYXNzTmFtZSA9IGNs YXNzTmFtZTsKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5GQUxTRSkgLy8gRm9yIHBhaW50IGRl YnVnZ2luZy4KICAgICAgICAgICAgIHNwYW4uYWRkU3R5bGVDbGFzcygiZGVidWctZmFkZW91dCIp OwogICAgICAgICBzcGFuLnRleHRDb250ZW50ID0gY29udGVudDsK