150677 2015-10-29 10:35:27 -0700 Web Inspector: Navigation bar icons are missing 2015-10-29 11:36:09 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 150602 1 timothy timothy bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1137554 0 timothy 2015-10-29 10:35:27 -0700 I made a change before landing bug 150602 and it caused a regression. This cleans things up. 1137556 1 webkit-bug-importer 2015-10-29 10:35:50 -0700 <rdar://problem/23316752> 1137559 2 264322 timothy 2015-10-29 10:45:06 -0700 Created attachment 264322 Patch 1137560 3 264322 joepeck 2015-10-29 10:47:33 -0700 Comment on attachment 264322 Patch r=me 1137585 4 264322 commit-queue 2015-10-29 11:36:06 -0700 Comment on attachment 264322 Patch Clearing flags on attachment: 264322 Committed r191740: <http://trac.webkit.org/changeset/191740> 1137586 5 commit-queue 2015-10-29 11:36:09 -0700 All reviewed patches have been landed. Closing bug. 264322 2015-10-29 10:45:06 -0700 2015-10-29 11:36:06 -0700 Patch bug-150677-20151029104415.patch text/plain 14685 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNjk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 YzYyZWRkN2MyMGM3YjM1NjVkYjkyNzAxNjRiNjRlODNiMjE4ODEyLi4wNjY1OTY1M2ViYzM5OWIw ZGVhMWY5M2I2NWU1NTFjZDllNmNiMmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MyBAQAorMjAxNS0xMC0yOSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTmF2aWdhdGlvbiBiYXIgaWNvbnMgYXJlIG1p c3NpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 MDY3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSBnbHlwaCB3aWR0aCBhbmQgaGVpZ2h0IHdlcmUgbm90IGJlaW5nIHNldCBjb3JyZWN0bHkgYW5k IGl0IGJyb2tlIE5hdmlnYXRpb25CYXIgYnV0dG9ucy4KKyAgICAgICAgVGhlIHdpZHRoIGFuZCBo ZWlnaHQgYXR0cmlidXRlIHdhcyBiZWluZyBzZXQgb24gYSBkaXYsIHdoZW4gaXQgc2hvdWxkIGhh dmUgdXNlZCB0aGUgc3R5bGUgcHJvcGVydHkuCisgICAgICAgIEFsc28gcmVtb3ZlIHRoZSBzdXBw cmVzc0VtYm9zcyBmbGFnLCB3aGljaCBpcyBubyBsb25nZXIgdXNlZCBidXQgdGhlIGNsaWVudHMg YW5kIHN1YmNsYXNzZXMgc3RpbGwgZGlkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNl L0ltYWdlVXRpbGl0aWVzLmpzOgorICAgICAgICAodXNlU1ZHU3ltYm9sKTogVXNlIHN0eWxlIHBy b3BlcnR5IGluc3RlYWQgb2Ygc2V0dGluZyB3aWR0aCBhbmQgaGVpZ2h0LiBUaGUgYXR0cmlidXRl cworICAgICAgICBkaWRuJ3QgYWNjb21wbGlzaCB0aGUgc2FtZSB0aGluZyBpbiBhbGwgY2FzZXMu IFVzZSB0aXRsZSBhbmQgY2xhc3NOYW1lIHByb3BlcnR5IG9uIHRoZQorICAgICAgICB3cmFwcGVy IGVsZW1lbnQgYW5kIHJlbW92ZSB0aGUgY29tbWVudHMsIHdoaWNoIGFwcGxpZWQgd2hlbiB0aGVy ZSB3YXNuJ3QgYSB3cmFwcGVyLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9BY3Rp dmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFjdGl2 YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0pOiBSZW1vdmUgc3VwcHJlc3NFbWJvc3MuCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9BY3RpdmF0ZUJ1dHRvblRvb2xiYXJJdGVtLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkFjdGl2YXRlQnV0dG9uVG9vbGJhckl0ZW0pOiBSZW1vdmUgc3Vw cHJlc3NFbWJvc3MuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvbk5hdmln YXRpb25JdGVtLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVt KTogUmVtb3ZlIHN1cHByZXNzRW1ib3NzLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJ1dHRvbk5h dmlnYXRpb25JdGVtLnByb3RvdHlwZS5zZXQgaW1hZ2UpOiBVc2Ugc3R5bGUgcHJvcGVydHkgaW5z dGVhZCBvZiBzZXR0aW5nCisgICAgICAgIHdpZHRoIGFuZCBoZWlnaHQgYXR0cmlidXRlcy4gVGhp cyBhc3N1bWVkIHRoZSBTVkcgZWxlbWVudCB3YXMgdGhlIGdseXBoIGVsZW1lbnQsIHdoaWNoIGNo YW5nZWQKKyAgICAgICAgYXQgb25lIHBvaW50IHdpdGhvdXQgbWUgcmVtZW1iZXJpbmcgdG8gZml4 IHRoaXMgY2xpZW50LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9CdXR0b25Ub29s YmFySXRlbS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CdXR0b25Ub29sYmFySXRlbSk6ICBS ZW1vdmUgc3VwcHJlc3NFbWJvc3MuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1 Z2dlckRhc2hib2FyZFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJEYXNo Ym9hcmRWaWV3KTogUmVtb3ZlIHN1cHByZXNzRW1ib3NzIHVzZS4KKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0ZpbHRlckJhci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWx0ZXJC YXIucHJvdG90eXBlLmFkZEZpbHRlckJhckJ1dHRvbik6IFJlbW92ZSBzdXBwcmVzc0VtYm9zcy4K KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbHRlckJhckJ1dHRvbi5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5GaWx0ZXJCYXJCdXR0b24pOiBSZW1vdmUgc3VwcHJlc3NFbWJvc3Mu CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCk6ICBSZW1vdmUgc3Vw cHJlc3NFbWJvc3MgdXNlLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVG9nZ2xlQnV0 dG9uTmF2aWdhdGlvbkl0ZW0uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVG9nZ2xlQnV0dG9u TmF2aWdhdGlvbkl0ZW0pOiBSZW1vdmUgc3VwcHJlc3NFbWJvc3MuCisKIDIwMTUtMTAtMjcgIFRp bW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJlbW92ZSBpbWFnZSBnZW5lcmF0b3JzIGFuZCB1c2UgU1ZHIGRpcmVjdGx5CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0 aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0 aWxpdGllcy5qcwppbmRleCA1YjQ3MjgxYzdhM2I4ODVlNmYzNWMwYzZmMzViNGRjOWM3OWZlMDg0 Li5mMDQ4MzE4ODEzZTI0MGE1Y2Q0ZTUyZDBkMmEzYzdmNjAwOTFlZTU3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VVdGls aXRpZXMuanMKQEAgLTI5LDggKzI5LDggQEAgZnVuY3Rpb24gdXNlU1ZHU3ltYm9sKHVybCwgY2xh c3NOYW1lLCB0aXRsZSkKICAgICBjb25zdCB4bGlua05hbWVzcGFjZSA9ICJodHRwOi8vd3d3Lncz Lm9yZy8xOTk5L3hsaW5rIjsKIAogICAgIGxldCBzdmdFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudE5TKHN2Z05hbWVzcGFjZSwgInN2ZyIpOwotICAgIHN2Z0VsZW1lbnQuc2V0QXR0cmli dXRlKCJ3aWR0aCIsICIxMDAlIik7Ci0gICAgc3ZnRWxlbWVudC5zZXRBdHRyaWJ1dGUoImhlaWdo dCIsICIxMDAlIik7CisgICAgc3ZnRWxlbWVudC5zdHlsZS53aWR0aCA9ICIxMDAlIjsKKyAgICBz dmdFbGVtZW50LnN0eWxlLmhlaWdodCA9ICIxMDAlIjsKIAogICAgIC8vIFVSTCBtdXN0IGNvbnRh aW4gYSBmcmFnbWVudCByZWZlcmVuY2UgdG8gYSBncmFwaGljYWwgZWxlbWVudCwgbGlrZSBhIHN5 bWJvbC4gSWYgbm9uZSBpcyBnaXZlbgogICAgIC8vIGFwcGVuZCAjcm9vdCB3aGljaCBhbGwgb2Yg b3VyIFNWR3MgaGF2ZSBvbiB0aGUgdG9wIGxldmVsIDxzdmc+IGVsZW1lbnQuCkBAIC00NSw5ICs0 NSw5IEBAIGZ1bmN0aW9uIHVzZVNWR1N5bWJvbCh1cmwsIGNsYXNzTmFtZSwgdGl0bGUpCiAgICAg d3JhcHBlci5hcHBlbmRDaGlsZChzdmdFbGVtZW50KTsKIAogICAgIGlmIChjbGFzc05hbWUpCi0g ICAgICAgIHdyYXBwZXIuc2V0QXR0cmlidXRlKCJjbGFzcyIsIGNsYXNzTmFtZSk7IC8vIENhbid0 IHVzZSBjbGFzc05hbWUgcHJvcGVydHkgc2luY2UgdGhpcyBpcyB0aGUgU1ZHIERPTS4KKyAgICAg ICAgd3JhcHBlci5jbGFzc05hbWUgPSBjbGFzc05hbWU7CiAgICAgaWYgKHRpdGxlKQotICAgICAg ICB3cmFwcGVyLnNldEF0dHJpYnV0ZSgidGl0bGUiLCB0aXRsZSk7IC8vIENhbid0IHVzZSB0aXRs ZSBwcm9wZXJ0eSBzaW5jZSB0aGlzIGlzIHRoZSBTVkcgRE9NLgorICAgICAgICB3cmFwcGVyLnRp dGxlID0gdGl0bGU7CiAKICAgICByZXR1cm4gd3JhcHBlcjsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FjdGl2YXRlQnV0dG9uTmF2aWdh dGlvbkl0ZW0uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9B Y3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtLmpzCmluZGV4IDcxZjdiODE0ZjEyYWMxNjVmZDhm NzU5MWYyZDBmYmQyMmEzMDU2NTQuLjczMWMzNTk0YTYxZmE2YjkxNDFlMjM1MTM0ZDY5YjY0Mzdm NDYyMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0FjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0uanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbS5q cwpAQCAtMjUsOSArMjUsOSBAQAogCiBXZWJJbnNwZWN0b3IuQWN0aXZhdGVCdXR0b25OYXZpZ2F0 aW9uSXRlbSA9IGNsYXNzIEFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0gZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0KIHsKLSAgICBjb25zdHJ1Y3RvcihpZGVudGlm aWVyLCBkZWZhdWx0VG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwgaW1hZ2UsIGltYWdlV2lkdGgs IGltYWdlSGVpZ2h0LCBzdXBwcmVzc0VtYm9zcywgcm9sZSkKKyAgICBjb25zdHJ1Y3RvcihpZGVu dGlmaWVyLCBkZWZhdWx0VG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwgaW1hZ2UsIGltYWdlV2lk dGgsIGltYWdlSGVpZ2h0LCByb2xlKQogICAgIHsKLSAgICAgICAgc3VwZXIoaWRlbnRpZmllciwg ZGVmYXVsdFRvb2xUaXAsIGltYWdlLCBpbWFnZVdpZHRoLCBpbWFnZUhlaWdodCwgc3VwcHJlc3NF bWJvc3MsIHJvbGUpOworICAgICAgICBzdXBlcihpZGVudGlmaWVyLCBkZWZhdWx0VG9vbFRpcCwg aW1hZ2UsIGltYWdlV2lkdGgsIGltYWdlSGVpZ2h0LCByb2xlKTsKIAogICAgICAgICB0aGlzLl9k ZWZhdWx0VG9vbFRpcCA9IGRlZmF1bHRUb29sVGlwOwogICAgICAgICB0aGlzLl9hY3RpdmF0ZWRU b29sVGlwID0gYWN0aXZhdGVkVG9vbFRpcCB8fCBkZWZhdWx0VG9vbFRpcDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FjdGl2YXRlQnV0dG9u VG9vbGJhckl0ZW0uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9BY3RpdmF0ZUJ1dHRvblRvb2xiYXJJdGVtLmpzCmluZGV4IDE5NGQ0MTFmZGZiYzQwMTAxZGY2 Nzg4Y2U3MzUwMjNkNzJiMGQ3OWEuLjJkOGE3NDdmZGU1ZjA2N2ZkZWY5ZDUxYmVhOWI3NWJmNmE1 MDI3NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0FjdGl2YXRlQnV0dG9uVG9vbGJhckl0ZW0uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQWN0aXZhdGVCdXR0b25Ub29sYmFySXRlbS5qcwpAQCAt MjUsOSArMjUsOSBAQAogCiBXZWJJbnNwZWN0b3IuQWN0aXZhdGVCdXR0b25Ub29sYmFySXRlbSA9 IGNsYXNzIEFjdGl2YXRlQnV0dG9uVG9vbGJhckl0ZW0gZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQWN0 aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbQogewotICAgIGNvbnN0cnVjdG9yKGlkZW50aWZpZXIs IGRlZmF1bHRUb29sVGlwLCBhY3RpdmF0ZWRUb29sVGlwLCBsYWJlbCwgaW1hZ2UsIHN1cHByZXNz RW1ib3NzLCByb2xlKQorICAgIGNvbnN0cnVjdG9yKGlkZW50aWZpZXIsIGRlZmF1bHRUb29sVGlw LCBhY3RpdmF0ZWRUb29sVGlwLCBsYWJlbCwgaW1hZ2UsIHJvbGUpCiAgICAgewotICAgICAgICBz dXBlcihpZGVudGlmaWVyLCBkZWZhdWx0VG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwgaW1hZ2Us IDMyLCAzMiwgc3VwcHJlc3NFbWJvc3MsIHJvbGUpOworICAgICAgICBzdXBlcihpZGVudGlmaWVy LCBkZWZhdWx0VG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwgaW1hZ2UsIDE2LCAxNiwgcm9sZSk7 CiAKICAgICAgICAgaWYgKHR5cGVvZiBsYWJlbCA9PT0gInN0cmluZyIpIHsKICAgICAgICAgICAg IHRoaXMuX2xhYmVsRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnV0dG9u TmF2aWdhdGlvbkl0ZW0uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9CdXR0b25OYXZpZ2F0aW9uSXRlbS5qcwppbmRleCA1NzQ5YWM5MWY2MTc2MjdkMzRiMDhj Y2M5OWI4YmRlMWY0NmRkOTNlLi43NTI1MzY3NmI0OGFiYzA4YTY2ZjQ2ZTA4YmZlMDhmNjZhMTU1 YTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9CdXR0b25OYXZpZ2F0aW9uSXRlbS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9CdXR0b25OYXZpZ2F0aW9uSXRlbS5qcwpAQCAtMjUsNyArMjUsNyBA QAogCiBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBjbGFzcyBCdXR0b25OYXZp Z2F0aW9uSXRlbSBleHRlbmRzIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uSXRlbQogewotICAgIGNv bnN0cnVjdG9yKGlkZW50aWZpZXIsIHRvb2xUaXBPckxhYmVsLCBpbWFnZSwgaW1hZ2VXaWR0aCwg aW1hZ2VIZWlnaHQsIHN1cHByZXNzRW1ib3NzLCByb2xlLCBsYWJlbCkKKyAgICBjb25zdHJ1Y3Rv cihpZGVudGlmaWVyLCB0b29sVGlwT3JMYWJlbCwgaW1hZ2UsIGltYWdlV2lkdGgsIGltYWdlSGVp Z2h0LCByb2xlLCBsYWJlbCkKICAgICB7CiAgICAgICAgIHN1cGVyKGlkZW50aWZpZXIpOwogCkBA IC05Nyw4ICs5Nyw4IEBAIFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSA9IGNsYXNz IEJ1dHRvbk5hdmlnYXRpb25JdGVtIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgIHRoaXMuX2lt YWdlID0gbmV3SW1hZ2U7CiAKICAgICAgICAgdGhpcy5fZ2x5cGhFbGVtZW50ID0gdXNlU1ZHU3lt Ym9sKHRoaXMuX2ltYWdlLCAiZ2x5cGgiKTsKLSAgICAgICAgdGhpcy5fZ2x5cGhFbGVtZW50LnNl dEF0dHJpYnV0ZSgid2lkdGgiLCB0aGlzLl9pbWFnZVdpZHRoICsgInB4Iik7Ci0gICAgICAgIHRo aXMuX2dseXBoRWxlbWVudC5zZXRBdHRyaWJ1dGUoImhlaWdodCIsIHRoaXMuX2ltYWdlSGVpZ2h0 ICsgInB4Iik7CisgICAgICAgIHRoaXMuX2dseXBoRWxlbWVudC5zdHlsZS53aWR0aCA9IHRoaXMu X2ltYWdlV2lkdGggKyAicHgiOworICAgICAgICB0aGlzLl9nbHlwaEVsZW1lbnQuc3R5bGUuaGVp Z2h0ID0gdGhpcy5faW1hZ2VIZWlnaHQgKyAicHgiOwogICAgICAgICB0aGlzLl9lbGVtZW50LmFw cGVuZENoaWxkKHRoaXMuX2dseXBoRWxlbWVudCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CdXR0b25Ub29sYmFySXRlbS5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvblRvb2xi YXJJdGVtLmpzCmluZGV4IDExYTYyOWViMzIwMGU5ZTkyY2VmMTVkNGE5MDY2NDQwMWNiOTkyMjcu LmIyYzdhMmI3Y2Q3Yjc4YmZmYjE2NmI5MWQxZGIyNDFkZGM0YTY2NjAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvblRvb2xiYXJJdGVt LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRv blRvb2xiYXJJdGVtLmpzCkBAIC0yNSw5ICsyNSw5IEBACiAKIFdlYkluc3BlY3Rvci5CdXR0b25U b29sYmFySXRlbSA9IGNsYXNzIEJ1dHRvblRvb2xiYXJJdGVtIGV4dGVuZHMgV2ViSW5zcGVjdG9y LkJ1dHRvbk5hdmlnYXRpb25JdGVtCiB7Ci0gICAgY29uc3RydWN0b3IoaWRlbnRpZmllciwgdG9v bFRpcCwgbGFiZWwsIGltYWdlLCBzdXBwcmVzc0VtYm9zcywgcm9sZSkKKyAgICBjb25zdHJ1Y3Rv cihpZGVudGlmaWVyLCB0b29sVGlwLCBsYWJlbCwgaW1hZ2UsIHJvbGUpCiAgICAgewotICAgICAg ICBzdXBlcihpZGVudGlmaWVyLCB0b29sVGlwLCBpbWFnZSwgMTYsIDE2LCBzdXBwcmVzc0VtYm9z cywgcm9sZSk7CisgICAgICAgIHN1cGVyKGlkZW50aWZpZXIsIHRvb2xUaXAsIGltYWdlLCAxNiwg MTYsIHJvbGUpOwogCiAgICAgICAgIGlmICh0eXBlb2YgbGFiZWwgPT09ICJzdHJpbmciKSB7CiAg ICAgICAgICAgICB0aGlzLl9sYWJlbEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RlYnVnZ2VyRGFzaGJvYXJkVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyRGFzaGJvYXJkVmlldy5qcwppbmRleCBiYWNmODc0YmYz NzFmYTVjY2UwZGUwMjljMmQ1M2IyOGZiN2Q0ZTI3Li45MGI5YjUyZGY5M2Y3NDE5OTlmODU3YTg4 NGY5NDBhYTRkODRjMjU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9EZWJ1Z2dlckRhc2hib2FyZFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJEYXNoYm9hcmRWaWV3LmpzCkBA IC0zNSw3ICszNSw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRhc2hib2FyZFZpZXcgPSBjbGFz cyBEZWJ1Z2dlckRhc2hib2FyZFZpZXcgZXh0ZW5kcyBXZWJJbnNwCiAgICAgICAgIHRoaXMuZWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLl9uYXZpZ2F0aW9uQmFyLmVsZW1lbnQpOwogCiAgICAgICAg IHZhciB0b29sdGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb250aW51ZSBzY3JpcHQgZXhl Y3V0aW9uICglcyBvciAlcykiKS5mb3JtYXQoV2ViSW5zcGVjdG9yLnBhdXNlT3JSZXN1bWVLZXli b2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lLCBXZWJJbnNwZWN0b3IucGF1c2VPclJlc3VtZUFsdGVy bmF0ZUtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpOwotICAgICAgICB0aGlzLl9kZWJ1Z2dl clJlc3VtZUJ1dHRvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkFjdGl2YXRlQnV0dG9uTmF2aWdh dGlvbkl0ZW0oImRlYnVnZ2VyLWRhc2hib2FyZC1wYXVzZSIsIHRvb2x0aXAsIHRvb2x0aXAsICJJ bWFnZXMvUmVzdW1lLnN2ZyIsIDE1LCAxNSwgdHJ1ZSk7CisgICAgICAgIHRoaXMuX2RlYnVnZ2Vy UmVzdW1lQnV0dG9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQWN0aXZhdGVCdXR0b25OYXZpZ2F0 aW9uSXRlbSgiZGVidWdnZXItZGFzaGJvYXJkLXBhdXNlIiwgdG9vbHRpcCwgdG9vbHRpcCwgIklt YWdlcy9SZXN1bWUuc3ZnIiwgMTUsIDE1KTsKICAgICAgICAgdGhpcy5fZGVidWdnZXJSZXN1bWVC dXR0b25JdGVtLmFjdGl2YXRlZCA9IHRydWU7CiAgICAgICAgIHRoaXMuX2RlYnVnZ2VyUmVzdW1l QnV0dG9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9u SXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9yZXN1bWVCdXR0b25DbGlja2VkLCB0aGlzKTsKICAg ICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci5hZGROYXZpZ2F0aW9uSXRlbSh0aGlzLl9kZWJ1Z2dl clJlc3VtZUJ1dHRvbkl0ZW0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyLmpzCmluZGV4IDc2NTQ4ZjY1ZDIwNDEwODEwZjRi YjFhMTdjZmJlYWRiNjZhYzZjN2UuLjJlN2NjN2U0OTUxMjViMTViNDNhMjJiYzI3ZjNlOTBhYzli NTVmMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbHRlckJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9GaWx0ZXJCYXIuanMKQEAgLTg0LDkgKzg0LDkgQEAgV2ViSW5zcGVjdG9yLkZpbHRl ckJhciA9IGNsYXNzIEZpbHRlckJhciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAg ICAgICAgIHRoaXMuX2hhbmRsZUZpbHRlckNoYW5nZWQoKTsKICAgICB9CiAKLSAgICBhZGRGaWx0 ZXJCYXJCdXR0b24oaWRlbnRpZmllciwgZmlsdGVyRnVuY3Rpb24sIGFjdGl2YXRlZEJ5RGVmYXVs dCwgZGVmYXVsdFRvb2xUaXAsIGFjdGl2YXRlZFRvb2xUaXAsIGltYWdlLCBpbWFnZVdpZHRoLCBp bWFnZUhlaWdodCwgc3VwcHJlc3NFbWJvc3MpCisgICAgYWRkRmlsdGVyQmFyQnV0dG9uKGlkZW50 aWZpZXIsIGZpbHRlckZ1bmN0aW9uLCBhY3RpdmF0ZWRCeURlZmF1bHQsIGRlZmF1bHRUb29sVGlw LCBhY3RpdmF0ZWRUb29sVGlwLCBpbWFnZSwgaW1hZ2VXaWR0aCwgaW1hZ2VIZWlnaHQpCiAgICAg ewotICAgICAgICB2YXIgZmlsdGVyQmFyQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5GaWx0ZXJC YXJCdXR0b24oaWRlbnRpZmllciwgZmlsdGVyRnVuY3Rpb24sIGFjdGl2YXRlZEJ5RGVmYXVsdCwg ZGVmYXVsdFRvb2xUaXAsIGFjdGl2YXRlZFRvb2xUaXAsIGltYWdlLCBpbWFnZVdpZHRoLCBpbWFn ZUhlaWdodCwgc3VwcHJlc3NFbWJvc3MpOworICAgICAgICB2YXIgZmlsdGVyQmFyQnV0dG9uID0g bmV3IFdlYkluc3BlY3Rvci5GaWx0ZXJCYXJCdXR0b24oaWRlbnRpZmllciwgZmlsdGVyRnVuY3Rp b24sIGFjdGl2YXRlZEJ5RGVmYXVsdCwgZGVmYXVsdFRvb2xUaXAsIGFjdGl2YXRlZFRvb2xUaXAs IGltYWdlLCBpbWFnZVdpZHRoLCBpbWFnZUhlaWdodCk7CiAgICAgICAgIGZpbHRlckJhckJ1dHRv bi5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVu dC5DbGlja2VkLCB0aGlzLl9oYW5kbGVGaWx0ZXJCYXJCdXR0b25DbGlja2VkLCB0aGlzKTsKICAg ICAgICAgZmlsdGVyQmFyQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZpbHRl ckJhckJ1dHRvbi5FdmVudC5BY3RpdmF0ZWRTdGF0ZVRvZ2dsZWQsIHRoaXMuX2hhbmRsZUZpbHRl ckJ1dHRvblRvZ2dsZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9maWx0ZXJzTmF2aWdhdGlvbkJh ci5hZGROYXZpZ2F0aW9uSXRlbShmaWx0ZXJCYXJCdXR0b24pOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyQnV0dG9uLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyQnV0dG9u LmpzCmluZGV4IGY4NmMzMjEwZGFmNmJmNTNkMDVmMTBjMzc0ZmNlOWY3ZmFhNjY5MzQuLmI5NTRi YjFmNjA0NmEzOWQyM2Q3N2I1NGI2ZjJhZjMyYmI3Y2U3MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbHRlckJhckJ1dHRvbi5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaWx0ZXJCYXJCdXR0 b24uanMKQEAgLTI1LDkgKzI1LDkgQEAKIAogV2ViSW5zcGVjdG9yLkZpbHRlckJhckJ1dHRvbiA9 IGNsYXNzIEZpbHRlckJhckJ1dHRvbiBleHRlbmRzIFdlYkluc3BlY3Rvci5BY3RpdmF0ZUJ1dHRv bk5hdmlnYXRpb25JdGVtCiB7Ci0gICAgY29uc3RydWN0b3IoaWRlbnRpZmllciwgZmlsdGVyRnVu Y3Rpb24sIGFjdGl2YXRlZEJ5RGVmYXVsdCwgZGVmYXVsdFRvb2xUaXAsIGFjdGl2YXRlZFRvb2xU aXAsIGltYWdlLCBpbWFnZVdpZHRoLCBpbWFnZUhlaWdodCwgc3VwcHJlc3NFbWJvc3MsIHJvbGUp CisgICAgY29uc3RydWN0b3IoaWRlbnRpZmllciwgZmlsdGVyRnVuY3Rpb24sIGFjdGl2YXRlZEJ5 RGVmYXVsdCwgZGVmYXVsdFRvb2xUaXAsIGFjdGl2YXRlZFRvb2xUaXAsIGltYWdlLCBpbWFnZVdp ZHRoLCBpbWFnZUhlaWdodCwgcm9sZSkKICAgICB7Ci0gICAgICAgIHN1cGVyKGlkZW50aWZpZXIs IGRlZmF1bHRUb29sVGlwLCBhY3RpdmF0ZWRUb29sVGlwLCBpbWFnZSwgaW1hZ2VXaWR0aCwgaW1h Z2VIZWlnaHQsIHN1cHByZXNzRW1ib3NzLCByb2xlKTsKKyAgICAgICAgc3VwZXIoaWRlbnRpZmll ciwgZGVmYXVsdFRvb2xUaXAsIGFjdGl2YXRlZFRvb2xUaXAsIGltYWdlLCBpbWFnZVdpZHRoLCBp bWFnZUhlaWdodCwgcm9sZSk7CiAKICAgICAgICAgdGhpcy5fZmlsdGVyRnVuY3Rpb24gPSBmaWx0 ZXJGdW5jdGlvbjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcwppbmRleCA1YTMw YTJiMjBmODdhODY5MTQ4NzM2Y2FkZWJjYWNhMjk2YzI5MWIxLi5hOGQ0NDE0YmU2MjBjOWE5NWNk NDE5ZjUyY2ZkYWUzYThhYmVjOTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5q cwpAQCAtMTQ4LDcgKzE0OCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCA9 IGNsYXNzIFRpbWVsaW5lU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAKICAgICAgICAg dG9vbFRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhcnQgUGxheWJhY2siKTsKICAgICAg ICAgYWx0VG9vbFRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUGF1c2UgUGxheWJhY2siKTsK LSAgICAgICAgdGhpcy5fcmVwbGF5UGF1c2VSZXN1bWVCdXR0b25JdGVtID0gbmV3IFdlYkluc3Bl Y3Rvci5Ub2dnbGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgicmVwbGF5LXBhdXNlLXJlc3VtZSIsIHRv b2xUaXAsIGFsdFRvb2xUaXAsICJJbWFnZXMvUmVzdW1lLnN2ZyIsICJJbWFnZXMvUGF1c2Uuc3Zn IiwgMTUsIDE1LCB0cnVlKTsKKyAgICAgICAgdGhpcy5fcmVwbGF5UGF1c2VSZXN1bWVCdXR0b25J dGVtID0gbmV3IFdlYkluc3BlY3Rvci5Ub2dnbGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgicmVwbGF5 LXBhdXNlLXJlc3VtZSIsIHRvb2xUaXAsIGFsdFRvb2xUaXAsICJJbWFnZXMvUmVzdW1lLnN2ZyIs ICJJbWFnZXMvUGF1c2Uuc3ZnIiwgMTUsIDE1KTsKICAgICAgICAgdGhpcy5fcmVwbGF5UGF1c2VS ZXN1bWVCdXR0b25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmln YXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3JlcGxheVBhdXNlUmVzdW1lQnV0dG9uQ2xp Y2tlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX3JlcGxheVBhdXNlUmVzdW1lQnV0dG9uSXRlbS5l bmFibGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3JlcGxheU5hdmlnYXRpb25CYXIuYWRkTmF2 aWdhdGlvbkl0ZW0odGhpcy5fcmVwbGF5UGF1c2VSZXN1bWVCdXR0b25JdGVtKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RvZ2dsZUJ1dHRv bk5hdmlnYXRpb25JdGVtLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVG9nZ2xlQnV0dG9uTmF2aWdhdGlvbkl0ZW0uanMKaW5kZXggYjcyZTE0OTA5MzI4NzNj OTg0MzViNjRkMDlmMTIwOWM3OGE3MmE3OC4uMWY2MDlhM2U5OGQxOWFmY2E4MDczMjM5ZjllZjVk N2U2ZDJiMTI1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVG9nZ2xlQnV0dG9uTmF2aWdhdGlvbkl0ZW0uanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVG9nZ2xlQnV0dG9uTmF2aWdhdGlvbkl0ZW0u anMKQEAgLTI1LDkgKzI1LDkgQEAKIAogV2ViSW5zcGVjdG9yLlRvZ2dsZUJ1dHRvbk5hdmlnYXRp b25JdGVtID0gY2xhc3MgVG9nZ2xlQnV0dG9uTmF2aWdhdGlvbkl0ZW0gZXh0ZW5kcyBXZWJJbnNw ZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0KIHsKLSAgICBjb25zdHJ1Y3RvcihpZGVudGlmaWVy LCBkZWZhdWx0VG9vbFRpcCwgYWx0ZXJuYXRlVG9vbFRpcCwgZGVmYXVsdEltYWdlLCBhbHRlcm5h dGVJbWFnZSwgaW1hZ2VXaWR0aCwgaW1hZ2VIZWlnaHQsIHN1cHByZXNzRW1ib3NzKQorICAgIGNv bnN0cnVjdG9yKGlkZW50aWZpZXIsIGRlZmF1bHRUb29sVGlwLCBhbHRlcm5hdGVUb29sVGlwLCBk ZWZhdWx0SW1hZ2UsIGFsdGVybmF0ZUltYWdlLCBpbWFnZVdpZHRoLCBpbWFnZUhlaWdodCkKICAg ICB7Ci0gICAgICAgIHN1cGVyKGlkZW50aWZpZXIsIGRlZmF1bHRUb29sVGlwLCBkZWZhdWx0SW1h Z2UsIGltYWdlV2lkdGgsIGltYWdlSGVpZ2h0LCBzdXBwcmVzc0VtYm9zcyk7CisgICAgICAgIHN1 cGVyKGlkZW50aWZpZXIsIGRlZmF1bHRUb29sVGlwLCBkZWZhdWx0SW1hZ2UsIGltYWdlV2lkdGgs IGltYWdlSGVpZ2h0KTsKIAogICAgICAgICB0aGlzLl90b2dnbGVkID0gZmFsc2U7CiAgICAgICAg IHRoaXMuX2RlZmF1bHRJbWFnZSA9IGRlZmF1bHRJbWFnZTsK