69831 2011-10-11 05:09:46 -0700 Web Inspector: Fix Drawer to make it possible to show views other than Console. 2011-10-12 08:28:22 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 481573 0 vsevik 2011-10-11 05:09:46 -0700 Fix Drawer to make it possible to show views other than Console. 481575 1 110500 vsevik 2011-10-11 05:27:03 -0700 Created attachment 110500 Patch 482421 2 vsevik 2011-10-12 08:28:22 -0700 Committed r97264: <http://trac.webkit.org/changeset/97264> 110500 2011-10-11 05:27:03 -0700 2011-10-12 07:51:02 -0700 Patch bug-69831-20111011162701.patch text/plain 11178 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTcxNDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4MzI3YmFmZjg3ZGVhNDIw ZjU5ZWI3ZmRlMDI2YTgzN2Q0N2Y5ZGUxLi5hYTY2ODc4YmFjNjNjNjUzZDI3NTUyYjg3ODQ3MDli NTkwMjQ0YmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMTAtMTEgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogRml4IERyYXdlciB0byBtYWtlIGl0IHBvc3NpYmxlIHRvIHNob3cgdmlld3Mgb3RoZXIgdGhh biBDb25zb2xlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Njk4MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBbmltYXRpb24gdHlwZSBleHRyYWN0ZWQgdG8gZGlzdGluZ3Vpc2ggYmV0d2VlbiBzbG93IGFu ZCBub3JtYWwKKyAgICAgICAgYW5pbWF0aW9uIGFuZCBpbW1lZGlhdGUgc2hvdy9oaWRlLgorICAg ICAgICBJbXBsZW1lbnRlZCBjb3JyZWN0IGNvbnNvbGUgdG9nZ2xlIGJ1dHRvbiBiZWhhdmlvciBv biBzaG93aW5nIHZpZXdzCisgICAgICAgIG90aGVyIHRoYW4gY29uc29sZSBpbiBEcmF3ZXIuCisg ICAgICAgIFZpZXcgc2hvd24gaW4gRHJhd2VyIGlzIG5vdyBzaG93biBpbiBkcmF3ZXItY29udGVu dHMgZGl2IHdpdGggY29tbW9uCisgICAgICAgIHN0eWxlcyBtb3ZlZCB0aGVyZS4KKyAgICAgICAg UmVtb3ZlZCB1bnVzZWQgIl9zYWZlbHlSZW1vdmVDaGlsZHJlbiIgbWV0aG9kIGZyb20gRHJhd2Vy LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVBhbmVsLnByb3RvdHlwZS5zaG93KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Db25zb2xlUGFuZWwucHJvdG90eXBlLmhpZGUpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvRHJhd2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRyYXdl cik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRHJhd2VyLnByb3RvdHlwZS5zaG93KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5EcmF3ZXIucHJvdG90eXBlLmhpZGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRyYXdlci5wcm90b3R5cGUuX2FuaW1hdGlvbkR1cmF0aW9uKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3M6CisgICAgICAgIChib2R5LmRyYXdlci12 aXNpYmxlICNkcmF3ZXItY29udGVudHMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl90b2dnbGVDb25zb2xlQnV0dG9u Q2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX2VzY1ByZXNzZWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLnNob3dWaWV3SW5EcmF3ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmRv Y3VtZW50S2V5RG93bik6CisKIDIwMTEtMTAtMTEgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJu ZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAgIFtRdF0gUmVtb3ZlIGFsbCByZWZlcmVuY2Vz IHRvIFFURElSX2J1aWxkIGFuZCBzdGFuZGFsb25lX3BhY2thZ2UKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVBhbmVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlUGFuZWwuanMKaW5kZXggNDBkMTI3ODY3 ODkxOGYxODBjZjg2MjkyMzEyY2QxNTM5MmExZjdlNC4uMTEwNjE1MDE2MDUwYjYzZDAzZGIyNTZh NjE1MzcxYjA5NjhhZGMyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlUGFuZWwuanMKQEAgLTUyLDcgKzUyLDcgQEAgV2ViSW5zcGVjdG9yLkNv bnNvbGVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgc2hvdzogZnVuY3Rpb24oKQogICAgIHsKICAg ICAgICAgaWYgKFdlYkluc3BlY3Rvci5kcmF3ZXIudmlzaWJsZSkgewotICAgICAgICAgICAgV2Vi SW5zcGVjdG9yLmRyYXdlci5oaWRlKHRydWUpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRy YXdlci5oaWRlKFdlYkluc3BlY3Rvci5EcmF3ZXIuQW5pbWF0aW9uVHlwZS5JbW1lZGlhdGVseSk7 CiAgICAgICAgICAgICB0aGlzLl9kcmF3ZXJXYXNWaXNpYmxlID0gdHJ1ZTsKICAgICAgICAgfQog ICAgICAgICBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzKTsKQEAg LTY2LDcgKzY2LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuaGlkZS5jYWxsKHRoaXMpOwogICAg ICAgICB0aGlzLnJlbW92ZUNoaWxkVmlldyh0aGlzLl92aWV3KTsKICAgICAgICAgaWYgKHRoaXMu X2RyYXdlcldhc1Zpc2libGUpIHsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kcmF3ZXIuc2hv dyh0aGlzLl92aWV3LCB0cnVlKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kcmF3ZXIuc2hv dyh0aGlzLl92aWV3LCBXZWJJbnNwZWN0b3IuRHJhd2VyLkFuaW1hdGlvblR5cGUuSW1tZWRpYXRl bHkpOwogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2RyYXdlcldhc1Zpc2libGU7CiAgICAgICAg IH0KICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EcmF3ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RyYXdlci5q cwppbmRleCA5Njc3MzZhODY2ZWEwNDI3MGJkNDczMzE0MmEyZjlmZjhmMTY3ODY4Li4zYjI0MzJm MTIyMmIxZDI1NjU2N2JmYmNkYmE0ZmQ4ZmEyOWViMDEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RyYXdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0RyYXdlci5qcwpAQCAtMzksNiArMzksMTIgQEAgV2ViSW5zcGVj dG9yLkRyYXdlciA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9tYWluU3RhdHVzQmFyID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoIm1haW4tc3RhdHVzLWJhciIpOwogICAgIHRoaXMuX21haW5TdGF0 dXNCYXIuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5fc3RhcnRTdGF0dXNCYXJE cmFnZ2luZy5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICB0aGlzLl9jb3VudGVycyA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJjb3VudGVycyIpOworCisgICAgdGhpcy5fZHJhd2VyQ29udGVudHNF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5fZHJhd2Vy Q29udGVudHNFbGVtZW50LmlkID0gImRyYXdlci1jb250ZW50cyI7CisgICAgdGhpcy5fZHJhd2Vy Q29udGVudHNFbGVtZW50LmNsYXNzTmFtZSA9ICJkcmF3ZXItY29udGVudHMiOworICAgIHRoaXMu ZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9kcmF3ZXJDb250ZW50c0VsZW1lbnQpOworICAgIAog ICAgIHRoaXMuX2RyYXdlclN0YXR1c0JhciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwogICAgIHRoaXMuX2RyYXdlclN0YXR1c0Jhci5pZCA9ICJkcmF3ZXItc3RhdHVzLWJhciI7CiAg ICAgdGhpcy5fZHJhd2VyU3RhdHVzQmFyLmNsYXNzTmFtZSA9ICJzdGF0dXMtYmFyIjsKQEAgLTQ4 LDYgKzU0LDEyIEBAIFdlYkluc3BlY3Rvci5EcmF3ZXIgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5f ZHJhd2VyU3RhdHVzQmFyLmFwcGVuZENoaWxkKHRoaXMuX3ZpZXdTdGF0dXNCYXIpOwogfQogCitX ZWJJbnNwZWN0b3IuRHJhd2VyLkFuaW1hdGlvblR5cGUgPSB7CisgICAgICAgIEltbWVkaWF0ZWx5 OiAwLAorICAgICAgICBOb3JtYWw6IDEsCisgICAgICAgIFNsb3c6IDIKK30KKwogV2ViSW5zcGVj dG9yLkRyYXdlci5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IHZpc2libGUoKQogICAgIHsKQEAgLTU5 LDI4ICs3MSwzMCBAQCBXZWJJbnNwZWN0b3IuRHJhd2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAg cmV0dXJuIE51bWJlci5jb25zdHJhaW4oaGVpZ2h0LCBQcmVmZXJlbmNlcy5taW5Db25zb2xlSGVp Z2h0LCB3aW5kb3cuaW5uZXJIZWlnaHQgLSB0aGlzLl9tYWluRWxlbWVudC50b3RhbE9mZnNldFRv cCgpIC0gUHJlZmVyZW5jZXMubWluQ29uc29sZUhlaWdodCk7CiAgICAgfSwKIAotICAgIHNob3c6 IGZ1bmN0aW9uKHZpZXcsIGltbWVkaWF0ZWx5KQorICAgIHNob3c6IGZ1bmN0aW9uKHZpZXcsIGFu aW1hdGlvblR5cGUpCiAgICAgewogICAgICAgICB0aGlzLmltbWVkaWF0ZWx5RmluaXNoQW5pbWF0 aW9uKCk7CiAKICAgICAgICAgdmFyIGRyYXdlcldhc1Zpc2libGUgPSB0aGlzLnZpc2libGU7CiAg ICAgICAgIAotICAgICAgICBpZiAodGhpcy5fdmlldykKLSAgICAgICAgICAgIHRoaXMuZWxlbWVu dC5yZW1vdmVDaGlsZCh0aGlzLl92aWV3LmVsZW1lbnQpOworICAgICAgICBpZiAodGhpcy5fdmll dykgeworICAgICAgICAgICAgdGhpcy5fZHJhd2VyQ29udGVudHNFbGVtZW50LnJlbW92ZUNoaWxk cmVuKCk7CisgICAgICAgICAgICB0aGlzLl92aWV3LmhpZGUoKTsKKyAgICAgICAgfQogCiAgICAg ICAgIHRoaXMuX3ZpZXcgPSB2aWV3OwogCiAgICAgICAgIHZhciBzdGF0dXNCYXJJdGVtcyA9IHRo aXMuX3ZpZXcuc3RhdHVzQmFySXRlbXMgfHwgW107CisgICAgICAgIHRoaXMuX3ZpZXdTdGF0dXNC YXIucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzdGF0dXNC YXJJdGVtcy5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIHRoaXMuX3ZpZXdTdGF0dXNCYXIuYXBw ZW5kQ2hpbGQoc3RhdHVzQmFySXRlbXNbaV0pOwogCi0gICAgICAgIGlmIChkcmF3ZXJXYXNWaXNp YmxlKQotICAgICAgICAgICAgcmV0dXJuOwotCiAgICAgICAgIGRvY3VtZW50LmJvZHkuYWRkU3R5 bGVDbGFzcygiZHJhd2VyLXZpc2libGUiKTsKKyAgICAgICAgdGhpcy5fdmlldy5zaG93KHRoaXMu X2RyYXdlckNvbnRlbnRzRWxlbWVudCk7CiAKLSAgICAgICAgdGhpcy5fdmlldy5zaG93KHRoaXMu ZWxlbWVudCk7Ci0KKyAgICAgICAgaWYgKGRyYXdlcldhc1Zpc2libGUpCisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIAogICAgICAgICB2YXIgYW5jaG9yZWRJdGVtcyA9IGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJhbmNob3JlZC1zdGF0dXMtYmFyLWl0ZW1zIik7CiAgICAgICAgIHZhciBo ZWlnaHQgPSB0aGlzLl9jb25zdHJhaW5IZWlnaHQodGhpcy5fc2F2ZWRIZWlnaHQgfHwgdGhpcy5l bGVtZW50Lm9mZnNldEhlaWdodCk7CiAgICAgICAgIHZhciBhbmltYXRpb25zID0gWwpAQCAtMTEx LDEyICsxMjUsMTIgQEAgV2ViSW5zcGVjdG9yLkRyYXdlci5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICAgICAgdGhpcy5fY3VycmVudFBhbmVsQ291bnRlcnMucmVtb3ZlQXR0cmlidXRlKCJzdHls ZSIpOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fY3VycmVudEFuaW1hdGlvbiA9IFdlYklu c3BlY3Rvci5hbmltYXRlU3R5bGUoYW5pbWF0aW9ucywgdGhpcy5fYW5pbWF0aW9uRHVyYXRpb24o KSwgYW5pbWF0aW9uRmluaXNoZWQuYmluZCh0aGlzKSk7Ci0gICAgICAgIGlmIChpbW1lZGlhdGVs eSkKKyAgICAgICAgdGhpcy5fY3VycmVudEFuaW1hdGlvbiA9IFdlYkluc3BlY3Rvci5hbmltYXRl U3R5bGUoYW5pbWF0aW9ucywgdGhpcy5fYW5pbWF0aW9uRHVyYXRpb24oYW5pbWF0aW9uVHlwZSks IGFuaW1hdGlvbkZpbmlzaGVkLmJpbmQodGhpcykpOworICAgICAgICBpZiAoYW5pbWF0aW9uVHlw ZSA9PT0gV2ViSW5zcGVjdG9yLkRyYXdlci5BbmltYXRpb25UeXBlLkltbWVkaWF0ZWx5KQogICAg ICAgICAgICAgdGhpcy5fY3VycmVudEFuaW1hdGlvbi5mb3JjZUNvbXBsZXRlKCk7CiAgICAgfSwK IAotICAgIGhpZGU6IGZ1bmN0aW9uKGltbWVkaWF0ZWx5KQorICAgIGhpZGU6IGZ1bmN0aW9uKGFu aW1hdGlvblR5cGUpCiAgICAgewogICAgICAgICB0aGlzLmltbWVkaWF0ZWx5RmluaXNoQW5pbWF0 aW9uKCk7CiAgICAgICAgIGlmICghdGhpcy52aXNpYmxlKQpAQCAtMTYyLDE0ICsxNzYsMTQgQEAg V2ViSW5zcGVjdG9yLkRyYXdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB9CiAKICAgICAg ICAgICAgIHRoaXMuX3ZpZXcuaGlkZSgpOwotICAgICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92 ZUNoaWxkKHRoaXMuX3ZpZXcuZWxlbWVudCk7CisgICAgICAgICAgICB0aGlzLl9kcmF3ZXJDb250 ZW50c0VsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl92 aWV3OwogICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5yZW1vdmVTdHlsZUNsYXNzKCJkcmF3ZXIt dmlzaWJsZSIpOwogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2N1cnJlbnRBbmltYXRpb247CiAg ICAgICAgIH0KIAotICAgICAgICB0aGlzLl9jdXJyZW50QW5pbWF0aW9uID0gV2ViSW5zcGVjdG9y LmFuaW1hdGVTdHlsZShhbmltYXRpb25zLCB0aGlzLl9hbmltYXRpb25EdXJhdGlvbigpLCBhbmlt YXRpb25GaW5pc2hlZC5iaW5kKHRoaXMpKTsKLSAgICAgICAgaWYgKGltbWVkaWF0ZWx5KQorICAg ICAgICB0aGlzLl9jdXJyZW50QW5pbWF0aW9uID0gV2ViSW5zcGVjdG9yLmFuaW1hdGVTdHlsZShh bmltYXRpb25zLCB0aGlzLl9hbmltYXRpb25EdXJhdGlvbihhbmltYXRpb25UeXBlKSwgYW5pbWF0 aW9uRmluaXNoZWQuYmluZCh0aGlzKSk7CisgICAgICAgIGlmIChhbmltYXRpb25UeXBlID09PSBX ZWJJbnNwZWN0b3IuRHJhd2VyLkFuaW1hdGlvblR5cGUuSW1tZWRpYXRlbHkpCiAgICAgICAgICAg ICB0aGlzLl9jdXJyZW50QW5pbWF0aW9uLmZvcmNlQ29tcGxldGUoKTsKICAgICB9LAogCkBAIC0y MDcsMjIgKzIyMSwxNiBAQCBXZWJJbnNwZWN0b3IuRHJhd2VyLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHRoaXMuX2NvdW50ZXJzLmluc2VydEJlZm9yZSh4LCB0aGlzLl9jb3VudGVycy5maXJz dENoaWxkKTsKICAgICB9LAogCi0gICAgX2FuaW1hdGlvbkR1cmF0aW9uOiBmdW5jdGlvbigpCisg ICAgX2FuaW1hdGlvbkR1cmF0aW9uOiBmdW5jdGlvbihhbmltYXRpb25UeXBlKQogICAgIHsKLSAg ICAgICAgcmV0dXJuICh3aW5kb3cuZXZlbnQgJiYgd2luZG93LmV2ZW50LnNoaWZ0S2V5ID8gMjAw MCA6IDI1MCk7Ci0gICAgfSwKLQotICAgIF9zYWZlbHlSZW1vdmVDaGlsZHJlbjogZnVuY3Rpb24o KQotICAgIHsKLSAgICAgICAgdmFyIGNoaWxkID0gdGhpcy5lbGVtZW50LmZpcnN0Q2hpbGQ7Ci0g ICAgICAgIHdoaWxlIChjaGlsZCkgewotICAgICAgICAgICAgaWYgKGNoaWxkLmlkICE9PSAiZHJh d2VyLXN0YXR1cy1iYXIiKSB7Ci0gICAgICAgICAgICAgICAgdmFyIG1vdmVUbyA9IGNoaWxkLm5l eHRTaWJsaW5nOwotICAgICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVDaGlsZChjaGls ZCk7Ci0gICAgICAgICAgICAgICAgY2hpbGQgPSBtb3ZlVG87Ci0gICAgICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgICAgICBjaGlsZCA9IGNoaWxkLm5leHRTaWJsaW5nOwotICAgICAgICB9Cisg ICAgICAgIHN3aXRjaCAoYW5pbWF0aW9uVHlwZSkgeworICAgICAgICBjYXNlIFdlYkluc3BlY3Rv ci5EcmF3ZXIuQW5pbWF0aW9uVHlwZS5TbG93OgorICAgICAgICAgICAgcmV0dXJuIDIwMDA7Cisg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkRyYXdlci5BbmltYXRpb25UeXBlLk5vcm1hbDoKKyAg ICAgICAgICAgIHJldHVybiAyNTA7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgfSAgICAgICAgCiAgICAgfSwKIAogICAgIF9zdGFydFN0YXR1c0JhckRy YWdnaW5nOiBmdW5jdGlvbihldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmNzcwppbmRleCAzODQwNTU2MmFhYWI3ODY2ZjYzNWYzMDVhN2Mz MDUwM2EyODBmMDMyLi4xYTdhMjAyMjg5OWJkOGMxZGU2NTc3ZDRiZTUyY2Q5YjUyNmMzZjg5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5j c3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3Nz CkBAIC01OTIsNiArNTkyLDE0IEBAIGJvZHkucG9ydC1xdCAjZG9jay1zdGF0dXMtYmFyLWl0ZW0g ewogICAgIGJhY2tncm91bmQtcG9zaXRpb246IGJvdHRvbTsKIH0KIAorYm9keS5kcmF3ZXItdmlz aWJsZSAjZHJhd2VyLWNvbnRlbnRzIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgdG9w OiAwOworICAgIGJvdHRvbTogMjNweDsKKyAgICBsZWZ0OiAwOworICAgIHJpZ2h0OiAwOworfQor CiBib2R5LmRyYXdlci12aXNpYmxlICNkcmF3ZXIgewogICAgIGRpc3BsYXk6IGJsb2NrOwogfQpA QCAtNjQ4LDEwICs2NTYsNiBAQCBib2R5LnBsYXRmb3JtLWxpbnV4IC5tb25vc3BhY2UsIGJvZHku cGxhdGZvcm0tbGludXggLnNvdXJjZS1jb2RlIHsKICAgICAtd2Via2l0LXRleHQtc2l6ZS1hZGp1 c3Q6IGF1dG87CiB9CiAKLSNkcmF3ZXIgI2NvbnNvbGUtbWVzc2FnZXMgewotICAgIGJvdHRvbTog MjNweDsKLX0KLQogI2NvbnNvbGUtcHJvbXB0IHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAg ICAgcGFkZGluZzogMXB4IDIycHggMXB4IDBweDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggMmNhOGUyY2FmNzg4ZDkwYTUxMjE5N2Q3 NmYxOTFlMzlhMDgwMjk5Zi4uZDA2M2M3OGMyNGViYWFlNjRmNDQwMzFjNTNiYjQ3YThlZGUxYWJh MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMKQEAgLTIxOCwxNSArMjE4LDM3IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAKICAgICAgICAg dGhpcy5fdG9nZ2xlQ29uc29sZUJ1dHRvbi50b2dnbGVkID0gIXRoaXMuX3RvZ2dsZUNvbnNvbGVC dXR0b24udG9nZ2xlZDsKIAorICAgICAgICB2YXIgYW5pbWF0aW9uVHlwZSA9IHdpbmRvdy5ldmVu dCAmJiB3aW5kb3cuZXZlbnQuc2hpZnRLZXkgPyBXZWJJbnNwZWN0b3IuRHJhd2VyLkFuaW1hdGlv blR5cGUuU2xvdyA6IFdlYkluc3BlY3Rvci5EcmF3ZXIuQW5pbWF0aW9uVHlwZS5Ob3JtYWw7CiAg ICAgICAgIGlmICh0aGlzLl90b2dnbGVDb25zb2xlQnV0dG9uLnRvZ2dsZWQpIHsKICAgICAgICAg ICAgIHRoaXMuX3RvZ2dsZUNvbnNvbGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkhpZGUgY29uc29sZS4iKTsKLSAgICAgICAgICAgIHRoaXMuZHJhd2VyLnNob3codGhpcy5j b25zb2xlVmlldyk7CisgICAgICAgICAgICB0aGlzLmRyYXdlci5zaG93KHRoaXMuY29uc29sZVZp ZXcsIGFuaW1hdGlvblR5cGUpOworICAgICAgICAgICAgdGhpcy5fY29uc29sZVdhc1Nob3duID0g dHJ1ZTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuX3RvZ2dsZUNvbnNvbGVC dXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgY29uc29sZS4iKTsKLSAg ICAgICAgICAgIHRoaXMuZHJhd2VyLmhpZGUoKTsKKyAgICAgICAgICAgIHRoaXMuZHJhd2VyLmhp ZGUoYW5pbWF0aW9uVHlwZSk7CisgICAgICAgICAgICBkZWxldGUgdGhpcy5fY29uc29sZVdhc1No b3duOwogICAgICAgICB9CiAgICAgfSwKIAorICAgIF9lc2NQcmVzc2VkOiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICAvLyBJZiBkcmF3ZXIgd2FzIG9wZW4gd2l0aCBzb21lIHZpZXcgb3RoZXIg dGhhbiBjb25zb2xlIHRoZW4ganVzdCBjbG9zZSBpdC4KKyAgICAgICAgaWYgKCF0aGlzLl9jb25z b2xlV2FzU2hvd24gJiYgV2ViSW5zcGVjdG9yLmRyYXdlci52aXNpYmxlKQorICAgICAgICAgICAg dGhpcy5kcmF3ZXIuaGlkZShXZWJJbnNwZWN0b3IuRHJhd2VyLkFuaW1hdGlvblR5cGUuSW1tZWRp YXRlbHkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLl90b2dnbGVDb25zb2xlQnV0 dG9uQ2xpY2tlZCgpOyAgICAgICAgICAgIAorICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5WaWV3fSB2aWV3CisgICAgICovCisgICAgc2hvd1ZpZXdJbkRyYXdl cjogZnVuY3Rpb24odmlldykKKyAgICB7CisgICAgICAgIHRoaXMuX3RvZ2dsZUNvbnNvbGVCdXR0 b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhpZGUgY29uc29sZS4iKTsKKyAgICAg ICAgdGhpcy5fdG9nZ2xlQ29uc29sZUJ1dHRvbi50b2dnbGVkID0gZmFsc2U7CisgICAgICAgIHRo aXMuZHJhd2VyLnNob3codmlldywgV2ViSW5zcGVjdG9yLkRyYXdlci5BbmltYXRpb25UeXBlLklt bWVkaWF0ZWx5KTsKKyAgICB9LAorCiAgICAgX3RvZ2dsZVNldHRpbmdzOiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICB0aGlzLl9zZXR0aW5nc0J1dHRvbi50b2dnbGVkID0gIXRoaXMuX3NldHRp bmdzQnV0dG9uLnRvZ2dsZWQ7CkBAIC03NDUsNyArNzY3LDcgQEAgV2ViSW5zcGVjdG9yLmRvY3Vt ZW50S2V5RG93biA9IGZ1bmN0aW9uKGV2ZW50KQogCiAgICAgICAgIGNhc2UgIlUrMDAxQiI6IC8v IEVzY2FwZSBrZXkKICAgICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7Ci0gICAgICAg ICAgICB0aGlzLl90b2dnbGVDb25zb2xlQnV0dG9uQ2xpY2tlZCgpOworICAgICAgICAgICAgdGhp cy5fZXNjUHJlc3NlZCgpOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgLy8gV2luZG93 cyBhbmQgTWFjIGhhdmUgdHdvIGRpZmZlcmVudCBkZWZpbml0aW9ucyBvZiBbLCBzbyBhY2NlcHQg Ym90aC4K