104546 2012-12-10 06:19:58 -0800 Web Inspector: remove the Overrides / Settings context menu from gear icon 2012-12-10 07:21:48 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 787251 0 pfeldman 2012-12-10 06:19:58 -0800 It sounds like too many people don't like the way it works. Bringing things back: overrides will be a tab in settings for now. 787262 1 178535 pfeldman 2012-12-10 06:30:11 -0800 Created attachment 178535 Patch 787282 2 178540 pfeldman 2012-12-10 06:51:40 -0800 Created attachment 178540 Patch 787287 3 178541 pfeldman 2012-12-10 06:55:55 -0800 Created attachment 178541 Patch 787288 4 178541 apavlov 2012-12-10 06:57:10 -0800 Comment on attachment 178541 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178541&action=review > Source/WebCore/inspector/front-end/SettingsScreen.js:428 > +} Do you want to add this.containerElement = this._view.containerElement; here for safety? 787306 5 pfeldman 2012-12-10 07:21:48 -0800 Committed r137154: <http://trac.webkit.org/changeset/137154> 178535 2012-12-10 06:30:11 -0800 2012-12-10 06:51:34 -0800 Patch bug-104546-20121210182732.patch text/plain 9207 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2FlZjEzN2MzMGExOGYy N2EzMmIwYjVjNjk3ODE0ODgxMmQ4MzZlNi4uNzNlYWEwNDUxMWRiZjQxYTgxMTJmZDY0Y2M4NDYx NjIzZTljZjNhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTEyLTEwICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbW92ZSB0aGUgT3ZlcnJpZGVzIC8gU2V0dGluZ3MgY29udGV4dCBtZW51IGZyb20gZ2Vh ciBpY29uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDQ1NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ dCBzb3VuZHMgbGlrZSB0b28gbWFueSBwZW9wbGUgZG9uJ3QgbGlrZSB0aGUgd2F5IGl0IHdvcmtz LiBCcmluZ2luZyB0aGluZ3MgYmFjazogb3ZlcnJpZGVzIHdpbGwgYmUgYSB0YWIgaW4gc2V0dGlu Z3MgZm9yIG5vdy4KKyAgICAgICAgTW92aW5nIHByZXNlbnQgYmVoYXZpb3IgdG8gdW5kZXIgZXhw ZXJpbWVudC4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT3ZlcnJpZGVzVmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVycmlkZXNWaWV3KToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4cGVy aW1lbnRzU2V0dGluZ3MpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NT Y3JlZW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT3ZlcnJpZGVzU2V0dGluZ3NUYWIpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNldHRpbmdzQ29udHJvbGxlcik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2V0dGluZ3NDb250cm9sbGVyLnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NDb250cm9sbGVyLnByb3RvdHlwZS5fbW91 c2VEb3duLnNob3dTZXR0aW5ncyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NDb250 cm9sbGVyLnByb3RvdHlwZS5fbW91c2VEb3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0 aW5nc0NvbnRyb2xsZXIucHJvdG90eXBlLl9tb3VzZVVwKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL2hlbHBTY3JlZW4uY3NzOgorICAgICAgICAoI3NldHRpbmdzLXNjcmVlbiAudGFi YmVkLXBhbmUtaGVhZGVyKToKKyAgICAgICAgKCNzZXR0aW5ncy1zY3JlZW4gLnRhYmJlZC1wYW5l LWhlYWRlci10YWJzKToKKyAgICAgICAgKCNzZXR0aW5ncy1zY3JlZW4gLnRhYmJlZC1wYW5lLWhl YWRlci10YWIpOgorCiAyMDEyLTEyLTA4ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZHMgYW4gb3B0aW9uIHRvIHJlbW92 ZSB0b29sYmFyIGljb25zLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9PdmVycmlkZXNWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9PdmVycmlkZXNWaWV3LmpzCmluZGV4IDM4ODBlZGY2OGJiZmVhNjM0OWQzNzUyZjRjMTM1 YjZiMzkzYTVlMjUuLmEyMGVhMjZiOGRkN2RhZGZlZjM3YTZjZjUwYjdmMDY0NTU2NGYyZjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT3ZlcnJpZGVzVmll dy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL092ZXJyaWRlc1Zp ZXcuanMKQEAgLTUyLDYgKzUyLDcgQEAgV2ViSW5zcGVjdG9yLk92ZXJyaWRlc1ZpZXcgPSBmdW5j dGlvbigpCiAgICAgaGVhZGVyVGl0bGUuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5v ZGUoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJPdmVycmlkZXMiKSkpOwogCiAgICAgdmFyIGNvbnRh aW5lciA9IHBhbmVDb250ZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAiaGVscC1jb250YWluZXItd3Jh cHBlciIpLmNyZWF0ZUNoaWxkKCJkaXYiLCAic2V0dGluZ3MtdGFiIGhlbHAtY29udGVudCBoZWxw LWNvbnRhaW5lciIpOworICAgIHRoaXMuY29udGFpbmVyRWxlbWVudCA9IGNvbnRhaW5lcjsKICAg ICBhcHBlbmRCbG9ja1RvKGNvbnRhaW5lciwgdGhpcy5fY3JlYXRlVXNlckFnZW50Q29udHJvbCgp KTsKICAgICBpZiAoQ2FwYWJpbGl0aWVzLmNhbk92ZXJyaWRlRGV2aWNlTWV0cmljcykKICAgICAg ICAgYXBwZW5kQmxvY2tUbyhjb250YWluZXIsIHRoaXMuX2NyZWF0ZURldmljZU1ldHJpY3NDb250 cm9sKCkpOwpAQCAtNjAyLDcgKzYwMyw2IEBAIFdlYkluc3BlY3Rvci5PdmVycmlkZXNWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgY29uc3QgY2hlY2tib3hFbGVtZW50ID0gbGFiZWxFbGVtZW50 LmNyZWF0ZUNoaWxkKCJpbnB1dCIpOwogICAgICAgICBjaGVja2JveEVsZW1lbnQudHlwZSA9ICJj aGVja2JveCI7CiAgICAgICAgIGNoZWNrYm94RWxlbWVudC5jaGVja2VkID0gZmFsc2U7Ci0gICAg ICAgIHRoaXMuX21ldHJpY3NDaGVja2JveEVsZW1lbnQgPSBjaGVja2JveEVsZW1lbnQ7CiAgICAg ICAgIGxhYmVsRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkVtdWxhdGUgQ1NTIG1lZGlhIikpKTsKIAogICAgICAgICB2YXIg bWVkaWFTZWxlY3RFbGVtZW50ID0gcC5jcmVhdGVDaGlsZCgic2VsZWN0Iik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCBmNmM5OTQyNzgx MjgxMDI4MDgxOTdkOTcwODM4MjcyYWFiODJkZmViLi4yZWIzMjQ2NWIzMDAxZWQwYmQ5NGMzZDQx MzkzODRmZGQ4NjI1YjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2V0dGluZ3MuanMKQEAgLTIwNiw2ICsyMDYsNyBAQCBXZWJJbnNwZWN0b3IuRXhwZXJpbWVu dHNTZXR0aW5ncyA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnNhc3MgPSB0aGlzLl9jcmVhdGVFeHBl cmltZW50KCJzYXNzIiwgIlN1cHBvcnQgZm9yIFNhc3MiKTsKICAgICB0aGlzLmNvZGVtaXJyb3Ig PSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJjb2RlbWlycm9yIiwgIlVzZSBDb2RlTWlycm9yIGVk aXRvciIpOwogICAgIHRoaXMuY3NzUmVnaW9ucyA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoImNz c1JlZ2lvbnMiLCAiQ1NTIFJlZ2lvbnMgU3VwcG9ydCIpOworICAgIHRoaXMuc2hvd092ZXJyaWRl c0luRHJhd2VyID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic2hvd092ZXJyaWRlc0luRHJhd2Vy IiwgIlNob3cgT3ZlcnJpZGVzIGluIGRyYXdlciIpOwogCiAgICAgdGhpcy5fY2xlYW5VcFNldHRp bmcoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2V0dGluZ3NTY3JlZW4uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nl dHRpbmdzU2NyZWVuLmpzCmluZGV4IGQyNDZiYjZmM2Y2NDk3ZmZjMzVhMjNjNmFhYWQwZTgzNDFm MDRmYTAuLjA4ZWIwZWM5Y2ZjODdlNGI1NTJmM2IyZGQwZjVhMGI2ZWQ2ZWQ5NzIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5q cwpAQCAtNDksNiArNDksOCBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3NTY3JlZW4gPSBmdW5jdGlv bihvbkhpZGUpCiAgICAgdGhpcy5fdGFiYmVkUGFuZS5lbGVtZW50Lmluc2VydEJlZm9yZShzZXR0 aW5nc0xhYmVsRWxlbWVudCwgdGhpcy5fdGFiYmVkUGFuZS5lbGVtZW50LmZpcnN0Q2hpbGQpOwog ICAgIHRoaXMuX3RhYmJlZFBhbmUuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDbG9z ZUJ1dHRvbigpKTsKICAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNwZWN0b3Iu U2V0dGluZ3NTY3JlZW4uVGFicy5HZW5lcmFsLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkdlbmVy YWwiKSwgbmV3IFdlYkluc3BlY3Rvci5HZW5lcmljU2V0dGluZ3NUYWIoKSk7CisgICAgaWYgKCFX ZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zaG93T3ZlcnJpZGVzSW5EcmF3ZXIuaXNF bmFibGVkKCkpCisgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKFdlYkluc3BlY3Rv ci5TZXR0aW5nc1NjcmVlbi5UYWJzLk92ZXJyaWRlcywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJP dmVycmlkZXMiKSwgbmV3IFdlYkluc3BlY3Rvci5PdmVycmlkZXNTZXR0aW5nc1RhYigpKTsKICAg ICBpZiAoV2ViSW5zcGVjdG9yLmV4cGVyaW1lbnRzU2V0dGluZ3MuZXhwZXJpbWVudHNFbmFibGVk KQogICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNwZWN0b3IuU2V0dGlu Z3NTY3JlZW4uVGFicy5FeHBlcmltZW50cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFeHBlcmlt ZW50cyIpLCBuZXcgV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3NUYWIoKSk7CiAgICAg dGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoV2ViSW5zcGVjdG9yLlNldHRpbmdzU2NyZWVuLlRh YnMuU2hvcnRjdXRzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3J0Y3V0cyIpLCBXZWJJbnNw ZWN0b3Iuc2hvcnRjdXRzU2NyZWVuLmNyZWF0ZVNob3J0Y3V0c1RhYlZpZXcoKSk7CkBAIC02Miw2 ICs2NCw3IEBAIFdlYkluc3BlY3Rvci5TZXR0aW5nc1NjcmVlbiA9IGZ1bmN0aW9uKG9uSGlkZSkK IAogV2ViSW5zcGVjdG9yLlNldHRpbmdzU2NyZWVuLlRhYnMgPSB7CiAgICAgR2VuZXJhbDogImdl bmVyYWwiLAorICAgIE92ZXJyaWRlczogIm92ZXJyaWRlcyIsCiAgICAgRXhwZXJpbWVudHM6ICJl eHBlcmltZW50cyIsCiAgICAgU2hvcnRjdXRzOiAic2hvcnRjdXRzIgogfQpAQCAtNDE2LDYgKzQx OSwyMSBAQCBXZWJJbnNwZWN0b3IuR2VuZXJpY1NldHRpbmdzVGFiLnByb3RvdHlwZSA9IHsKICAq IEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5TZXR0aW5nc1RhYn0KICAq LworV2ViSW5zcGVjdG9yLk92ZXJyaWRlc1NldHRpbmdzVGFiID0gZnVuY3Rpb24oKQoreworICAg IFdlYkluc3BlY3Rvci5TZXR0aW5nc1RhYi5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiT3ZlcnJpZGVzIiksICJvdmVycmlkZXMtdGFiLWNvbnRlbnQiKTsKKyAgICB0aGlzLl92aWV3 ID0gbmV3IFdlYkluc3BlY3Rvci5PdmVycmlkZXNWaWV3KCk7CisgICAgdGhpcy5jb250YWluZXJF bGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3ZpZXcuY29udGFpbmVyRWxlbWVudCk7Cit9CisKK1dl Ykluc3BlY3Rvci5PdmVycmlkZXNTZXR0aW5nc1RhYi5wcm90b3R5cGUgPSB7CisgICAgX19wcm90 b19fOiBXZWJJbnNwZWN0b3IuU2V0dGluZ3NUYWIucHJvdG90eXBlCit9CisKKy8qKgorICogQGNv bnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlNldHRpbmdzVGFifQorICovCiBX ZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5nc1RhYiA9IGZ1bmN0aW9uKCkKIHsKICAgICBX ZWJJbnNwZWN0b3IuU2V0dGluZ3NUYWIuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkV4cGVyaW1lbnRzIiksICJleHBlcmltZW50cy10YWItY29udGVudCIpOwpAQCAtNDY5LDI5ICs0 ODcsMzIgQEAgV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3NUYWIucHJvdG90eXBlID0g ewogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgotICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5D b250ZXh0TWVudS5Qcm92aWRlcn0KICAqLwogV2ViSW5zcGVjdG9yLlNldHRpbmdzQ29udHJvbGxl ciA9IGZ1bmN0aW9uKCkKIHsKICAgICB0aGlzLl9zdGF0dXNCYXJCdXR0b24gPSBuZXcgV2ViSW5z cGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNldHRpbmdzIiks ICJzZXR0aW5ncy1zdGF0dXMtYmFyLWl0ZW0iKTsKLSAgICB0aGlzLl9zdGF0dXNCYXJCdXR0b24u ZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9idXR0b25QcmVzc2Vk LmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICBpZiAoV2ViSW5zcGVjdG9yLmV4cGVyaW1lbnRzU2V0 dGluZ3Muc2hvd092ZXJyaWRlc0luRHJhd2VyLmlzRW5hYmxlZCgpKQorICAgICAgICB0aGlzLl9z dGF0dXNCYXJCdXR0b24uZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlz Ll9tb3VzZURvd24uYmluZCh0aGlzKSwgZmFsc2UpOworICAgIGVsc2UKKyAgICAgICAgdGhpcy5f c3RhdHVzQmFyQnV0dG9uLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2V1cCIsIHRoaXMu X21vdXNlVXAuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgLyoqIEB0eXBlIHs/V2ViSW5zcGVj dG9yLlNldHRpbmdzU2NyZWVufSAqLwogICAgIHRoaXMuX3NldHRpbmdzU2NyZWVuOwotCi0gICAg V2ViSW5zcGVjdG9yLkNvbnRleHRNZW51LnJlZ2lzdGVyUHJvdmlkZXIodGhpcyk7CiB9CiAKIFdl Ykluc3BlY3Rvci5TZXR0aW5nc0NvbnRyb2xsZXIucHJvdG90eXBlID0KIHsKKyAgICBnZXQgc3Rh dHVzQmFySXRlbSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc3RhdHVzQmFyQnV0dG9u LmVsZW1lbnQ7CisgICAgfSwKKwogICAgIC8qKgotICAgICAqIEBvdmVycmlkZQorICAgICAqIEBw YXJhbSB7RXZlbnR9IGV2ZW50CiAgICAgICovCi0gICAgYXBwZW5kQXBwbGljYWJsZUl0ZW1zOiBm dW5jdGlvbihldmVudCwgY29udGV4dE1lbnUsIHRhcmdldCkKKyAgICBfbW91c2VEb3duOiBmdW5j dGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIGlmICh0YXJnZXQgIT09IHRoaXMuX3N0YXR1c0Jh ckJ1dHRvbi5lbGVtZW50KQotICAgICAgICAgICAgcmV0dXJuOwotCisgICAgICAgIHZhciBjb250 ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoZXZlbnQpOwogICAgICAgICBj b250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiT3ZlcnJpZGVzIiks IHNob3dPdmVycmlkZXMuYmluZCh0aGlzKSk7CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0 ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZXR0aW5ncyIpLCBzaG93U2V0dGluZ3MuYmluZCh0 aGlzKSk7CiAKQEAgLTUwNywyMSArNTI4LDE2IEBAIFdlYkluc3BlY3Rvci5TZXR0aW5nc0NvbnRy b2xsZXIucHJvdG90eXBlID0KICAgICAgICAgICAgIGlmICghdGhpcy5fc2V0dGluZ3NTY3JlZW5W aXNpYmxlKQogICAgICAgICAgICAgICAgIHRoaXMuc2hvd1NldHRpbmdzU2NyZWVuKCk7CiAgICAg ICAgIH0KLSAgICB9LAogCi0gICAgZ2V0IHN0YXR1c0Jhckl0ZW0oKQotICAgIHsKLSAgICAgICAg cmV0dXJuIHRoaXMuX3N0YXR1c0JhckJ1dHRvbi5lbGVtZW50OworICAgICAgICBjb250ZXh0TWVu dS5zaG93U29mdE1lbnUoKTsKICAgICB9LAogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtFdmVu dH0gZXZlbnQKICAgICAgKi8KLSAgICBfYnV0dG9uUHJlc3NlZDogZnVuY3Rpb24oZXZlbnQpCisg ICAgX21vdXNlVXA6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIG1lbnUgPSBu ZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50KTsKLSAgICAgICAgbWVudS5hcHBlbmRB cHBsaWNhYmxlSXRlbXMoZXZlbnQuY3VycmVudFRhcmdldCk7Ci0gICAgICAgIG1lbnUuc2hvd1Nv ZnRNZW51KCk7CisgICAgICAgIHRoaXMuc2hvd1NldHRpbmdzU2NyZWVuKFdlYkluc3BlY3Rvci5T ZXR0aW5nc1NjcmVlbi5UYWJzLkdlbmVyYWwpOwogICAgIH0sCiAKICAgICBfb25IaWRlU2V0dGlu Z3NTY3JlZW46IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaGVscFNjcmVlbi5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2hlbHBTY3JlZW4uY3NzCmluZGV4IDc2MmEzZmUwNWJlYzdhZDY4NmQxNWQ0NDE2ZThk Y2M5Zjg3ZjcwNDYuLjkyODE4MWJmM2JkYWEyMjkzYThjMzcxOGY0ZmIxNWFkYmI4ZTA0ZDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaGVscFNjcmVlbi5j c3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9oZWxwU2NyZWVuLmNz cwpAQCAtMjk5LDcgKzI5OSw3IEBAIGJvZHkucGxhdGZvcm0tbWFjIC5oZWxwLWNvbnRlbnQgaW5w dXRbdHlwZT1yYWRpb10gewogI3NldHRpbmdzLXNjcmVlbiAudGFiYmVkLXBhbmUtaGVhZGVyIHsK ICAgICBib3JkZXI6IG5vbmUgdHJhbnNwYXJlbnQ7CiAgICAgaGVpZ2h0OiBhdXRvOwotICAgIHdp ZHRoOiAxMjBweDsKKyAgICB3aWR0aDogMTEwcHg7CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwog ICAgIHRvcDogMTRweDsKIH0KQEAgLTMxMCwxNyArMzEwLDE0IEBAIGJvZHkucGxhdGZvcm0tbWFj IC5oZWxwLWNvbnRlbnQgaW5wdXRbdHlwZT1yYWRpb10gewogCiAjc2V0dGluZ3Mtc2NyZWVuIC50 YWJiZWQtcGFuZS1oZWFkZXItdGFicyB7CiAgICAgcGFkZGluZy10b3A6IDVweDsKLSAgICB3aWR0 aDogMTIwcHg7CisgICAgd2lkdGg6IDEwMHB4OwogfQogCiAjc2V0dGluZ3Mtc2NyZWVuIC50YWJi ZWQtcGFuZS1oZWFkZXItdGFiIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsK ICAgICBib3JkZXI6IG5vbmUgdHJhbnNwYXJlbnQ7CiAgICAgY3Vyc29yOiBwb2ludGVyOwotICAg IGZsb2F0OiBub25lOwogICAgIGZvbnQtd2VpZ2h0OiBub3JtYWw7Ci0gICAgcG9zaXRpb246IHJl bGF0aXZlOwotICAgIHRvcDogMXB4OwogICAgIHRleHQtc2hhZG93OiBub25lOwogICAgIGNvbG9y OiAjOTk5OTk5OwogICAgIGhlaWdodDogMjJweDsK 178540 2012-12-10 06:51:40 -0800 2012-12-10 06:55:50 -0800 Patch bug-104546-20121210184901.patch text/plain 9258 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2FlZjEzN2MzMGExOGYy N2EzMmIwYjVjNjk3ODE0ODgxMmQ4MzZlNi4uNzNlYWEwNDUxMWRiZjQxYTgxMTJmZDY0Y2M4NDYx NjIzZTljZjNhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTEyLTEwICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbW92ZSB0aGUgT3ZlcnJpZGVzIC8gU2V0dGluZ3MgY29udGV4dCBtZW51IGZyb20gZ2Vh ciBpY29uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDQ1NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ dCBzb3VuZHMgbGlrZSB0b28gbWFueSBwZW9wbGUgZG9uJ3QgbGlrZSB0aGUgd2F5IGl0IHdvcmtz LiBCcmluZ2luZyB0aGluZ3MgYmFjazogb3ZlcnJpZGVzIHdpbGwgYmUgYSB0YWIgaW4gc2V0dGlu Z3MgZm9yIG5vdy4KKyAgICAgICAgTW92aW5nIHByZXNlbnQgYmVoYXZpb3IgdG8gdW5kZXIgZXhw ZXJpbWVudC4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT3ZlcnJpZGVzVmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVycmlkZXNWaWV3KToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4cGVy aW1lbnRzU2V0dGluZ3MpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NT Y3JlZW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT3ZlcnJpZGVzU2V0dGluZ3NUYWIpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNldHRpbmdzQ29udHJvbGxlcik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2V0dGluZ3NDb250cm9sbGVyLnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NDb250cm9sbGVyLnByb3RvdHlwZS5fbW91 c2VEb3duLnNob3dTZXR0aW5ncyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NDb250 cm9sbGVyLnByb3RvdHlwZS5fbW91c2VEb3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0 aW5nc0NvbnRyb2xsZXIucHJvdG90eXBlLl9tb3VzZVVwKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL2hlbHBTY3JlZW4uY3NzOgorICAgICAgICAoI3NldHRpbmdzLXNjcmVlbiAudGFi YmVkLXBhbmUtaGVhZGVyKToKKyAgICAgICAgKCNzZXR0aW5ncy1zY3JlZW4gLnRhYmJlZC1wYW5l LWhlYWRlci10YWJzKToKKyAgICAgICAgKCNzZXR0aW5ncy1zY3JlZW4gLnRhYmJlZC1wYW5lLWhl YWRlci10YWIpOgorCiAyMDEyLTEyLTA4ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZHMgYW4gb3B0aW9uIHRvIHJlbW92 ZSB0b29sYmFyIGljb25zLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9PdmVycmlkZXNWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9PdmVycmlkZXNWaWV3LmpzCmluZGV4IDM4ODBlZGY2OGJiZmVhNjM0OWQzNzUyZjRjMTM1 YjZiMzkzYTVlMjUuLmEyMGVhMjZiOGRkN2RhZGZlZjM3YTZjZjUwYjdmMDY0NTU2NGYyZjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT3ZlcnJpZGVzVmll dy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL092ZXJyaWRlc1Zp ZXcuanMKQEAgLTUyLDYgKzUyLDcgQEAgV2ViSW5zcGVjdG9yLk92ZXJyaWRlc1ZpZXcgPSBmdW5j dGlvbigpCiAgICAgaGVhZGVyVGl0bGUuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5v ZGUoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJPdmVycmlkZXMiKSkpOwogCiAgICAgdmFyIGNvbnRh aW5lciA9IHBhbmVDb250ZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAiaGVscC1jb250YWluZXItd3Jh cHBlciIpLmNyZWF0ZUNoaWxkKCJkaXYiLCAic2V0dGluZ3MtdGFiIGhlbHAtY29udGVudCBoZWxw LWNvbnRhaW5lciIpOworICAgIHRoaXMuY29udGFpbmVyRWxlbWVudCA9IGNvbnRhaW5lcjsKICAg ICBhcHBlbmRCbG9ja1RvKGNvbnRhaW5lciwgdGhpcy5fY3JlYXRlVXNlckFnZW50Q29udHJvbCgp KTsKICAgICBpZiAoQ2FwYWJpbGl0aWVzLmNhbk92ZXJyaWRlRGV2aWNlTWV0cmljcykKICAgICAg ICAgYXBwZW5kQmxvY2tUbyhjb250YWluZXIsIHRoaXMuX2NyZWF0ZURldmljZU1ldHJpY3NDb250 cm9sKCkpOwpAQCAtNjAyLDcgKzYwMyw2IEBAIFdlYkluc3BlY3Rvci5PdmVycmlkZXNWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgY29uc3QgY2hlY2tib3hFbGVtZW50ID0gbGFiZWxFbGVtZW50 LmNyZWF0ZUNoaWxkKCJpbnB1dCIpOwogICAgICAgICBjaGVja2JveEVsZW1lbnQudHlwZSA9ICJj aGVja2JveCI7CiAgICAgICAgIGNoZWNrYm94RWxlbWVudC5jaGVja2VkID0gZmFsc2U7Ci0gICAg ICAgIHRoaXMuX21ldHJpY3NDaGVja2JveEVsZW1lbnQgPSBjaGVja2JveEVsZW1lbnQ7CiAgICAg ICAgIGxhYmVsRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkVtdWxhdGUgQ1NTIG1lZGlhIikpKTsKIAogICAgICAgICB2YXIg bWVkaWFTZWxlY3RFbGVtZW50ID0gcC5jcmVhdGVDaGlsZCgic2VsZWN0Iik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCBmNmM5OTQyNzgx MjgxMDI4MDgxOTdkOTcwODM4MjcyYWFiODJkZmViLi4yZWIzMjQ2NWIzMDAxZWQwYmQ5NGMzZDQx MzkzODRmZGQ4NjI1YjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2V0dGluZ3MuanMKQEAgLTIwNiw2ICsyMDYsNyBAQCBXZWJJbnNwZWN0b3IuRXhwZXJpbWVu dHNTZXR0aW5ncyA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnNhc3MgPSB0aGlzLl9jcmVhdGVFeHBl cmltZW50KCJzYXNzIiwgIlN1cHBvcnQgZm9yIFNhc3MiKTsKICAgICB0aGlzLmNvZGVtaXJyb3Ig PSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJjb2RlbWlycm9yIiwgIlVzZSBDb2RlTWlycm9yIGVk aXRvciIpOwogICAgIHRoaXMuY3NzUmVnaW9ucyA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoImNz c1JlZ2lvbnMiLCAiQ1NTIFJlZ2lvbnMgU3VwcG9ydCIpOworICAgIHRoaXMuc2hvd092ZXJyaWRl c0luRHJhd2VyID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic2hvd092ZXJyaWRlc0luRHJhd2Vy IiwgIlNob3cgT3ZlcnJpZGVzIGluIGRyYXdlciIpOwogCiAgICAgdGhpcy5fY2xlYW5VcFNldHRp bmcoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2V0dGluZ3NTY3JlZW4uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nl dHRpbmdzU2NyZWVuLmpzCmluZGV4IGQyNDZiYjZmM2Y2NDk3ZmZjMzVhMjNjNmFhYWQwZTgzNDFm MDRmYTAuLjk1YzQ5Yjc5NGNiOTJhMmRkZjQ4YjExZjFmMDcxMDU2MTk0MzAyNDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5q cwpAQCAtNDksNiArNDksOCBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3NTY3JlZW4gPSBmdW5jdGlv bihvbkhpZGUpCiAgICAgdGhpcy5fdGFiYmVkUGFuZS5lbGVtZW50Lmluc2VydEJlZm9yZShzZXR0 aW5nc0xhYmVsRWxlbWVudCwgdGhpcy5fdGFiYmVkUGFuZS5lbGVtZW50LmZpcnN0Q2hpbGQpOwog ICAgIHRoaXMuX3RhYmJlZFBhbmUuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDbG9z ZUJ1dHRvbigpKTsKICAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNwZWN0b3Iu U2V0dGluZ3NTY3JlZW4uVGFicy5HZW5lcmFsLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkdlbmVy YWwiKSwgbmV3IFdlYkluc3BlY3Rvci5HZW5lcmljU2V0dGluZ3NUYWIoKSk7CisgICAgaWYgKCFX ZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zaG93T3ZlcnJpZGVzSW5EcmF3ZXIuaXNF bmFibGVkKCkpCisgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKFdlYkluc3BlY3Rv ci5TZXR0aW5nc1NjcmVlbi5UYWJzLk92ZXJyaWRlcywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJP dmVycmlkZXMiKSwgbmV3IFdlYkluc3BlY3Rvci5PdmVycmlkZXNTZXR0aW5nc1RhYigpKTsKICAg ICBpZiAoV2ViSW5zcGVjdG9yLmV4cGVyaW1lbnRzU2V0dGluZ3MuZXhwZXJpbWVudHNFbmFibGVk KQogICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNwZWN0b3IuU2V0dGlu Z3NTY3JlZW4uVGFicy5FeHBlcmltZW50cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFeHBlcmlt ZW50cyIpLCBuZXcgV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3NUYWIoKSk7CiAgICAg dGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoV2ViSW5zcGVjdG9yLlNldHRpbmdzU2NyZWVuLlRh YnMuU2hvcnRjdXRzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3J0Y3V0cyIpLCBXZWJJbnNw ZWN0b3Iuc2hvcnRjdXRzU2NyZWVuLmNyZWF0ZVNob3J0Y3V0c1RhYlZpZXcoKSk7CkBAIC02Miw2 ICs2NCw3IEBAIFdlYkluc3BlY3Rvci5TZXR0aW5nc1NjcmVlbiA9IGZ1bmN0aW9uKG9uSGlkZSkK IAogV2ViSW5zcGVjdG9yLlNldHRpbmdzU2NyZWVuLlRhYnMgPSB7CiAgICAgR2VuZXJhbDogImdl bmVyYWwiLAorICAgIE92ZXJyaWRlczogIm92ZXJyaWRlcyIsCiAgICAgRXhwZXJpbWVudHM6ICJl eHBlcmltZW50cyIsCiAgICAgU2hvcnRjdXRzOiAic2hvcnRjdXRzIgogfQpAQCAtNDE2LDYgKzQx OSwyMiBAQCBXZWJJbnNwZWN0b3IuR2VuZXJpY1NldHRpbmdzVGFiLnByb3RvdHlwZSA9IHsKICAq IEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5TZXR0aW5nc1RhYn0KICAq LworV2ViSW5zcGVjdG9yLk92ZXJyaWRlc1NldHRpbmdzVGFiID0gZnVuY3Rpb24oKQoreworICAg IFdlYkluc3BlY3Rvci5TZXR0aW5nc1RhYi5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiT3ZlcnJpZGVzIiksICJvdmVycmlkZXMtdGFiLWNvbnRlbnQiKTsKKyAgICB0aGlzLl92aWV3 ID0gbmV3IFdlYkluc3BlY3Rvci5PdmVycmlkZXNWaWV3KCk7CisgICAgdGhpcy5jb250YWluZXJF bGVtZW50LnBhcmVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fdmlldy5jb250YWluZXJFbGVt ZW50KTsKKyAgICB0aGlzLmNvbnRhaW5lckVsZW1lbnQucmVtb3ZlKCk7Cit9CisKK1dlYkluc3Bl Y3Rvci5PdmVycmlkZXNTZXR0aW5nc1RhYi5wcm90b3R5cGUgPSB7CisgICAgX19wcm90b19fOiBX ZWJJbnNwZWN0b3IuU2V0dGluZ3NUYWIucHJvdG90eXBlCit9CisKKy8qKgorICogQGNvbnN0cnVj dG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlNldHRpbmdzVGFifQorICovCiBXZWJJbnNw ZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5nc1RhYiA9IGZ1bmN0aW9uKCkKIHsKICAgICBXZWJJbnNw ZWN0b3IuU2V0dGluZ3NUYWIuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkV4cGVy aW1lbnRzIiksICJleHBlcmltZW50cy10YWItY29udGVudCIpOwpAQCAtNDY5LDI5ICs0ODgsMzIg QEAgV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3NUYWIucHJvdG90eXBlID0gewogCiAv KioKICAqIEBjb25zdHJ1Y3RvcgotICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5Db250ZXh0 TWVudS5Qcm92aWRlcn0KICAqLwogV2ViSW5zcGVjdG9yLlNldHRpbmdzQ29udHJvbGxlciA9IGZ1 bmN0aW9uKCkKIHsKICAgICB0aGlzLl9zdGF0dXNCYXJCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9y LlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNldHRpbmdzIiksICJzZXR0 aW5ncy1zdGF0dXMtYmFyLWl0ZW0iKTsKLSAgICB0aGlzLl9zdGF0dXNCYXJCdXR0b24uZWxlbWVu dC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9idXR0b25QcmVzc2VkLmJpbmQo dGhpcyksIGZhbHNlKTsKKyAgICBpZiAoV2ViSW5zcGVjdG9yLmV4cGVyaW1lbnRzU2V0dGluZ3Mu c2hvd092ZXJyaWRlc0luRHJhd2VyLmlzRW5hYmxlZCgpKQorICAgICAgICB0aGlzLl9zdGF0dXNC YXJCdXR0b24uZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9tb3Vz ZURvd24uYmluZCh0aGlzKSwgZmFsc2UpOworICAgIGVsc2UKKyAgICAgICAgdGhpcy5fc3RhdHVz QmFyQnV0dG9uLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2V1cCIsIHRoaXMuX21vdXNl VXAuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgLyoqIEB0eXBlIHs/V2ViSW5zcGVjdG9yLlNl dHRpbmdzU2NyZWVufSAqLwogICAgIHRoaXMuX3NldHRpbmdzU2NyZWVuOwotCi0gICAgV2ViSW5z cGVjdG9yLkNvbnRleHRNZW51LnJlZ2lzdGVyUHJvdmlkZXIodGhpcyk7CiB9CiAKIFdlYkluc3Bl Y3Rvci5TZXR0aW5nc0NvbnRyb2xsZXIucHJvdG90eXBlID0KIHsKKyAgICBnZXQgc3RhdHVzQmFy SXRlbSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc3RhdHVzQmFyQnV0dG9uLmVsZW1l bnQ7CisgICAgfSwKKwogICAgIC8qKgotICAgICAqIEBvdmVycmlkZQorICAgICAqIEBwYXJhbSB7 RXZlbnR9IGV2ZW50CiAgICAgICovCi0gICAgYXBwZW5kQXBwbGljYWJsZUl0ZW1zOiBmdW5jdGlv bihldmVudCwgY29udGV4dE1lbnUsIHRhcmdldCkKKyAgICBfbW91c2VEb3duOiBmdW5jdGlvbihl dmVudCkKICAgICB7Ci0gICAgICAgIGlmICh0YXJnZXQgIT09IHRoaXMuX3N0YXR1c0JhckJ1dHRv bi5lbGVtZW50KQotICAgICAgICAgICAgcmV0dXJuOwotCisgICAgICAgIHZhciBjb250ZXh0TWVu dSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoZXZlbnQpOwogICAgICAgICBjb250ZXh0 TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiT3ZlcnJpZGVzIiksIHNob3dP dmVycmlkZXMuYmluZCh0aGlzKSk7CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTZXR0aW5ncyIpLCBzaG93U2V0dGluZ3MuYmluZCh0aGlzKSk7 CiAKQEAgLTUwNywyMSArNTI5LDE2IEBAIFdlYkluc3BlY3Rvci5TZXR0aW5nc0NvbnRyb2xsZXIu cHJvdG90eXBlID0KICAgICAgICAgICAgIGlmICghdGhpcy5fc2V0dGluZ3NTY3JlZW5WaXNpYmxl KQogICAgICAgICAgICAgICAgIHRoaXMuc2hvd1NldHRpbmdzU2NyZWVuKCk7CiAgICAgICAgIH0K LSAgICB9LAogCi0gICAgZ2V0IHN0YXR1c0Jhckl0ZW0oKQotICAgIHsKLSAgICAgICAgcmV0dXJu IHRoaXMuX3N0YXR1c0JhckJ1dHRvbi5lbGVtZW50OworICAgICAgICBjb250ZXh0TWVudS5zaG93 U29mdE1lbnUoKTsKICAgICB9LAogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtFdmVudH0gZXZl bnQKICAgICAgKi8KLSAgICBfYnV0dG9uUHJlc3NlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgX21v dXNlVXA6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIG1lbnUgPSBuZXcgV2Vi SW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50KTsKLSAgICAgICAgbWVudS5hcHBlbmRBcHBsaWNh YmxlSXRlbXMoZXZlbnQuY3VycmVudFRhcmdldCk7Ci0gICAgICAgIG1lbnUuc2hvd1NvZnRNZW51 KCk7CisgICAgICAgIHRoaXMuc2hvd1NldHRpbmdzU2NyZWVuKFdlYkluc3BlY3Rvci5TZXR0aW5n c1NjcmVlbi5UYWJzLkdlbmVyYWwpOwogICAgIH0sCiAKICAgICBfb25IaWRlU2V0dGluZ3NTY3Jl ZW46IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaGVscFNjcmVlbi5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2hlbHBTY3JlZW4uY3NzCmluZGV4IDc2MmEzZmUwNWJlYzdhZDY4NmQxNWQ0NDE2ZThkY2M5Zjg3 ZjcwNDYuLjkyODE4MWJmM2JkYWEyMjkzYThjMzcxOGY0ZmIxNWFkYmI4ZTA0ZDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaGVscFNjcmVlbi5jc3MKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9oZWxwU2NyZWVuLmNzcwpAQCAt Mjk5LDcgKzI5OSw3IEBAIGJvZHkucGxhdGZvcm0tbWFjIC5oZWxwLWNvbnRlbnQgaW5wdXRbdHlw ZT1yYWRpb10gewogI3NldHRpbmdzLXNjcmVlbiAudGFiYmVkLXBhbmUtaGVhZGVyIHsKICAgICBi b3JkZXI6IG5vbmUgdHJhbnNwYXJlbnQ7CiAgICAgaGVpZ2h0OiBhdXRvOwotICAgIHdpZHRoOiAx MjBweDsKKyAgICB3aWR0aDogMTEwcHg7CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAgIHRv cDogMTRweDsKIH0KQEAgLTMxMCwxNyArMzEwLDE0IEBAIGJvZHkucGxhdGZvcm0tbWFjIC5oZWxw LWNvbnRlbnQgaW5wdXRbdHlwZT1yYWRpb10gewogCiAjc2V0dGluZ3Mtc2NyZWVuIC50YWJiZWQt cGFuZS1oZWFkZXItdGFicyB7CiAgICAgcGFkZGluZy10b3A6IDVweDsKLSAgICB3aWR0aDogMTIw cHg7CisgICAgd2lkdGg6IDEwMHB4OwogfQogCiAjc2V0dGluZ3Mtc2NyZWVuIC50YWJiZWQtcGFu ZS1oZWFkZXItdGFiIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKICAgICBi b3JkZXI6IG5vbmUgdHJhbnNwYXJlbnQ7CiAgICAgY3Vyc29yOiBwb2ludGVyOwotICAgIGZsb2F0 OiBub25lOwogICAgIGZvbnQtd2VpZ2h0OiBub3JtYWw7Ci0gICAgcG9zaXRpb246IHJlbGF0aXZl OwotICAgIHRvcDogMXB4OwogICAgIHRleHQtc2hhZG93OiBub25lOwogICAgIGNvbG9yOiAjOTk5 OTk5OwogICAgIGhlaWdodDogMjJweDsK 178541 2012-12-10 06:55:55 -0800 2012-12-10 06:57:10 -0800 Patch bug-104546-20121210185316.patch text/plain 8806 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzE1NWJlMDU2NTAzMWUy Yzk3MjgxNjMyNjFlYmU0NzE1MThhMTNmMy4uYWRhYzM2YWE5ZmFhMWI2MThmMGE5YjA0YWZlYWU0 ZGRiOTg4OGU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTEyLTEwICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbW92ZSB0aGUgT3ZlcnJpZGVzIC8gU2V0dGluZ3MgY29udGV4dCBtZW51IGZyb20gZ2Vh ciBpY29uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDQ1NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ dCBzb3VuZHMgbGlrZSB0b28gbWFueSBwZW9wbGUgZG9uJ3QgbGlrZSB0aGUgd2F5IGl0IHdvcmtz LiBCcmluZ2luZyB0aGluZ3MgYmFjazogb3ZlcnJpZGVzIHdpbGwgYmUgYSB0YWIgaW4gc2V0dGlu Z3MgZm9yIG5vdy4KKyAgICAgICAgTW92aW5nIHByZXNlbnQgYmVoYXZpb3IgdG8gdW5kZXIgZXhw ZXJpbWVudC4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT3ZlcnJpZGVzVmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVycmlkZXNWaWV3KToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4cGVy aW1lbnRzU2V0dGluZ3MpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NT Y3JlZW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT3ZlcnJpZGVzU2V0dGluZ3NUYWIpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNldHRpbmdzQ29udHJvbGxlcik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2V0dGluZ3NDb250cm9sbGVyLnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NDb250cm9sbGVyLnByb3RvdHlwZS5fbW91 c2VEb3duLnNob3dTZXR0aW5ncyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NDb250 cm9sbGVyLnByb3RvdHlwZS5fbW91c2VEb3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0 aW5nc0NvbnRyb2xsZXIucHJvdG90eXBlLl9tb3VzZVVwKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL2hlbHBTY3JlZW4uY3NzOgorICAgICAgICAoI3NldHRpbmdzLXNjcmVlbiAudGFi YmVkLXBhbmUtaGVhZGVyKToKKyAgICAgICAgKCNzZXR0aW5ncy1zY3JlZW4gLnRhYmJlZC1wYW5l LWhlYWRlci10YWJzKToKKyAgICAgICAgKCNzZXR0aW5ncy1zY3JlZW4gLnRhYmJlZC1wYW5lLWhl YWRlci10YWIpOgorCiAyMDEyLTEyLTEwICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdh bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBCcmluZyBIYXJmYnV6ei1uZyBzdXBwb3J0IHRvIEd0 awpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PdmVycmlk ZXNWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PdmVycmlkZXNW aWV3LmpzCmluZGV4IDJmNmJhM2JlNjUwZDlkZGY0YmE1YjMyZTFjZDE0ZjdmM2EyZTE1OTAuLmEy MGVhMjZiOGRkN2RhZGZlZjM3YTZjZjUwYjdmMDY0NTU2NGYyZjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT3ZlcnJpZGVzVmlldy5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL092ZXJyaWRlc1ZpZXcuanMKQEAgLTUyLDYg KzUyLDcgQEAgV2ViSW5zcGVjdG9yLk92ZXJyaWRlc1ZpZXcgPSBmdW5jdGlvbigpCiAgICAgaGVh ZGVyVGl0bGUuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJPdmVycmlkZXMiKSkpOwogCiAgICAgdmFyIGNvbnRhaW5lciA9IHBhbmVDb250 ZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAiaGVscC1jb250YWluZXItd3JhcHBlciIpLmNyZWF0ZUNo aWxkKCJkaXYiLCAic2V0dGluZ3MtdGFiIGhlbHAtY29udGVudCBoZWxwLWNvbnRhaW5lciIpOwor ICAgIHRoaXMuY29udGFpbmVyRWxlbWVudCA9IGNvbnRhaW5lcjsKICAgICBhcHBlbmRCbG9ja1Rv KGNvbnRhaW5lciwgdGhpcy5fY3JlYXRlVXNlckFnZW50Q29udHJvbCgpKTsKICAgICBpZiAoQ2Fw YWJpbGl0aWVzLmNhbk92ZXJyaWRlRGV2aWNlTWV0cmljcykKICAgICAgICAgYXBwZW5kQmxvY2tU byhjb250YWluZXIsIHRoaXMuX2NyZWF0ZURldmljZU1ldHJpY3NDb250cm9sKCkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggZjZjOTk0 Mjc4MTI4MTAyODA4MTk3ZDk3MDgzODI3MmFhYjgyZGZlYi4uMmViMzI0NjViMzAwMWVkMGJkOTRj M2Q0MTM5Mzg0ZmRkODYyNWI5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TZXR0aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzLmpzCkBAIC0yMDYsNiArMjA2LDcgQEAgV2ViSW5zcGVjdG9yLkV4cGVy aW1lbnRzU2V0dGluZ3MgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5zYXNzID0gdGhpcy5fY3JlYXRl RXhwZXJpbWVudCgic2FzcyIsICJTdXBwb3J0IGZvciBTYXNzIik7CiAgICAgdGhpcy5jb2RlbWly cm9yID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgiY29kZW1pcnJvciIsICJVc2UgQ29kZU1pcnJv ciBlZGl0b3IiKTsKICAgICB0aGlzLmNzc1JlZ2lvbnMgPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50 KCJjc3NSZWdpb25zIiwgIkNTUyBSZWdpb25zIFN1cHBvcnQiKTsKKyAgICB0aGlzLnNob3dPdmVy cmlkZXNJbkRyYXdlciA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNob3dPdmVycmlkZXNJbkRy YXdlciIsICJTaG93IE92ZXJyaWRlcyBpbiBkcmF3ZXIiKTsKIAogICAgIHRoaXMuX2NsZWFuVXBT ZXR0aW5nKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NldHRpbmdzU2NyZWVuLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TZXR0aW5nc1NjcmVlbi5qcwppbmRleCBkMjQ2YmI2ZjNmNjQ5N2ZmYzM1YTIzYzZhYWFkMGU4 MzQxZjA0ZmEwLi45NWM0OWI3OTRjYjkyYTJkZGY0OGIxMWYxZjA3MTA1NjE5NDMwMjQ3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVu LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3Jl ZW4uanMKQEAgLTQ5LDYgKzQ5LDggQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdzU2NyZWVuID0gZnVu Y3Rpb24ob25IaWRlKQogICAgIHRoaXMuX3RhYmJlZFBhbmUuZWxlbWVudC5pbnNlcnRCZWZvcmUo c2V0dGluZ3NMYWJlbEVsZW1lbnQsIHRoaXMuX3RhYmJlZFBhbmUuZWxlbWVudC5maXJzdENoaWxk KTsKICAgICB0aGlzLl90YWJiZWRQYW5lLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRl Q2xvc2VCdXR0b24oKSk7CiAgICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoV2ViSW5zcGVj dG9yLlNldHRpbmdzU2NyZWVuLlRhYnMuR2VuZXJhbCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJH ZW5lcmFsIiksIG5ldyBXZWJJbnNwZWN0b3IuR2VuZXJpY1NldHRpbmdzVGFiKCkpOworICAgIGlm ICghV2ViSW5zcGVjdG9yLmV4cGVyaW1lbnRzU2V0dGluZ3Muc2hvd092ZXJyaWRlc0luRHJhd2Vy LmlzRW5hYmxlZCgpKQorICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNw ZWN0b3IuU2V0dGluZ3NTY3JlZW4uVGFicy5PdmVycmlkZXMsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiT3ZlcnJpZGVzIiksIG5ldyBXZWJJbnNwZWN0b3IuT3ZlcnJpZGVzU2V0dGluZ3NUYWIoKSk7 CiAgICAgaWYgKFdlYkluc3BlY3Rvci5leHBlcmltZW50c1NldHRpbmdzLmV4cGVyaW1lbnRzRW5h YmxlZCkKICAgICAgICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoV2ViSW5zcGVjdG9yLlNl dHRpbmdzU2NyZWVuLlRhYnMuRXhwZXJpbWVudHMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXhw ZXJpbWVudHMiKSwgbmV3IFdlYkluc3BlY3Rvci5FeHBlcmltZW50c1NldHRpbmdzVGFiKCkpOwog ICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKFdlYkluc3BlY3Rvci5TZXR0aW5nc1NjcmVl bi5UYWJzLlNob3J0Y3V0cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG9ydGN1dHMiKSwgV2Vi SW5zcGVjdG9yLnNob3J0Y3V0c1NjcmVlbi5jcmVhdGVTaG9ydGN1dHNUYWJWaWV3KCkpOwpAQCAt NjIsNiArNjQsNyBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3NTY3JlZW4gPSBmdW5jdGlvbihvbkhp ZGUpCiAKIFdlYkluc3BlY3Rvci5TZXR0aW5nc1NjcmVlbi5UYWJzID0gewogICAgIEdlbmVyYWw6 ICJnZW5lcmFsIiwKKyAgICBPdmVycmlkZXM6ICJvdmVycmlkZXMiLAogICAgIEV4cGVyaW1lbnRz OiAiZXhwZXJpbWVudHMiLAogICAgIFNob3J0Y3V0czogInNob3J0Y3V0cyIKIH0KQEAgLTQxNiw2 ICs0MTksMjIgQEAgV2ViSW5zcGVjdG9yLkdlbmVyaWNTZXR0aW5nc1RhYi5wcm90b3R5cGUgPSB7 CiAgKiBAY29uc3RydWN0b3IKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuU2V0dGluZ3NUYWJ9 CiAgKi8KK1dlYkluc3BlY3Rvci5PdmVycmlkZXNTZXR0aW5nc1RhYiA9IGZ1bmN0aW9uKCkKK3sK KyAgICBXZWJJbnNwZWN0b3IuU2V0dGluZ3NUYWIuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIk92ZXJyaWRlcyIpLCAib3ZlcnJpZGVzLXRhYi1jb250ZW50Iik7CisgICAgdGhpcy5f dmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuT3ZlcnJpZGVzVmlldygpOworICAgIHRoaXMuY29udGFp bmVyRWxlbWVudC5wYXJlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3ZpZXcuY29udGFpbmVy RWxlbWVudCk7CisgICAgdGhpcy5jb250YWluZXJFbGVtZW50LnJlbW92ZSgpOworfQorCitXZWJJ bnNwZWN0b3IuT3ZlcnJpZGVzU2V0dGluZ3NUYWIucHJvdG90eXBlID0geworICAgIF9fcHJvdG9f XzogV2ViSW5zcGVjdG9yLlNldHRpbmdzVGFiLnByb3RvdHlwZQorfQorCisvKioKKyAqIEBjb25z dHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5TZXR0aW5nc1RhYn0KKyAqLwogV2Vi SW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3NUYWIgPSBmdW5jdGlvbigpCiB7CiAgICAgV2Vi SW5zcGVjdG9yLlNldHRpbmdzVGFiLmNhbGwodGhpcywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJF eHBlcmltZW50cyIpLCAiZXhwZXJpbWVudHMtdGFiLWNvbnRlbnQiKTsKQEAgLTQ2OSwyOSArNDg4 LDMyIEBAIFdlYkluc3BlY3Rvci5FeHBlcmltZW50c1NldHRpbmdzVGFiLnByb3RvdHlwZSA9IHsK IAogLyoqCiAgKiBAY29uc3RydWN0b3IKLSAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuQ29u dGV4dE1lbnUuUHJvdmlkZXJ9CiAgKi8KIFdlYkluc3BlY3Rvci5TZXR0aW5nc0NvbnRyb2xsZXIg PSBmdW5jdGlvbigpCiB7CiAgICAgdGhpcy5fc3RhdHVzQmFyQnV0dG9uID0gbmV3IFdlYkluc3Bl Y3Rvci5TdGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZXR0aW5ncyIpLCAi c2V0dGluZ3Mtc3RhdHVzLWJhci1pdGVtIik7Ci0gICAgdGhpcy5fc3RhdHVzQmFyQnV0dG9uLmVs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5fYnV0dG9uUHJlc3NlZC5i aW5kKHRoaXMpLCBmYWxzZSk7CisgICAgaWYgKFdlYkluc3BlY3Rvci5leHBlcmltZW50c1NldHRp bmdzLnNob3dPdmVycmlkZXNJbkRyYXdlci5pc0VuYWJsZWQoKSkKKyAgICAgICAgdGhpcy5fc3Rh dHVzQmFyQnV0dG9uLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5f bW91c2VEb3duLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICBlbHNlCisgICAgICAgIHRoaXMuX3N0 YXR1c0JhckJ1dHRvbi5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNldXAiLCB0aGlzLl9t b3VzZVVwLmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgIC8qKiBAdHlwZSB7P1dlYkluc3BlY3Rv ci5TZXR0aW5nc1NjcmVlbn0gKi8KICAgICB0aGlzLl9zZXR0aW5nc1NjcmVlbjsKLQotICAgIFdl Ykluc3BlY3Rvci5Db250ZXh0TWVudS5yZWdpc3RlclByb3ZpZGVyKHRoaXMpOwogfQogCiBXZWJJ bnNwZWN0b3IuU2V0dGluZ3NDb250cm9sbGVyLnByb3RvdHlwZSA9CiB7CisgICAgZ2V0IHN0YXR1 c0Jhckl0ZW0oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXR1c0JhckJ1dHRvbi5l bGVtZW50OworICAgIH0sCisKICAgICAvKioKLSAgICAgKiBAb3ZlcnJpZGUKKyAgICAgKiBAcGFy YW0ge0V2ZW50fSBldmVudAogICAgICAqLwotICAgIGFwcGVuZEFwcGxpY2FibGVJdGVtczogZnVu Y3Rpb24oZXZlbnQsIGNvbnRleHRNZW51LCB0YXJnZXQpCisgICAgX21vdXNlRG93bjogZnVuY3Rp b24oZXZlbnQpCiAgICAgewotICAgICAgICBpZiAodGFyZ2V0ICE9PSB0aGlzLl9zdGF0dXNCYXJC dXR0b24uZWxlbWVudCkKLSAgICAgICAgICAgIHJldHVybjsKLQorICAgICAgICB2YXIgY29udGV4 dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50KTsKICAgICAgICAgY29u dGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk92ZXJyaWRlcyIpLCBz aG93T3ZlcnJpZGVzLmJpbmQodGhpcykpOwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVt KFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2V0dGluZ3MiKSwgc2hvd1NldHRpbmdzLmJpbmQodGhp cykpOwogCkBAIC01MDcsMjEgKzUyOSwxNiBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3NDb250cm9s bGVyLnByb3RvdHlwZSA9CiAgICAgICAgICAgICBpZiAoIXRoaXMuX3NldHRpbmdzU2NyZWVuVmlz aWJsZSkKICAgICAgICAgICAgICAgICB0aGlzLnNob3dTZXR0aW5nc1NjcmVlbigpOwogICAgICAg ICB9Ci0gICAgfSwKIAotICAgIGdldCBzdGF0dXNCYXJJdGVtKCkKLSAgICB7Ci0gICAgICAgIHJl dHVybiB0aGlzLl9zdGF0dXNCYXJCdXR0b24uZWxlbWVudDsKKyAgICAgICAgY29udGV4dE1lbnUu c2hvd1NvZnRNZW51KCk7CiAgICAgfSwKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7RXZlbnR9 IGV2ZW50CiAgICAgICovCi0gICAgX2J1dHRvblByZXNzZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAg IF9tb3VzZVVwOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBtZW51ID0gbmV3 IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7Ci0gICAgICAgIG1lbnUuYXBwZW5kQXBw bGljYWJsZUl0ZW1zKGV2ZW50LmN1cnJlbnRUYXJnZXQpOwotICAgICAgICBtZW51LnNob3dTb2Z0 TWVudSgpOworICAgICAgICB0aGlzLnNob3dTZXR0aW5nc1NjcmVlbihXZWJJbnNwZWN0b3IuU2V0 dGluZ3NTY3JlZW4uVGFicy5HZW5lcmFsKTsKICAgICB9LAogCiAgICAgX29uSGlkZVNldHRpbmdz U2NyZWVuOiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2hlbHBTY3JlZW4uY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9oZWxwU2NyZWVuLmNzcwppbmRleCA3NjJhM2ZlMDViZWM3YWQ2ODZkMTVkNDQxNmU4ZGNj OWY4N2Y3MDQ2Li45MjgxODFiZjNiZGFhMjI5M2E4YzM3MThmNGZiMTVhZGJiOGUwNGQ5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2hlbHBTY3JlZW4uY3Nz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaGVscFNjcmVlbi5jc3MK QEAgLTI5OSw3ICsyOTksNyBAQCBib2R5LnBsYXRmb3JtLW1hYyAuaGVscC1jb250ZW50IGlucHV0 W3R5cGU9cmFkaW9dIHsKICNzZXR0aW5ncy1zY3JlZW4gLnRhYmJlZC1wYW5lLWhlYWRlciB7CiAg ICAgYm9yZGVyOiBub25lIHRyYW5zcGFyZW50OwogICAgIGhlaWdodDogYXV0bzsKLSAgICB3aWR0 aDogMTIwcHg7CisgICAgd2lkdGg6IDExMHB4OwogICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAg ICB0b3A6IDE0cHg7CiB9CkBAIC0zMTAsMTcgKzMxMCwxNCBAQCBib2R5LnBsYXRmb3JtLW1hYyAu aGVscC1jb250ZW50IGlucHV0W3R5cGU9cmFkaW9dIHsKIAogI3NldHRpbmdzLXNjcmVlbiAudGFi YmVkLXBhbmUtaGVhZGVyLXRhYnMgewogICAgIHBhZGRpbmctdG9wOiA1cHg7Ci0gICAgd2lkdGg6 IDEyMHB4OworICAgIHdpZHRoOiAxMDBweDsKIH0KIAogI3NldHRpbmdzLXNjcmVlbiAudGFiYmVk LXBhbmUtaGVhZGVyLXRhYiB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CiAg ICAgYm9yZGVyOiBub25lIHRyYW5zcGFyZW50OwogICAgIGN1cnNvcjogcG9pbnRlcjsKLSAgICBm bG9hdDogbm9uZTsKICAgICBmb250LXdlaWdodDogbm9ybWFsOwotICAgIHBvc2l0aW9uOiByZWxh dGl2ZTsKLSAgICB0b3A6IDFweDsKICAgICB0ZXh0LXNoYWRvdzogbm9uZTsKICAgICBjb2xvcjog Izk5OTk5OTsKICAgICBoZWlnaHQ6IDIycHg7Cg==