159745 2016-07-13 16:23:09 -0700 Web Inspector: SidebarPanel classes should use View.layout instead of "refresh" 2016-07-14 16:38:29 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 159787 1 mattbaker mattbaker bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1210769 0 mattbaker 2016-07-13 16:23:09 -0700 Currently sidebars use a refresh/needsRefresh idiom that parallels view's layout/needsLayout. Since sidebars inherit from View, we should clean this up. 1210770 1 webkit-bug-importer 2016-07-13 16:23:25 -0700 <rdar://problem/27335252> 1210783 2 283588 mattbaker 2016-07-13 16:57:19 -0700 Created attachment 283588 [Patch] Proposed Fix 1211227 3 283588 commit-queue 2016-07-14 16:38:25 -0700 Comment on attachment 283588 [Patch] Proposed Fix Clearing flags on attachment: 283588 Committed r203253: <http://trac.webkit.org/changeset/203253> 1211228 4 commit-queue 2016-07-14 16:38:29 -0700 All reviewed patches have been landed. Closing bug. 283588 2016-07-13 16:57:19 -0700 2016-07-14 16:38:25 -0700 [Patch] Proposed Fix bug-159745-20160713165633.patch text/plain 15066 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 NjkxMjdmODc3MGQzYWE2MzM2OTFiMjdlNjhhM2U1ZDY2NjdkNjg3Li43ZTc1NWNkZDdjZWYyYjdm M2NhZDJmNzIwZDg0ODA1ODg4YjZlMjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw2MiBAQAorMjAxNi0wNy0xMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU2lkZWJhclBhbmVsIGNsYXNzZXMgc2hvdWxkIHVz ZSBWaWV3LmxheW91dCBpbnN0ZWFkIG9mICJyZWZyZXNoIgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5NzQ1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8yNzMzNTI1Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZURldGFpbHNTaWRlYmFy UGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZURldGFpbHNT aWRlYmFyUGFuZWwucHJvdG90eXBlLnNldCBhcHBsaWNhdGlvbkNhY2hlRnJhbWUpOgorICAgICAg ICBVc2UgbmVlZHNMYXlvdXQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHls ZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgIE1vdmUgcmVm cmVzaCBsb2dpYyB0byBsYXlvdXQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZXRh aWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5pbml0aWFsTGF5b3V0KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5DU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9zdHlsZVNoZWV0 QWRkZWRPclJlbW92ZWQpOgorICAgICAgICBEZWZlciBsYXlvdXQgdG8gY29hbGVzY2UgdXBkYXRl cy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5 cGUucmVmcmVzaCk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RP TURldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NRGV0YWls c1NpZGViYXJQYW5lbC5wcm90b3R5cGUuc2V0IGRvbU5vZGUpOgorICAgICAgICBVc2UgbmVlZHNM YXlvdXQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTU5vZGVEZXRhaWxzU2lk ZWJhclBhbmVsLmpzOgorICAgICAgICBNb3ZlIHJlZnJlc2ggbG9naWMgdG8gbGF5b3V0LgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLnNob3duKTog RGVsZXRlZC4KKyAgICAgICAgQmFzZSBjbGFzcyBhbHJlYWR5IGZvcmNlcyBhIGxheW91dCB3aGVu IHNob3duLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90 eXBlLm5lZWRzUmVmcmVzaCk6IERlbGV0ZWQuCisgICAgICAgIE5vIGxvbmdlciBuZWVkZWQuCisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUucmVmcmVz aCk6IERlbGV0ZWQuCisgICAgICAgIFJlbmFtZWQgbGF5b3V0LgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRldGFpbHNTaWRlYmFyUGFuZWwpOiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkxheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLnN1cHBvcnRz RE9NTm9kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQ YW5lbC5wcm90b3R5cGUuX2xheWVyVHJlZURpZENoYW5nZSk6CisgICAgICAgIFVzZSBuZWVkc0xh eW91dC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVs LnByb3RvdHlwZS5zaG93bik6CisgICAgICAgIEJhc2UgY2xhc3MgYWxyZWFkeSBmb3JjZXMgYSBs YXlvdXQgd2hlbiBzaG93bi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3Vy Y2VEZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNl RGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuc2V0IHJlc291cmNlKToKKyAgICAgICAgVXNl IG5lZWRzTGF5b3V0LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUNoYWlu RGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY29wZUNoYWlu RGV0YWlsc1NpZGViYXJQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRl dGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLnNldCBjYWxsRnJhbWUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fYWRkV2F0 Y2hFeHByZXNzaW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY29wZUNoYWluRGV0YWlsc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUuX3JlbW92ZVdhdGNoRXhwcmVzc2lvbik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9jbGVh ckFsbFdhdGNoRXhwcmVzc2lvbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjb3BlQ2hhaW5E ZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaEFsbFdhdGNoRXhwcmVzc2lvbnNC dXR0b25DbGlja2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY29wZUNoYWluRGV0YWlsc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUuX2RpZEV2YWx1YXRlRXhwcmVzc2lvbik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9tYWlu UmVzb3VyY2VEaWRDaGFuZ2UpOgorICAgICAgICBVc2UgbmVlZHNMYXlvdXQuCisKIDIwMTYtMDct MTIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdS RVNTSU9OKHIxOTI3ODkpOiBXZWIgSW5zcGVjdG9yOiBMb2cgVmFsdWUgY29udGV4dCBtZW51IGFw cGVhcnMgdHdpY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZURldGFp bHNTaWRlYmFyUGFuZWwuanMKaW5kZXggMzA0ZDIwMzlmNDNkYTY3NTM4NTViYTVjMWFjZDAwMjY2 NWFkMGUyZi4uNDUwOWY4ZDg0NzAzMzIyNjU1NWYxZDVjYmRhNjYyMDczMTMyZWMzMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRp b25DYWNoZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZURldGFpbHNTaWRlYmFyUGFuZWwu anMKQEAgLTg5LDEwICs4OSwxMiBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZURldGFp bHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBBcHBsaWNhdGlvbkNhY2hlRGV0YWlscwogCiAgICAgICAg IHRoaXMuX2FwcGxpY2F0aW9uQ2FjaGVGcmFtZSA9IGFwcGxpY2F0aW9uQ2FjaGVGcmFtZTsKIAot ICAgICAgICB0aGlzLm5lZWRzUmVmcmVzaCgpOworICAgICAgICB0aGlzLm5lZWRzTGF5b3V0KCk7 CiAgICAgfQogCi0gICAgcmVmcmVzaCgpCisgICAgLy8gUHJvdGVjdGVkCisKKyAgICBsYXlvdXQo KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLmFwcGxpY2F0aW9uQ2FjaGVGcmFtZSkKICAgICAg ICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5l bC5qcwppbmRleCBlMTNlZTZkNjMyZjkzZGJjYzJiYjJiZjA4OGQwN2U2NTRlZDRjYTM0Li4zNzRj NjllNTgxZGI2NmZlNTBkYTkxMjI4MzA0ZDIyZjYxYjliMjRiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURldGFpbHNTaWRlYmFy UGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC01NCwyNSArNTQsNiBAQCBXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgQ1NTU3R5bGVEZXRhaWxz U2lkZWJhclBhbmVsIGV4dAogICAgICAgICByZXR1cm4gbm9kZVRvSW5zcGVjdC5ub2RlVHlwZSgp ID09PSBOb2RlLkVMRU1FTlRfTk9ERTsKICAgICB9CiAKLSAgICByZWZyZXNoKCkKLSAgICB7Ci0g ICAgICAgIGxldCBkb21Ob2RlID0gdGhpcy5kb21Ob2RlOwotICAgICAgICBpZiAoIWRvbU5vZGUp Ci0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50 LnNjcm9sbFRvcCA9IHRoaXMuX2luaXRpYWxTY3JvbGxPZmZzZXQ7Ci0KLSAgICAgICAgZm9yIChs ZXQgcGFuZWwgb2YgdGhpcy5fcGFuZWxzKSB7Ci0gICAgICAgICAgICBwYW5lbC5lbGVtZW50Ll9z YXZlZFNjcm9sbFRvcCA9IHVuZGVmaW5lZDsKLSAgICAgICAgICAgIHBhbmVsLm1hcmtBc05lZWRz UmVmcmVzaChkb21Ob2RlKTsKLSAgICAgICAgfQotCi0gICAgICAgIHRoaXMuX3VwZGF0ZVBzZXVk b0NsYXNzQ2hlY2tib3hlcygpOwotCi0gICAgICAgIGlmICghdGhpcy5fY2xhc3NMaXN0Q29udGFp bmVyLmhpZGRlbikKLSAgICAgICAgICAgIHRoaXMuX3BvcHVsYXRlQ2xhc3NUb2dnbGVzKCk7Ci0g ICAgfQotCiAgICAgdmlzaWJpbGl0eURpZENoYW5nZSgpCiAgICAgewogICAgICAgICBzdXBlci52 aXNpYmlsaXR5RGlkQ2hhbmdlKCk7CkBAIC0xMDEsNiArODIsMjUgQEAgV2ViSW5zcGVjdG9yLkNT U1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIENTU1N0eWxlRGV0YWlsc1NpZGViYXJQ YW5lbCBleHQKIAogICAgIC8vIFByb3RlY3RlZAogCisgICAgbGF5b3V0KCkKKyAgICB7CisgICAg ICAgIGxldCBkb21Ob2RlID0gdGhpcy5kb21Ob2RlOworICAgICAgICBpZiAoIWRvbU5vZGUpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LnNj cm9sbFRvcCA9IHRoaXMuX2luaXRpYWxTY3JvbGxPZmZzZXQ7CisKKyAgICAgICAgZm9yIChsZXQg cGFuZWwgb2YgdGhpcy5fcGFuZWxzKSB7CisgICAgICAgICAgICBwYW5lbC5lbGVtZW50Ll9zYXZl ZFNjcm9sbFRvcCA9IHVuZGVmaW5lZDsKKyAgICAgICAgICAgIHBhbmVsLm1hcmtBc05lZWRzUmVm cmVzaChkb21Ob2RlKTsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX3VwZGF0ZVBzZXVkb0Ns YXNzQ2hlY2tib3hlcygpOworCisgICAgICAgIGlmICghdGhpcy5fY2xhc3NMaXN0Q29udGFpbmVy LmhpZGRlbikKKyAgICAgICAgICAgIHRoaXMuX3BvcHVsYXRlQ2xhc3NUb2dnbGVzKCk7CisgICAg fQorCiAgICAgYWRkRXZlbnRMaXN0ZW5lcnMoKQogICAgIHsKICAgICAgICAgbGV0IGVmZmVjdGl2 ZURPTU5vZGUgPSB0aGlzLmRvbU5vZGUuaXNQc2V1ZG9FbGVtZW50KCkgPyB0aGlzLmRvbU5vZGUu cGFyZW50Tm9kZSA6IHRoaXMuZG9tTm9kZTsKQEAgLTE5OSw4ICsxOTksOCBAQCBXZWJJbnNwZWN0 b3IuQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgQ1NTU3R5bGVEZXRhaWxzU2lk ZWJhclBhbmVsIGV4dAogICAgICAgICB0aGlzLl9hZGRDbGFzc0lucHV0LmFkZEV2ZW50TGlzdGVu ZXIoImtleXByZXNzIiwgdGhpcy5fYWRkQ2xhc3NJbnB1dEtleVByZXNzZWQuYmluZCh0aGlzKSk7 CiAgICAgICAgIHRoaXMuX2FkZENsYXNzSW5wdXQuYWRkRXZlbnRMaXN0ZW5lcigiYmx1ciIsIHRo aXMuX2FkZENsYXNzSW5wdXRCbHVyLmJpbmQodGhpcykpOwogCi0gICAgICAgIFdlYkluc3BlY3Rv ci5jc3NTdHlsZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQ1NTU3R5bGVN YW5hZ2VyLkV2ZW50LlN0eWxlU2hlZXRBZGRlZCwgdGhpcy5yZWZyZXNoLCB0aGlzKTsKLSAgICAg ICAgV2ViSW5zcGVjdG9yLmNzc1N0eWxlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5DU1NTdHlsZU1hbmFnZXIuRXZlbnQuU3R5bGVTaGVldFJlbW92ZWQsIHRoaXMucmVmcmVz aCwgdGhpcyk7CisgICAgICAgIFdlYkluc3BlY3Rvci5jc3NTdHlsZU1hbmFnZXIuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNYW5hZ2VyLkV2ZW50LlN0eWxlU2hlZXRBZGRl ZCwgdGhpcy5fc3R5bGVTaGVldEFkZGVkT3JSZW1vdmVkLCB0aGlzKTsKKyAgICAgICAgV2ViSW5z cGVjdG9yLmNzc1N0eWxlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5DU1NT dHlsZU1hbmFnZXIuRXZlbnQuU3R5bGVTaGVldFJlbW92ZWQsIHRoaXMuX3N0eWxlU2hlZXRBZGRl ZE9yUmVtb3ZlZCwgdGhpcyk7CiAgICAgfQogCiAgICAgc2l6ZURpZENoYW5nZSgpCkBAIC00NTks NiArNDU5LDExIEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwgPSBj bGFzcyBDU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0CiAKICAgICAgICAgdGhpcy5fc2Vs ZWN0ZWRQYW5lbC5maWx0ZXJEaWRDaGFuZ2UodGhpcy5fZmlsdGVyQmFyKTsKICAgICB9CisKKyAg ICBfc3R5bGVTaGVldEFkZGVkT3JSZW1vdmVkKCkKKyAgICB7CisgICAgICAgIHRoaXMubmVlZHNM YXlvdXQoKTsKKyAgICB9CiB9OwogCiBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZXRhaWxzU2lkZWJh clBhbmVsLk5vRm9yY2VkUHNldWRvQ2xhc3Nlc1Njcm9sbE9mZnNldCA9IDMwOyAvLyBEZWZhdWx0 IGhlaWdodCBvZiB0aGUgZm9yY2VkIHBzZXVkbyBjbGFzc2VzIGNvbnRhaW5lci4gVXBkYXRlZCBp biBzaXplRGlkQ2hhbmdlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRE9NRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5k ZXggOWYxMDc3NTkxNTA1MzAxNTFmODE3MzU1NmUxZjdiODk0YmQ3NTNjZi4uMzJlNjM4M2I3YTU1 MDI4NTgxZDhlNTA5OTU3ZDI0NDdhOGE0M2RmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NRGV0YWlsc1NpZGViYXJQYW5lbC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01EZXRhaWxzU2lk ZWJhclBhbmVsLmpzCkBAIC03OCw3ICs3OCw3IEBAIFdlYkluc3BlY3Rvci5ET01EZXRhaWxzU2lk ZWJhclBhbmVsID0gY2xhc3MgRE9NRGV0YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluCiAg ICAgICAgIGlmICh0aGlzLl9kb21Ob2RlKQogICAgICAgICAgICAgdGhpcy5hZGRFdmVudExpc3Rl bmVycygpOwogCi0gICAgICAgIHRoaXMubmVlZHNSZWZyZXNoKCk7CisgICAgICAgIHRoaXMubmVl ZHNMYXlvdXQoKTsKICAgICB9CiAKICAgICBzdXBwb3J0c0RPTU5vZGUobm9kZVRvSW5zcGVjdCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RP TU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggNGViNjZm MGZiMjhlNGFkZGNjZmI4NTYyMTE5NzU0YzMxMWVjNTE2My4uOGYxMDM4MjhkODQ4ZDA3ZDZjYjA4 NTZhMTczNWI2ZGEyNDUwMGI4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRl YmFyUGFuZWwuanMKQEAgLTk0LDkgKzk0LDkgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGVEZXRhaWxz U2lkZWJhclBhbmVsID0gY2xhc3MgRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0ZW4KICAg ICAgICAgfQogICAgIH0KIAotICAgIC8vIFB1YmxpYworICAgIC8vIFByb3RlY3RlZAogCi0gICAg cmVmcmVzaCgpCisgICAgbGF5b3V0KCkKICAgICB7CiAgICAgICAgIHZhciBkb21Ob2RlID0gdGhp cy5kb21Ob2RlOwogICAgICAgICBpZiAoIWRvbU5vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NpZGViYXJQ YW5lbC5qcwppbmRleCBiNzUzN2JhMDA0MThiZTU5ZDVjY2MyMzQzZjQ2ZmZmOGM4ZWIxNmFmLi4x ZDBlMGU2MWZjZDQ0MDcyNTcyYzZiYWUyMjhjOWFlNmViM2QxMzQ2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2lkZWJhclBhbmVs LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFp bHNTaWRlYmFyUGFuZWwuanMKQEAgLTQ3LDI5ICs0Nyw0IEBAIFdlYkluc3BlY3Rvci5EZXRhaWxz U2lkZWJhclBhbmVsID0gY2xhc3MgRGV0YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3Bl Y3RvCiAgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCiAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9Ci0KLSAgICBzaG93bigpCi0gICAgewotICAgICAgICBzdXBlci5zaG93 bigpOwotCi0gICAgICAgIGlmICh0aGlzLl9uZWVkc1JlZnJlc2gpIHsKLSAgICAgICAgICAgIHRo aXMuX25lZWRzUmVmcmVzaCA9IGZhbHNlOwotICAgICAgICAgICAgdGhpcy5yZWZyZXNoKCk7Ci0g ICAgICAgIH0KLSAgICB9Ci0KLSAgICBuZWVkc1JlZnJlc2goKQotICAgIHsKLSAgICAgICAgaWYg KCF0aGlzLnNlbGVjdGVkKSB7Ci0gICAgICAgICAgICB0aGlzLl9uZWVkc1JlZnJlc2ggPSB0cnVl OwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5yZWZyZXNo KCk7Ci0gICAgfQotCi0gICAgcmVmcmVzaCgpCi0gICAgewotICAgICAgICAvLyBJbXBsZW1lbnRl ZCBieSBzdWJjbGFzc2VzLgotICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0 YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCAzODViZjc3MjMyNmVjMzEzMTdjYTZhZWRhZGRlZTU2 MTMwYzhkYTRhLi4zMmU2NWMwNmQ2ODU3MjFkZjI4NWVlNmRiZjFlODA0NmI1MTg4MmE5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRy ZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTUwLDgg KzUwLDYgQEAgV2ViSW5zcGVjdG9yLkxheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFz cyBMYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsIGUKIAogICAgICAgICBjb25zb2xlLmFzc2Vy dCh0aGlzLnBhcmVudFNpZGViYXIpOwogCi0gICAgICAgIHRoaXMubmVlZHNSZWZyZXNoKCk7Ci0K ICAgICAgICAgc3VwZXIuc2hvd24oKTsKICAgICB9CiAKQEAgLTYyLDcgKzYwLDE2IEBAIFdlYklu c3BlY3Rvci5MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgTGF5ZXJUcmVlRGV0 YWlsc1NpZGViYXJQYW5lbCBlCiAgICAgICAgIHN1cGVyLmhpZGRlbigpOwogICAgIH0KIAotICAg IHJlZnJlc2goKQorICAgIC8vIERPTURldGFpbHNTaWRlYmFyUGFuZWwgT3ZlcnJpZGVzCisKKyAg ICBzdXBwb3J0c0RPTU5vZGUobm9kZVRvSW5zcGVjdCkKKyAgICB7CisgICAgICAgIHJldHVybiBX ZWJJbnNwZWN0b3IubGF5ZXJUcmVlTWFuYWdlci5zdXBwb3J0ZWQgJiYgbm9kZVRvSW5zcGVjdC5u b2RlVHlwZSgpID09PSBOb2RlLkVMRU1FTlRfTk9ERTsKKyAgICB9CisKKyAgICAvLyBQcm90ZWN0 ZWQKKworICAgIGxheW91dCgpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuZG9tTm9kZSkKICAg ICAgICAgICAgIHJldHVybjsKQEAgLTczLDE4ICs4MCwxMSBAQCBXZWJJbnNwZWN0b3IuTGF5ZXJU cmVlRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIExheWVyVHJlZURldGFpbHNTaWRlYmFyUGFu ZWwgZQogICAgICAgICB9KTsKICAgICB9CiAKLSAgICAvLyBET01EZXRhaWxzU2lkZWJhclBhbmVs IE92ZXJyaWRlcwotCi0gICAgc3VwcG9ydHNET01Ob2RlKG5vZGVUb0luc3BlY3QpCi0gICAgewot ICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmxheWVyVHJlZU1hbmFnZXIuc3VwcG9ydGVkICYm IG5vZGVUb0luc3BlY3Qubm9kZVR5cGUoKSA9PT0gTm9kZS5FTEVNRU5UX05PREU7Ci0gICAgfQot CiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX2xheWVyVHJlZURpZENoYW5nZShldmVudCkKICAgICB7 Ci0gICAgICAgIHRoaXMubmVlZHNSZWZyZXNoKCk7CisgICAgICAgIHRoaXMubmVlZHNMYXlvdXQo KTsKICAgICB9CiAKICAgICBfc2hvd1NoYWRvd0RPTVNldHRpbmdDaGFuZ2VkKGV2ZW50KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3Vy Y2VEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUmVzb3VyY2VEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IDdjNzhiMmY3 YTA3YTFjYzVjNjBiNTNkODZhNTc2ODdiMTcyZWQ1YWUuLjU5YWY0OTUzOGFiZmI5NjU3ZGY1MDli YmNhNDZjN2FjNjg5ZjA4NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlRGV0YWlsc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZURldGFpbHNTaWRl YmFyUGFuZWwuanMKQEAgLTE3NCwxMCArMTc0LDEyIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZURl dGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBSZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0 CiAgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5SZXNvdXJjZS5FdmVudC5Jbml0aWF0ZWRSZXNvdXJjZXNEaWRDaGFuZ2UsIHRoaXMuX3JlZnJl c2hSZWxhdGVkUmVzb3VyY2VzU2VjdGlvbiwgdGhpcyk7CiAgICAgICAgIH0KIAotICAgICAgICB0 aGlzLm5lZWRzUmVmcmVzaCgpOworICAgICAgICB0aGlzLm5lZWRzTGF5b3V0KCk7CiAgICAgfQog Ci0gICAgcmVmcmVzaCgpCisgICAgLy8gUHJvdGVjdGVkCisKKyAgICBsYXlvdXQoKQogICAgIHsK ICAgICAgICAgaWYgKCF0aGlzLl9yZXNvdXJjZSkKICAgICAgICAgICAgIHJldHVybjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQ2hh aW5EZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggNTFjYTVj NzIzMTYyYzFhMjFlMWIzN2FlNzkwYTFhOGM0NmRkNDNlZS4uMjExYTYwODI1OGQwZDkzZGRkMjYx NWNjZjBiNDhlZDA5ZDA4Y2VmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFp bHNTaWRlYmFyUGFuZWwuanMKQEAgLTU4LDcgKzU4LDcgQEAgV2ViSW5zcGVjdG9yLlNjb3BlQ2hh aW5EZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFu ZWwKIAogICAgICAgICB0aGlzLl91cGRhdGVXYXRjaEV4cHJlc3Npb25zTmF2aWdhdGlvbkJhcigp OwogCi0gICAgICAgIHRoaXMubmVlZHNSZWZyZXNoKCk7CisgICAgICAgIHRoaXMubmVlZHNMYXlv dXQoKTsKIAogICAgICAgICAvLyBVcGRhdGUgb24gY29uc29sZSBwcm9tcHQgZXZhbCBhcyBvYmpl Y3RzIGluIHRoZSBzY29wZSBjaGFpbiBtYXkgaGF2ZSBjaGFuZ2VkLgogICAgICAgICBXZWJJbnNw ZWN0b3IucnVudGltZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUnVudGlt ZU1hbmFnZXIuRXZlbnQuRGlkRXZhbHVhdGUsIHRoaXMuX2RpZEV2YWx1YXRlRXhwcmVzc2lvbiwg dGhpcyk7CkBAIC0xMDIsMTAgKzEwMiwxMiBAQCBXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFp bHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbAogCiAg ICAgICAgIHRoaXMuX2NhbGxGcmFtZSA9IGNhbGxGcmFtZTsKIAotICAgICAgICB0aGlzLm5lZWRz UmVmcmVzaCgpOworICAgICAgICB0aGlzLm5lZWRzTGF5b3V0KCk7CiAgICAgfQogCi0gICAgcmVm cmVzaCgpCisgICAgLy8gUHJvdGVjdGVkCisKKyAgICBsYXlvdXQoKQogICAgIHsKICAgICAgICAg bGV0IGNhbGxGcmFtZSA9IHRoaXMuX2NhbGxGcmFtZTsKIApAQCAtMzAzLDcgKzMwNSw3IEBAIFdl Ykluc3BlY3Rvci5TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIFNjb3BlQ2hh aW5EZXRhaWxzU2lkZWJhclBhbmVsCiAgICAgICAgIHdhdGNoRXhwcmVzc2lvbnMucHVzaChleHBy ZXNzaW9uKTsKICAgICAgICAgdGhpcy5fd2F0Y2hFeHByZXNzaW9uc1NldHRpbmcudmFsdWUgPSB3 YXRjaEV4cHJlc3Npb25zOwogCi0gICAgICAgIHRoaXMubmVlZHNSZWZyZXNoKCk7CisgICAgICAg IHRoaXMubmVlZHNMYXlvdXQoKTsKICAgICB9CiAKICAgICBfcmVtb3ZlV2F0Y2hFeHByZXNzaW9u KGV4cHJlc3Npb24pCkBAIC0zMTIsMTQgKzMxNCwxNCBAQCBXZWJJbnNwZWN0b3IuU2NvcGVDaGFp bkRldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5l bAogICAgICAgICB3YXRjaEV4cHJlc3Npb25zLnJlbW92ZShleHByZXNzaW9uLCB0cnVlKTsKICAg ICAgICAgdGhpcy5fd2F0Y2hFeHByZXNzaW9uc1NldHRpbmcudmFsdWUgPSB3YXRjaEV4cHJlc3Np b25zOwogCi0gICAgICAgIHRoaXMubmVlZHNSZWZyZXNoKCk7CisgICAgICAgIHRoaXMubmVlZHNM YXlvdXQoKTsKICAgICB9CiAKICAgICBfY2xlYXJBbGxXYXRjaEV4cHJlc3Npb25zKCkKICAgICB7 CiAgICAgICAgIHRoaXMuX3dhdGNoRXhwcmVzc2lvbnNTZXR0aW5nLnZhbHVlID0gW107CiAKLSAg ICAgICAgdGhpcy5uZWVkc1JlZnJlc2goKTsKKyAgICAgICAgdGhpcy5uZWVkc0xheW91dCgpOwog ICAgIH0KIAogICAgIF9hZGRXYXRjaEV4cHJlc3Npb25CdXR0b25DbGlja2VkKGV2ZW50KQpAQCAt Mzk2LDcgKzM5OCw3IEBAIFdlYkluc3BlY3Rvci5TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5l bCA9IGNsYXNzIFNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsCiAKICAgICBfcmVmcmVzaEFs bFdhdGNoRXhwcmVzc2lvbnNCdXR0b25DbGlja2VkKGV2ZW50KQogICAgIHsKLSAgICAgICAgdGhp cy5uZWVkc1JlZnJlc2goKTsKKyAgICAgICAgdGhpcy5uZWVkc0xheW91dCgpOwogICAgIH0KIAog ICAgIF9jbGVhckFsbFdhdGNoRXhwcmVzc2lvbnNCdXR0b25DbGlja2VkKGV2ZW50KQpAQCAtNDA5 LDcgKzQxMSw3IEBAIFdlYkluc3BlY3Rvci5TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbCA9 IGNsYXNzIFNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsCiAgICAgICAgIGlmIChldmVudC5k YXRhLm9iamVjdEdyb3VwID09PSBXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFy UGFuZWwuV2F0Y2hFeHByZXNzaW9uc09iamVjdEdyb3VwTmFtZSkKICAgICAgICAgICAgIHJldHVy bjsKIAotICAgICAgICB0aGlzLm5lZWRzUmVmcmVzaCgpOworICAgICAgICB0aGlzLm5lZWRzTGF5 b3V0KCk7CiAgICAgfQogCiAgICAgX21haW5SZXNvdXJjZURpZENoYW5nZShldmVudCkKQEAgLTQx Nyw3ICs0MTksNyBAQCBXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwg PSBjbGFzcyBTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbAogICAgICAgICBpZiAoIWV2ZW50 LnRhcmdldC5pc01haW5GcmFtZSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRo aXMubmVlZHNSZWZyZXNoKCk7CisgICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKICAgICB9CiAK ICAgICBfb2JqZWN0VHJlZUVsZW1lbnRBZGRDb250ZXh0TWVudUl0ZW1zKG9iamVjdFRyZWVFbGVt ZW50LCBjb250ZXh0TWVudSkK