45065 2010-09-01 15:09:39 -0700 Move updateWidget into FrameView from RenderEmbeddedObject 2010-09-02 21:49:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 45049 1 eric eric abarth commit-queue oldest_to_newest 273053 0 eric 2010-09-01 15:09:39 -0700 Move updateWidget into FrameView from RenderEmbeddedObject 273056 1 66286 eric 2010-09-01 15:13:26 -0700 Created attachment 66286 Patch 273060 2 66286 dglazkov 2010-09-01 15:18:06 -0700 Comment on attachment 66286 Patch hooray! 273346 3 66358 eric 2010-09-02 04:49:59 -0700 Created attachment 66358 Patch for landing 273782 4 66358 commit-queue 2010-09-02 21:49:40 -0700 Comment on attachment 66358 Patch for landing Clearing flags on attachment: 66358 Committed r66711: <http://trac.webkit.org/changeset/66711> 273783 5 commit-queue 2010-09-02 21:49:45 -0700 All reviewed patches have been landed. Closing bug. 66286 2010-09-01 15:13:26 -0700 2010-09-02 04:49:55 -0700 Patch bug-45065-20100901151324.patch text/plain 12011 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzU4M2NiYjNjZmNjMmUxMTZhMzdkYWM4NGYzNmIyYzdkNTJhYTI0Yi4uOTg1OWYyMGM2ZTgwMzZk ZTNjMjNmOTE1NmExN2M5Zjg0OTYxOWFkMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiw0NCBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIE1vdmUgdXBkYXRlV2lkZ2V0IGludG8g RnJhbWVWaWV3IGZyb20gUmVuZGVyRW1iZWRkZWRPYmplY3QKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MDY1CisKKyAgICAgICAgSSBhbHNvIG1hZGUg dXBkYXRlV2lkZ2V0KCkgdmlydHVhbCBvbiBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50LgorICAgICAg ICBJJ20gbm90IHlldCBzdXJlIHRoYXQgdXBkYXRlV2lkZ2V0IGJlbG9uZ3Mgb24gSFRNTEVsZW1l bnQgc2luY2UKKyAgICAgICAgSSdtIG5vdCBzdXJlIHRoYXQgSFRNTE1lZGlhRWxlbWVudCdzIHVz ZSBvZiB0aGUgdXBkYXRlV2lkZ2V0CisgICAgICAgIGluZnJhc3RydWN0dXJlIGlzIGNvcnJlY3Qu CisKKyAgICAgICAgSSBhbHNvIGdvdCByaWQgb2YgdGhlIHN0cmFuZ2UgIW1fcmVwbGFjZW1lbnRU ZXh0LmlzRW1wdHkoKSBjaGVja3MKKyAgICAgICAgYnkgbWFraW5nIGEgcGx1Z2luQ3Jhc2hlZE9y V2FzTWlzc2luZygpIGNhbGwgd2hpY2ggc2VlbXMgdG8gZW1ib2R5CisgICAgICAgIHRoZSBpZGVh IGJlaGluZCB0aGF0IGNoZWNrIGFuZCBoaWRlcyB0aGUgc2NyZXd5IGRldGFpbHMuCisKKyAgICAg ICAgSSBub3RpY2VkIGEgY291cGxlIG1ldGhvZHMgb24gSFRNTFBsdWdJbkltYWdlRWxlbWVudCB3 ZXJlIHB1YmxpYworICAgICAgICB3aGljaCBkaWQgbm90IG5lZWQgdG8gYmUuICBGaXhlZC4KKwor ICAgICAgICBObyBmdW5jdGlvbmFsIGNoYW5nZSwgdGh1cyBubyB0ZXN0cy4KKworICAgICAgICAq IGh0bWwvSFRNTEVtYmVkRWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTE9iamVjdEVsZW1l bnQuaDoKKyAgICAgICAgKiBodG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTFBsdWdJbkltYWdlRWxlbWVudDo6dXBkYXRlV2lkZ2V0SWZOZWNlc3Nh cnkpOgorICAgICAgICAqIGh0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oOgorICAgICAgICAo V2ViQ29yZTo6SFRNTFBsdWdJbkltYWdlRWxlbWVudDo6c2VydmljZVR5cGUpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTFBsdWdJbkltYWdlRWxlbWVudDo6dXJsKToKKyAgICAgICAgKiBwYWdlL0Zy YW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZVdpZGdldCk6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZVdpZGdldHMpOgorICAgICAgICAq IHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVtYmVkZGVkT2JqZWN0OjpwbHVnaW5D cmFzaGVkT3JXYXNNaXNzaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVtYmVkZGVkT2Jq ZWN0OjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFp bnRSZXBsYWNlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0Lmg6 CisKKzIwMTAtMDktMDEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIE1vdmUgdXBkYXRlV2lkZ2V0 IGltcGxlbWVudGF0aW9ucyBpbnRvIHRoZSBET00KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MDU4CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9I VE1MRW1iZWRFbGVtZW50LmggYi9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5oCmluZGV4 IDBmYjdmNTAxNGFiYzI3N2RiZWVkMGVlMGMyMjA2OGU0N2Q0Nzk5YWQuLjcwZWIwZGM4NTNmYWFl ZjE4YmQ4MDM5ZmI3ZWE5NmYxZmZhZTEzYTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M RW1iZWRFbGVtZW50LmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuaApAQCAt MzEsOCArMzEsNiBAQCBjbGFzcyBIVE1MRW1iZWRFbGVtZW50IDogcHVibGljIEhUTUxQbHVnSW5J bWFnZUVsZW1lbnQgewogcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPEhUTUxFbWJlZEVs ZW1lbnQ+IGNyZWF0ZShjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQqLCBib29sIGNyZWF0 ZWRCeVBhcnNlcik7CiAKLSAgICB2b2lkIHVwZGF0ZVdpZGdldChib29sIG9ubHlDcmVhdGVOb25O ZXRzY2FwZVBsdWdpbnMpOwotCiBwcml2YXRlOgogICAgIEhUTUxFbWJlZEVsZW1lbnQoY29uc3Qg UXVhbGlmaWVkTmFtZSYsIERvY3VtZW50KiwgYm9vbCBjcmVhdGVkQnlQYXJzZXIpOwogCkBAIC00 MywxMiArNDEsMTQgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgaW5zZXJ0ZWRJbnRvRG9j dW1lbnQoKTsKICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlZEZyb21Eb2N1bWVudCgpOwogICAgIHZp cnR1YWwgdm9pZCBhdHRyaWJ1dGVDaGFuZ2VkKEF0dHJpYnV0ZSosIGJvb2wgcHJlc2VydmVEZWNs cyA9IGZhbHNlKTsKLSAgICAKKwogICAgIHZpcnR1YWwgYm9vbCBpc1VSTEF0dHJpYnV0ZShBdHRy aWJ1dGUqKSBjb25zdDsKICAgICB2aXJ0dWFsIGNvbnN0IFF1YWxpZmllZE5hbWUmIGltYWdlU291 cmNlQXR0cmlidXRlTmFtZSgpIGNvbnN0OwogCiAgICAgdmlydHVhbCBSZW5kZXJXaWRnZXQqIHJl bmRlcldpZGdldEZvckpTQmluZGluZ3MoKSBjb25zdDsKIAorICAgIHZpcnR1YWwgdm9pZCB1cGRh dGVXaWRnZXQoYm9vbCBvbmx5Q3JlYXRlTm9uTmV0c2NhcGVQbHVnaW5zKTsKKwogICAgIHZpcnR1 YWwgdm9pZCBhZGRTdWJyZXNvdXJjZUF0dHJpYnV0ZVVSTHMoTGlzdEhhc2hTZXQ8S1VSTD4mKSBj b25zdDsKIAogICAgIHZvaWQgcGFyYW1ldGVyc0ZvclBsdWdpbihWZWN0b3I8U3RyaW5nPiYgcGFy YW1OYW1lcywgVmVjdG9yPFN0cmluZz4mIHBhcmFtVmFsdWVzKTsKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5oIGIvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVt ZW50LmgKaW5kZXggNjQwNGViYjM3MjA1YmFlNDhhZjk2YWRiYzY1NmI3MjI5NDQwNzdjOC4uOTIw OWE4MWRkMTA1ZjE3YTFiNDI0ODEzYjQ1NWVlNmRkMDJjN2NkOSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RF bGVtZW50LmgKQEAgLTM3LDggKzM3LDYgQEAgcHVibGljOgogCiAgICAgYm9vbCBjb250YWluc0ph dmFBcHBsZXQoKSBjb25zdDsKIAotICAgIHZvaWQgdXBkYXRlV2lkZ2V0KGJvb2wgb25seUNyZWF0 ZU5vbk5ldHNjYXBlUGx1Z2lucyk7Ci0KICAgICB2aXJ0dWFsIGJvb2wgdXNlRmFsbGJhY2tDb250 ZW50KCkgY29uc3QgeyByZXR1cm4gbV91c2VGYWxsYmFja0NvbnRlbnQ7IH0KICAgICB2b2lkIHJl bmRlckZhbGxiYWNrQ29udGVudCgpOwogCkBAIC02MSw2ICs1OSw3IEBAIHByaXZhdGU6CiAKICAg ICB2aXJ0dWFsIHZvaWQgYWRkU3VicmVzb3VyY2VBdHRyaWJ1dGVVUkxzKExpc3RIYXNoU2V0PEtV Ukw+JikgY29uc3Q7CiAKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlV2lkZ2V0KGJvb2wgb25seUNy ZWF0ZU5vbk5ldHNjYXBlUGx1Z2lucyk7CiAgICAgdm9pZCB1cGRhdGVEb2NOYW1lZEl0ZW0oKTsK IAogICAgIGJvb2wgaGFzRmFsbGJhY2tDb250ZW50KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9XZWJD b3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTFBs dWdJbkltYWdlRWxlbWVudC5jcHAKaW5kZXggZTBlYTE5YmI5Zjc2MjE5MjNmZmUwY2U4ODcyZjQy NmE5YjE1M2QyYi4uYWUzYmQ0YjVhZjRkMDI1YTVkNDk2MzQ4YWE4NDcwODQyZTZlYmEyNyAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwCisrKyBiL1dl YkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcApAQCAtMTUxLDcgKzE1MSw3IEBA IHZvaWQgSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6dXBkYXRlV2lkZ2V0SWZOZWNlc3NhcnkoKQog ewogICAgIGRvY3VtZW50KCktPnVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKICAgICBpZiAobmVlZHNX aWRnZXRVcGRhdGUoKSAmJiByZW5kZXJFbWJlZGRlZE9iamVjdCgpICYmICF1c2VGYWxsYmFja0Nv bnRlbnQoKSAmJiAhaXNJbWFnZVR5cGUoKSkKLSAgICAgICAgcmVuZGVyRW1iZWRkZWRPYmplY3Qo KS0+dXBkYXRlV2lkZ2V0KHRydWUpOworICAgICAgICB1cGRhdGVXaWRnZXQodHJ1ZSk7CiB9CiAK IHZvaWQgSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6ZmluaXNoUGFyc2luZ0NoaWxkcmVuKCkKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmggYi9XZWJDb3Jl L2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oCmluZGV4IDZiMDA4ODk0NDFlMjI4N2ExYzQ5 MGM0ZjUwMWMyMTQwNjJkMDJiODkuLjZjNTgzNTA3ZmJmMzk3YmI1NTBhZDIyYjk3NTZiYzA3ZjU1 NDI4NGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmgK KysrIGIvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuaApAQCAtMzIsMTYgKzMy LDE4IEBAIGNsYXNzIEZyYW1lTG9hZGVyOwogLy8gQmFzZSBjbGFzcyBmb3IgSFRNTE9iamVjdEVs ZW1lbnQgYW5kIEhUTUxFbWJlZEVsZW1lbnQKIGNsYXNzIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQg OiBwdWJsaWMgSFRNTFBsdWdJbkVsZW1lbnQgewogcHVibGljOgotICAgIGNvbnN0IFN0cmluZyYg c2VydmljZVR5cGUoKSBjb25zdCB7IHJldHVybiBtX3NlcnZpY2VUeXBlOyB9Ci0gICAgY29uc3Qg U3RyaW5nJiB1cmwoKSBjb25zdCB7IHJldHVybiBtX3VybDsgfQotCiAgICAgUmVuZGVyRW1iZWRk ZWRPYmplY3QqIHJlbmRlckVtYmVkZGVkT2JqZWN0KCkgY29uc3Q7CiAKKyAgICB2aXJ0dWFsIHZv aWQgdXBkYXRlV2lkZ2V0KGJvb2wgb25seUNyZWF0ZU5vbk5ldHNjYXBlUGx1Z2lucykgPSAwOwor CiBwcm90ZWN0ZWQ6CiAgICAgSFRNTFBsdWdJbkltYWdlRWxlbWVudChjb25zdCBRdWFsaWZpZWRO YW1lJiB0YWdOYW1lLCBEb2N1bWVudCosIGJvb2wgY3JlYXRlZEJ5UGFyc2VyKTsKIAogICAgIGJv b2wgaXNJbWFnZVR5cGUoKTsKIAorICAgIGNvbnN0IFN0cmluZyYgc2VydmljZVR5cGUoKSBjb25z dCB7IHJldHVybiBtX3NlcnZpY2VUeXBlOyB9CisgICAgY29uc3QgU3RyaW5nJiB1cmwoKSBjb25z dCB7IHJldHVybiBtX3VybDsgfQorICAgIAogICAgIE93blB0cjxIVE1MSW1hZ2VMb2FkZXI+IG1f aW1hZ2VMb2FkZXI7CiAgICAgU3RyaW5nIG1fc2VydmljZVR5cGU7CiAgICAgU3RyaW5nIG1fdXJs OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcAppbmRleCBkNmI1NWMxOTI4M2JhNGU0ZDlmODEzNjEzODY5N2Q0NzgyMDFl YjU2Li42YmJmOTYxZTg4ODBhZDMwOWI0MmM5ZmRkMjRhODcyMDE0MmVhMGRjIDEwMDY0NAotLS0g YS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcApAQCAtNDQsNiArNDQsNyBAQAogI2luY2x1ZGUgIkhUTUxGcmFtZUVsZW1lbnQuaCIKICNp bmNsdWRlICJIVE1MRnJhbWVTZXRFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCisj aW5jbHVkZSAiSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oIgogI2luY2x1ZGUgIkluc3BlY3RvclRp bWVsaW5lQWdlbnQuaCIKICNpbmNsdWRlICJPdmVyZmxvd0V2ZW50LmgiCiAjaW5jbHVkZSAiUmVu ZGVyRW1iZWRkZWRPYmplY3QuaCIKQEAgLTE1NzMsNiArMTU3NCwzNyBAQCB2b2lkIEZyYW1lVmll dzo6c2Nyb2xsVG9BbmNob3IoKQogICAgIG1fbWFpbnRhaW5TY3JvbGxQb3NpdGlvbkFuY2hvciA9 IGFuY2hvck5vZGU7CiB9CiAKK3ZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVXaWRnZXQoUmVuZGVyRW1i ZWRkZWRPYmplY3QqIG9iamVjdCkKK3sKKyAgICBBU1NFUlQoIW9iamVjdC0+bm9kZSgpIHx8IG9i amVjdC0+bm9kZSgpLT5pc0VsZW1lbnROb2RlKCkpOworICAgIEVsZW1lbnQqIG93bmVyRWxlbWVu dCA9IHN0YXRpY19jYXN0PEVsZW1lbnQqPihvYmplY3QtPm5vZGUoKSk7CisgICAgLy8gVGhlIG9i amVjdCBtYXkgaGF2ZSBhbHJlYWR5IGJlZW4gZGVzdHJveWVkICh0aHVzIG5vZGUgY2xlYXJlZCks CisgICAgLy8gYnV0IEZyYW1lVmlldyBob2xkcyBhIG1hbnVhbCByZWYsIHNvIGl0IHdvbid0IGhh dmUgYmVlbiBkZWxldGVkLgorICAgIEFTU0VSVChtX3dpZGdldFVwZGF0ZVNldC0+Y29udGFpbnMo b2JqZWN0KSk7CisgICAgaWYgKCFvd25lckVsZW1lbnQpCisgICAgICAgIHJldHVybjsKKworICAg IC8vIE5vIG5lZWQgdG8gdXBkYXRlIGlmIGl0J3MgYWxyZWFkeSBjcmFzaGVkIG9yIGtub3duIHRv IGJlIG1pc3NpbmcuCisgICAgaWYgKCFvYmplY3QtPnBsdWdpbkNyYXNoZWRPcldhc01pc3Npbmco KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gRklYTUU6IFRoaXMgY291bGQgdHVybiBpbnRv IGEgcmVhbCB2aXJ0dWFsIGRpc3BhdGNoIGlmIHdlIGRlZmluZWQKKyAgICAvLyB1cGRhdGVXaWRn ZXQoYm9vbCkgb24gSFRNTEVsZW1lbnQuCisgICAgaWYgKG93bmVyRWxlbWVudC0+aGFzVGFnTmFt ZShvYmplY3RUYWcpIHx8IG93bmVyRWxlbWVudC0+aGFzVGFnTmFtZShlbWJlZFRhZykpCisgICAg ICAgIHN0YXRpY19jYXN0PEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQqPihvd25lckVsZW1lbnQpLT51 cGRhdGVXaWRnZXQoZmFsc2UpOworICAgIC8vIEZJWE1FOiBJdCBpcyBub3QgY2xlYXIgdGhhdCBN ZWRpYSBlbGVtZW50cyBuZWVkIG9yIHdhbnQgdGhpcyB1cGRhdGVXaWRnZXQoKSBjYWxsLgorI2lm IEVOQUJMRShQTFVHSU5fUFJPWFlfRk9SX1ZJREVPKQorICAgIGVsc2UgaWYgKG93bmVyRWxlbWVu dC0+aGFzVGFnTmFtZSh2aWRlb1RhZykgfHwgb3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKGF1ZGlv VGFnKSkKKyAgICAgICAgc3RhdGljX2Nhc3Q8SFRNTE1lZGlhRWxlbWVudCo+KG93bmVyRWxlbWVu dCktPnVwZGF0ZVdpZGdldChmYWxzZSk7CisjZW5kaWYKKyAgICBlbHNlCisgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOworCisgICAgLy8gQ2F1dGlvbjogaXQncyBwb3NzaWJsZSB0aGUgb2Jq ZWN0IHdhcyBkZXN0cm95ZWQgYWdhaW4sIHNpbmNlIGxvYWRpbmcgYQorICAgIC8vIHBsdWdpbiBt YXkgcnVuIGFueSBhcmJpdHJhcnkgamF2YXNjcmlwdC4KKyAgICBvYmplY3QtPnVwZGF0ZVdpZGdl dFBvc2l0aW9uKCk7Cit9CisKIGJvb2wgRnJhbWVWaWV3Ojp1cGRhdGVXaWRnZXRzKCkKIHsKICAg ICBpZiAobV9uZXN0ZWRMYXlvdXRDb3VudCA+IDEgfHwgIW1fd2lkZ2V0VXBkYXRlU2V0IHx8IG1f d2lkZ2V0VXBkYXRlU2V0LT5pc0VtcHR5KCkpCkBAIC0xNTkxLDExICsxNjIzLDcgQEAgYm9vbCBG cmFtZVZpZXc6OnVwZGF0ZVdpZGdldHMoKQogCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBz aXplOyArK2kpIHsKICAgICAgICAgUmVuZGVyRW1iZWRkZWRPYmplY3QqIG9iamVjdCA9IG9iamVj dHNbaV07Ci0KLSAgICAgICAgLy8gVGhlIG9iamVjdCBtYXkgaGF2ZSBiZWVuIGRlc3Ryb3llZCwg YnV0IG91ciBtYW51YWwgcmVmKCkga2VlcHMgdGhlIG9iamVjdCBmcm9tIGJlaW5nIGRlbGV0ZWQu Ci0gICAgICAgIG9iamVjdC0+dXBkYXRlV2lkZ2V0KGZhbHNlKTsKLSAgICAgICAgb2JqZWN0LT51 cGRhdGVXaWRnZXRQb3NpdGlvbigpOwotCisgICAgICAgIHVwZGF0ZVdpZGdldChvYmplY3QpOwog ICAgICAgICBtX3dpZGdldFVwZGF0ZVNldC0+cmVtb3ZlKG9iamVjdCk7CiAgICAgfQogCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmgKaW5kZXggNDYzMDIwYTYwNDhjZjhjNTYwNDgwZDdmMTdmMDRmZDVhZDJjMTFiNy4uZjlhNGJm MzkxODgxNDY2M2I1Nzc2Y2IzYTNmYjlhMmUyNDdmZDlhZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5oCisrKyBiL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtMjgwLDYg KzI4MCw3IEBAIHByaXZhdGU6CiAgICAgZG91YmxlIGFkanVzdGVkRGVmZXJyZWRSZXBhaW50RGVs YXkoKSBjb25zdDsKIAogICAgIGJvb2wgdXBkYXRlV2lkZ2V0cygpOworICAgIHZvaWQgdXBkYXRl V2lkZ2V0KFJlbmRlckVtYmVkZGVkT2JqZWN0Kik7CiAgICAgdm9pZCBzY3JvbGxUb0FuY2hvcigp OwogICAgIHZvaWQgc2Nyb2xsUG9zaXRpb25DaGFuZ2VkKCk7CiAKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcAppbmRleCA0M2M4ZDIyYTQ3YTYwZTE2NTE1NzMzOWU2 MDhmZGY4MmRjNzdkYTY4Li5kMDgxNzRkMzE3ZGYwZTM0ZWRiODgyNzdhMTZhOTc3Y2NiODZmNzdh IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAK KysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuY3BwCkBAIC0xMDIs MzAgKzEwMiw2IEBAIGJvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OmFsbG93c0FjY2VsZXJhdGVk Q29tcG9zaXRpbmcoKSBjb25zdAogfQogI2VuZGlmCiAKLS8vIEZJWE1FOiBUaGlzIHNob3VsZCBi ZSBtb3ZlZCBpbnRvIEZyYW1lVmlldyAodGhlIG9ubHkgY2FsbGVyKQotdm9pZCBSZW5kZXJFbWJl ZGRlZE9iamVjdDo6dXBkYXRlV2lkZ2V0KGJvb2wgb25seUNyZWF0ZU5vbk5ldHNjYXBlUGx1Z2lu cykKLXsKLSAgICBpZiAoIW1fcmVwbGFjZW1lbnRUZXh0LmlzTnVsbCgpIHx8ICFub2RlKCkpIC8v IENoZWNrIHRoZSBub2RlIGluIGNhc2UgZGVzdHJveSgpIGhhcyBiZWVuIGNhbGxlZC4KLSAgICAg ICAgcmV0dXJuOwotCi0gICAgLy8gVGhlIGNhbGxzIHRvIFN1YmZyYW1lTG9hZGVyOjpyZXF1ZXN0 T2JqZWN0IHdpdGhpbiB0aGlzIGZ1bmN0aW9uIGNhbiByZXN1bHQgaW4gYSBwbHVnLWluIGJlaW5n IGluaXRpYWxpemVkLgotICAgIC8vIFRoaXMgY2FuIHJ1biBjYXVzZSBhcmJpdHJhcnkgSmF2YVNj cmlwdCB0byBydW4gYW5kIG1heSByZXN1bHQgaW4gdGhpcyBSZW5kZXJPYmplY3QgYmVpbmcgZGV0 YWNoZWQgZnJvbQotICAgIC8vIHRoZSByZW5kZXIgdHJlZSBhbmQgZGVzdHJveWVkLCBjYXVzaW5n IGEgY3Jhc2ggbGlrZSA8cmRhcjovL3Byb2JsZW0vNjk1NDU0Nj4uICBCeSBleHRlbmRpbmcgb3Vy IGxpZmV0aW1lCi0gICAgLy8gYXJ0aWZpY2FsbHkgdG8gZW5zdXJlIHRoYXQgd2UgcmVtYWluIGFs aXZlIGZvciB0aGUgZHVyYXRpb24gb2YgcGx1Zy1pbiBpbml0aWFsaXphdGlvbi4KLSAgICBSZW5k ZXJXaWRnZXRQcm90ZWN0b3IgcHJvdGVjdG9yKHRoaXMpOwotCi0gICAgaWYgKG5vZGUoKS0+aGFz VGFnTmFtZShvYmplY3RUYWcpKQotICAgICAgICBzdGF0aWNfY2FzdDxIVE1MT2JqZWN0RWxlbWVu dCo+KG5vZGUoKSktPnVwZGF0ZVdpZGdldChvbmx5Q3JlYXRlTm9uTmV0c2NhcGVQbHVnaW5zKTsK LSAgICBlbHNlIGlmIChub2RlKCktPmhhc1RhZ05hbWUoZW1iZWRUYWcpKQotICAgICAgICBzdGF0 aWNfY2FzdDxIVE1MRW1iZWRFbGVtZW50Kj4obm9kZSgpKS0+dXBkYXRlV2lkZ2V0KG9ubHlDcmVh dGVOb25OZXRzY2FwZVBsdWdpbnMpOwotI2lmIEVOQUJMRShQTFVHSU5fUFJPWFlfRk9SX1ZJREVP KSAgICAgICAgCi0gICAgZWxzZSBpZiAobm9kZSgpLT5oYXNUYWdOYW1lKHZpZGVvVGFnKSB8fCBu b2RlKCktPmhhc1RhZ05hbWUoYXVkaW9UYWcpKQotICAgICAgICBzdGF0aWNfY2FzdDxIVE1MTWVk aWFFbGVtZW50Kj4obm9kZSgpKS0+dXBkYXRlV2lkZ2V0KG9ubHlDcmVhdGVOb25OZXRzY2FwZVBs dWdpbnMpOwotI2VuZGlmCi0gICAgZWxzZQotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK LX0KLQogdm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6c2V0U2hvd3NNaXNzaW5nUGx1Z2luSW5k aWNhdG9yKCkKIHsKICAgICBBU1NFUlQobV9yZXBsYWNlbWVudFRleHQuaXNFbXB0eSgpKTsKQEAg LTEzOSw2ICsxMTUsMTEgQEAgdm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6c2V0U2hvd3NDcmFz aGVkUGx1Z2luSW5kaWNhdG9yKCkKICAgICBtX3JlcGxhY2VtZW50VGV4dCA9IGNyYXNoZWRQbHVn aW5UZXh0KCk7CiB9CiAKK2Jvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnBsdWdpbkNyYXNoZWRP cldhc01pc3NpbmcoKSBjb25zdAoreworICAgIHJldHVybiAhbV9yZXBsYWNlbWVudFRleHQuaXNO dWxsKCk7Cit9CisgICAgCiB2b2lkIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpzZXRNaXNzaW5nUGx1 Z2luSW5kaWNhdG9ySXNQcmVzc2VkKGJvb2wgcHJlc3NlZCkKIHsKICAgICBpZiAobV9taXNzaW5n UGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkID09IHByZXNzZWQpCkBAIC0xNTAsNyArMTMxLDcgQEAg dm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6c2V0TWlzc2luZ1BsdWdpbkluZGljYXRvcklzUHJl c3NlZChib29sIHByZXNzZWQpCiAKIHZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnBhaW50KFBh aW50SW5mbyYgcGFpbnRJbmZvLCBpbnQgdHgsIGludCB0eSkKIHsKLSAgICBpZiAoIW1fcmVwbGFj ZW1lbnRUZXh0LmlzTnVsbCgpKSB7CisgICAgaWYgKHBsdWdpbkNyYXNoZWRPcldhc01pc3Npbmco KSkgewogICAgICAgICBSZW5kZXJSZXBsYWNlZDo6cGFpbnQocGFpbnRJbmZvLCB0eCwgdHkpOwog ICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTYwLDcgKzE0MSw3IEBAIHZvaWQgUmVuZGVyRW1i ZWRkZWRPYmplY3Q6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBpbnQgdHgsIGludCB0eSkK IAogdm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFpbnRSZXBsYWNlZChQYWludEluZm8mIHBh aW50SW5mbywgaW50IHR4LCBpbnQgdHkpCiB7Ci0gICAgaWYgKCFtX3JlcGxhY2VtZW50VGV4dCkK KyAgICBpZiAocGx1Z2luQ3Jhc2hlZE9yV2FzTWlzc2luZygpKQogICAgICAgICByZXR1cm47CiAK ICAgICBpZiAocGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VTZWxlY3Rpb24pCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5oIGIvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaAppbmRleCA2Mzc2ZjkzMzNjYWE0ZThkMTc4 NmNhMDdjODI2NDYzYTQ4N2UzNGUwLi44ZDA5ZWRlYThmNWVlZGIyODMxYzBlODFkYmYwOTgyNzVj Yzg4YjhjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVj dC5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmgKQEAgLTM2 LDcgKzM2LDggQEAgcHVibGljOgogICAgIFJlbmRlckVtYmVkZGVkT2JqZWN0KEVsZW1lbnQqKTsK ICAgICB2aXJ0dWFsIH5SZW5kZXJFbWJlZGRlZE9iamVjdCgpOwogCi0gICAgdm9pZCB1cGRhdGVX aWRnZXQoYm9vbCBvbmx5Q3JlYXRlTm9uTmV0c2NhcGVQbHVnaW5zKTsKKyAgICBib29sIHBsdWdp bkNyYXNoZWRPcldhc01pc3NpbmcoKSBjb25zdDsKKyAgICAKICAgICB2b2lkIHNldFNob3dzTWlz c2luZ1BsdWdpbkluZGljYXRvcigpOwogICAgIHZvaWQgc2V0U2hvd3NDcmFzaGVkUGx1Z2luSW5k aWNhdG9yKCk7CiAgICAgYm9vbCBzaG93c01pc3NpbmdQbHVnaW5JbmRpY2F0b3IoKSBjb25zdCB7 IHJldHVybiBtX3Nob3dzTWlzc2luZ1BsdWdpbkluZGljYXRvcjsgfQo= 66358 2010-09-02 04:49:59 -0700 2010-09-02 21:49:40 -0700 Patch for landing bug-45065-20100902044957.patch text/plain 13800 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODRlNGQyYWViNmRjNzAwNDc1NzY2ZGM1MjY5ZmNhMGZhZDhkYjc4ZC4uMGZlNTMyZTNkMzUyODgx ODEyZGQ2OTRjZmY5ZDRhN2ZhNmJkZWFhZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiw0NCBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KIAorICAgICAgICBNb3ZlIHVwZGF0ZVdpZGdldCBpbnRv IEZyYW1lVmlldyBmcm9tIFJlbmRlckVtYmVkZGVkT2JqZWN0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTA2NQorCisgICAgICAgIEkgYWxzbyBtYWRl IHVwZGF0ZVdpZGdldCgpIHZpcnR1YWwgb24gSFRNTFBsdWdJbkltYWdlRWxlbWVudC4KKyAgICAg ICAgSSdtIG5vdCB5ZXQgc3VyZSB0aGF0IHVwZGF0ZVdpZGdldCBiZWxvbmdzIG9uIEhUTUxFbGVt ZW50IHNpbmNlCisgICAgICAgIEknbSBub3Qgc3VyZSB0aGF0IEhUTUxNZWRpYUVsZW1lbnQncyB1 c2Ugb2YgdGhlIHVwZGF0ZVdpZGdldAorICAgICAgICBpbmZyYXN0cnVjdHVyZSBpcyBjb3JyZWN0 LgorCisgICAgICAgIEkgYWxzbyBnb3QgcmlkIG9mIHRoZSBzdHJhbmdlICFtX3JlcGxhY2VtZW50 VGV4dC5pc0VtcHR5KCkgY2hlY2tzCisgICAgICAgIGJ5IG1ha2luZyBhIHBsdWdpbkNyYXNoZWRP cldhc01pc3NpbmcoKSBjYWxsIHdoaWNoIHNlZW1zIHRvIGVtYm9keQorICAgICAgICB0aGUgaWRl YSBiZWhpbmQgdGhhdCBjaGVjayBhbmQgaGlkZXMgdGhlIHNjcmV3eSBkZXRhaWxzLgorCisgICAg ICAgIEkgbm90aWNlZCBhIGNvdXBsZSBtZXRob2RzIG9uIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQg d2VyZSBwdWJsaWMKKyAgICAgICAgd2hpY2ggZGlkIG5vdCBuZWVkIHRvIGJlLiAgRml4ZWQuCisK KyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2UsIHRodXMgbm8gdGVzdHMuCisKKyAgICAgICAg KiBodG1sL0hUTUxFbWJlZEVsZW1lbnQuaDoKKyAgICAgICAgKiBodG1sL0hUTUxPYmplY3RFbGVt ZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnVwZGF0ZVdpZGdldElmTmVjZXNz YXJ5KToKKyAgICAgICAgKiBodG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuaDoKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnNlcnZpY2VUeXBlKToKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnVybCk6CisgICAgICAgICogcGFnZS9G cmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVXaWRnZXQp OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVXaWRnZXRzKToKKyAgICAgICAg KiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9i amVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGx1Z2lu Q3Jhc2hlZE9yV2FzTWlzc2luZyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9i amVjdDo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmplY3Q6OnBh aW50UmVwbGFjZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5o OgorCisyMDEwLTA5LTAxICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCisKICAgICAgICAgTW92ZSB1cGRhdGVXaWRn ZXQgaW1wbGVtZW50YXRpb25zIGludG8gdGhlIERPTQogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUwNTgKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1s L0hUTUxFbWJlZEVsZW1lbnQuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuY3Bw CmluZGV4IDBhYjAwZWNjNmJhNmZkZDFlNjhmMTJhOTBhNzBhMDBjZDZkMmFlMDMuLmEwZWU3YmRi NmQxMjhjMTgwN2VjYjcxYzVmZjkyMWIxMDc0ZjFkM2EgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRt bC9IVE1MRW1iZWRFbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVu dC5jcHAKQEAgLTEzNyw2ICsxMzcsNyBAQCB2b2lkIEhUTUxFbWJlZEVsZW1lbnQ6OnBhcmFtZXRl cnNGb3JQbHVnaW4oVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIFZlY3RvcjxTdAogLy8gbW92 ZWQgZG93biBpbnRvIEhUTUxQbHVnaW5JbWFnZUVsZW1lbnQuY3BwCiB2b2lkIEhUTUxFbWJlZEVs ZW1lbnQ6OnVwZGF0ZVdpZGdldChib29sIG9ubHlDcmVhdGVOb25OZXRzY2FwZVBsdWdpbnMpCiB7 CisgICAgQVNTRVJUKCFyZW5kZXJFbWJlZGRlZE9iamVjdCgpLT5wbHVnaW5DcmFzaGVkT3JXYXNN aXNzaW5nKCkpOwogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgQVNTRVJUKG5lZWRzV2lkZ2V0VXBk YXRlKCkpLCBidXQgY3VycmVudGx5CiAgICAgLy8gRnJhbWVWaWV3Ojp1cGRhdGVXaWRnZXQoKSBj YWxscyB1cGRhdGVXaWRnZXQoZmFsc2UpIHdpdGhvdXQgY2hlY2tpbmcgaWYKICAgICAvLyB0aGUg d2lkZ2V0IGFjdHVhbGx5IG5lZWRzIHVwZGF0aW5nIQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1s L0hUTUxFbWJlZEVsZW1lbnQuaCBiL1dlYkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50LmgKaW5k ZXggMGZiN2Y1MDE0YWJjMjc3ZGJlZWQwZWUwYzIyMDY4ZTQ3ZDQ3OTlhZC4uNzBlYjBkYzg1M2Zh YWVmMThiZDgwMzlmYjdlYTk2ZjFmZmFlMTNhNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hU TUxFbWJlZEVsZW1lbnQuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5oCkBA IC0zMSw4ICszMSw2IEBAIGNsYXNzIEhUTUxFbWJlZEVsZW1lbnQgOiBwdWJsaWMgSFRNTFBsdWdJ bkltYWdlRWxlbWVudCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SFRNTEVtYmVk RWxlbWVudD4gY3JlYXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCosIGJvb2wgY3Jl YXRlZEJ5UGFyc2VyKTsKIAotICAgIHZvaWQgdXBkYXRlV2lkZ2V0KGJvb2wgb25seUNyZWF0ZU5v bk5ldHNjYXBlUGx1Z2lucyk7Ci0KIHByaXZhdGU6CiAgICAgSFRNTEVtYmVkRWxlbWVudChjb25z dCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQqLCBib29sIGNyZWF0ZWRCeVBhcnNlcik7CiAKQEAg LTQzLDEyICs0MSwxNCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBpbnNlcnRlZEludG9E b2N1bWVudCgpOwogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVkRnJvbURvY3VtZW50KCk7CiAgICAg dmlydHVhbCB2b2lkIGF0dHJpYnV0ZUNoYW5nZWQoQXR0cmlidXRlKiwgYm9vbCBwcmVzZXJ2ZURl Y2xzID0gZmFsc2UpOwotICAgIAorCiAgICAgdmlydHVhbCBib29sIGlzVVJMQXR0cmlidXRlKEF0 dHJpYnV0ZSopIGNvbnN0OwogICAgIHZpcnR1YWwgY29uc3QgUXVhbGlmaWVkTmFtZSYgaW1hZ2VT b3VyY2VBdHRyaWJ1dGVOYW1lKCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIFJlbmRlcldpZGdldCog cmVuZGVyV2lkZ2V0Rm9ySlNCaW5kaW5ncygpIGNvbnN0OwogCisgICAgdmlydHVhbCB2b2lkIHVw ZGF0ZVdpZGdldChib29sIG9ubHlDcmVhdGVOb25OZXRzY2FwZVBsdWdpbnMpOworCiAgICAgdmly dHVhbCB2b2lkIGFkZFN1YnJlc291cmNlQXR0cmlidXRlVVJMcyhMaXN0SGFzaFNldDxLVVJMPiYp IGNvbnN0OwogCiAgICAgdm9pZCBwYXJhbWV0ZXJzRm9yUGx1Z2luKFZlY3RvcjxTdHJpbmc+JiBw YXJhbU5hbWVzLCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMpOwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MT2JqZWN0 RWxlbWVudC5jcHAKaW5kZXggYzk3MDI5Mzk5OTg3OGU3NmRjMDIyYjI1YzgxODY2OTk4ODAxY2Fi MS4uNTZhNjA5NTVlOWViMDExMmU3NmJjMzBiZmY3ZTViODQwMzFiNjFiMiAxMDA2NDQKLS0tIGEv V2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRN TE9iamVjdEVsZW1lbnQuY3BwCkBAIC0yNDAsNiArMjQwLDcgQEAgYm9vbCBIVE1MT2JqZWN0RWxl bWVudDo6aGFzRmFsbGJhY2tDb250ZW50KCkgY29uc3QKIC8vIG1vdmVkIGRvd24gaW50byBIVE1M UGx1Z2luSW1hZ2VFbGVtZW50LmNwcAogdm9pZCBIVE1MT2JqZWN0RWxlbWVudDo6dXBkYXRlV2lk Z2V0KGJvb2wgb25seUNyZWF0ZU5vbk5ldHNjYXBlUGx1Z2lucykKIHsKKyAgICBBU1NFUlQoIXJl bmRlckVtYmVkZGVkT2JqZWN0KCktPnBsdWdpbkNyYXNoZWRPcldhc01pc3NpbmcoKSk7CiAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBBU1NFUlQobmVlZHNXaWRnZXRVcGRhdGUoKSksIGJ1dCBjdXJy ZW50bHkKICAgICAvLyBGcmFtZVZpZXc6OnVwZGF0ZVdpZGdldCgpIGNhbGxzIHVwZGF0ZVdpZGdl dChmYWxzZSkgd2l0aG91dCBjaGVja2luZyBpZgogICAgIC8vIHRoZSB3aWRnZXQgYWN0dWFsbHkg bmVlZHMgdXBkYXRpbmchCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTE9iamVjdEVsZW1l bnQuaCBiL1dlYkNvcmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5oCmluZGV4IDM2YzNjNGI4MTQw MGY1MDFmMjBkYjEwNzNkNDQxNWVmMWM1ZjcyNmMuLjJkNDE2YzM0YTUyZjhhYWM1MTI3MzI4MDQ3 M2U5NjdhZmZjNDQ5MGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVu dC5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5oCkBAIC0zNyw4ICszNyw2 IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgY29udGFpbnNKYXZhQXBwbGV0KCkgY29uc3Q7CiAKLSAg ICB2b2lkIHVwZGF0ZVdpZGdldChib29sIG9ubHlDcmVhdGVOb25OZXRzY2FwZVBsdWdpbnMpOwot CiAgICAgdmlydHVhbCBib29sIHVzZUZhbGxiYWNrQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1f dXNlRmFsbGJhY2tDb250ZW50OyB9CiAgICAgdm9pZCByZW5kZXJGYWxsYmFja0NvbnRlbnQoKTsK IApAQCAtNjAsNiArNTgsNyBAQCBwcml2YXRlOgogCiAgICAgdmlydHVhbCB2b2lkIGFkZFN1YnJl c291cmNlQXR0cmlidXRlVVJMcyhMaXN0SGFzaFNldDxLVVJMPiYpIGNvbnN0OwogCisgICAgdmly dHVhbCB2b2lkIHVwZGF0ZVdpZGdldChib29sIG9ubHlDcmVhdGVOb25OZXRzY2FwZVBsdWdpbnMp OwogICAgIHZvaWQgdXBkYXRlRG9jTmFtZWRJdGVtKCk7CiAKICAgICBib29sIGhhc0ZhbGxiYWNr Q29udGVudCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFn ZUVsZW1lbnQuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwCmlu ZGV4IDU3YTcwYTk3M2JhN2MxMThkYTc4MDlmOTgwMzVhY2E5ZjE1Yjk2MmIuLjlhYzVhZDg5MDg2 NzJiNjRjNWM2MmNjZWMxM2MxZWJjNTMzODgwOGYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9I VE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbklt YWdlRWxlbWVudC5jcHAKQEAgLTE1OSw4ICsxNTksMTUgQEAgdm9pZCBIVE1MUGx1Z0luSW1hZ2VF bGVtZW50OjpkZXRhY2goKQogdm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojp1cGRhdGVXaWRn ZXRJZk5lY2Vzc2FyeSgpCiB7CiAgICAgZG9jdW1lbnQoKS0+dXBkYXRlU3R5bGVJZk5lZWRlZCgp OwotICAgIGlmIChuZWVkc1dpZGdldFVwZGF0ZSgpICYmIHJlbmRlckVtYmVkZGVkT2JqZWN0KCkg JiYgIXVzZUZhbGxiYWNrQ29udGVudCgpICYmICFpc0ltYWdlVHlwZSgpKQotICAgICAgICByZW5k ZXJFbWJlZGRlZE9iamVjdCgpLT51cGRhdGVXaWRnZXQodHJ1ZSk7CisKKyAgICBpZiAoIW5lZWRz V2lkZ2V0VXBkYXRlKCkgfHwgdXNlRmFsbGJhY2tDb250ZW50KCkgfHwgaXNJbWFnZVR5cGUoKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKCFyZW5kZXJFbWJlZGRlZE9iamVjdCgpIHx8IHJl bmRlckVtYmVkZGVkT2JqZWN0KCktPnBsdWdpbkNyYXNoZWRPcldhc01pc3NpbmcoKSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgLy8gVHJ1ZSBpbmRpY2F0ZXMgdGhhdCB0aGlzIGNvZGUgcGF0aCBz aG91bGQgb25seSBjcmVhdGUgbm9uLW5ldHNjYXBlIHBsdWdpbnMgKG5vIGNsdWUgd2h5KS4KKyAg ICB1cGRhdGVXaWRnZXQodHJ1ZSk7CiB9CiAKIHZvaWQgSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6 ZmluaXNoUGFyc2luZ0NoaWxkcmVuKCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MUGx1 Z0luSW1hZ2VFbGVtZW50LmggYi9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5o CmluZGV4IDc4YmRlYjNlZmNjZmJjODI4ZGRmMDhiYmM1MmI1MGVhMGM1ZThjYzAuLjYwYWQwZTY3 ZmFkY2YzNjE1MzM3MDg2MWFjY2Y2NzZmMGFiOTZhZmUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRt bC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5J bWFnZUVsZW1lbnQuaApAQCAtMzIsMTYgKzMyLDE4IEBAIGNsYXNzIEZyYW1lTG9hZGVyOwogLy8g QmFzZSBjbGFzcyBmb3IgSFRNTE9iamVjdEVsZW1lbnQgYW5kIEhUTUxFbWJlZEVsZW1lbnQKIGNs YXNzIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQgOiBwdWJsaWMgSFRNTFBsdWdJbkVsZW1lbnQgewog cHVibGljOgotICAgIGNvbnN0IFN0cmluZyYgc2VydmljZVR5cGUoKSBjb25zdCB7IHJldHVybiBt X3NlcnZpY2VUeXBlOyB9Ci0gICAgY29uc3QgU3RyaW5nJiB1cmwoKSBjb25zdCB7IHJldHVybiBt X3VybDsgfQotCiAgICAgUmVuZGVyRW1iZWRkZWRPYmplY3QqIHJlbmRlckVtYmVkZGVkT2JqZWN0 KCkgY29uc3Q7CiAKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlV2lkZ2V0KGJvb2wgb25seUNyZWF0 ZU5vbk5ldHNjYXBlUGx1Z2lucykgPSAwOworCiBwcm90ZWN0ZWQ6CiAgICAgSFRNTFBsdWdJbklt YWdlRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVudCosIGJvb2wg Y3JlYXRlZEJ5UGFyc2VyKTsKIAogICAgIGJvb2wgaXNJbWFnZVR5cGUoKTsKIAorICAgIGNvbnN0 IFN0cmluZyYgc2VydmljZVR5cGUoKSBjb25zdCB7IHJldHVybiBtX3NlcnZpY2VUeXBlOyB9Cisg ICAgY29uc3QgU3RyaW5nJiB1cmwoKSBjb25zdCB7IHJldHVybiBtX3VybDsgfQorCiAgICAgT3du UHRyPEhUTUxJbWFnZUxvYWRlcj4gbV9pbWFnZUxvYWRlcjsKICAgICBTdHJpbmcgbV9zZXJ2aWNl VHlwZTsKICAgICBTdHJpbmcgbV91cmw7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcCBiL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IGQ2YjU1YzE5MjgzYmE0 ZTRkOWY4MTM2MTM4Njk3ZDQ3ODIwMWViNTYuLjY1ZmE0OWYzMDczMjEyZjk3MDk4MTQ3ZjE3M2M1 MmRjMDEyNTNkOTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBi L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC00NCw2ICs0NCw3IEBACiAjaW5jbHVkZSAi SFRNTEZyYW1lRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxGcmFtZVNldEVsZW1lbnQuaCIKICNp bmNsdWRlICJIVE1MTmFtZXMuaCIKKyNpbmNsdWRlICJIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Lmgi CiAjaW5jbHVkZSAiSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIgogI2luY2x1ZGUgIk92ZXJmbG93 RXZlbnQuaCIKICNpbmNsdWRlICJSZW5kZXJFbWJlZGRlZE9iamVjdC5oIgpAQCAtMTU3Myw2ICsx NTc0LDM3IEBAIHZvaWQgRnJhbWVWaWV3OjpzY3JvbGxUb0FuY2hvcigpCiAgICAgbV9tYWludGFp blNjcm9sbFBvc2l0aW9uQW5jaG9yID0gYW5jaG9yTm9kZTsKIH0KIAordm9pZCBGcmFtZVZpZXc6 OnVwZGF0ZVdpZGdldChSZW5kZXJFbWJlZGRlZE9iamVjdCogb2JqZWN0KQoreworICAgIEFTU0VS VCghb2JqZWN0LT5ub2RlKCkgfHwgb2JqZWN0LT5ub2RlKCktPmlzRWxlbWVudE5vZGUoKSk7Cisg ICAgRWxlbWVudCogb3duZXJFbGVtZW50ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG9iamVjdC0+ bm9kZSgpKTsKKyAgICAvLyBUaGUgb2JqZWN0IG1heSBoYXZlIGFscmVhZHkgYmVlbiBkZXN0cm95 ZWQgKHRodXMgbm9kZSBjbGVhcmVkKSwKKyAgICAvLyBidXQgRnJhbWVWaWV3IGhvbGRzIGEgbWFu dWFsIHJlZiwgc28gaXQgd29uJ3QgaGF2ZSBiZWVuIGRlbGV0ZWQuCisgICAgQVNTRVJUKG1fd2lk Z2V0VXBkYXRlU2V0LT5jb250YWlucyhvYmplY3QpKTsKKyAgICBpZiAoIW93bmVyRWxlbWVudCkK KyAgICAgICAgcmV0dXJuOworCisgICAgLy8gTm8gbmVlZCB0byB1cGRhdGUgaWYgaXQncyBhbHJl YWR5IGNyYXNoZWQgb3Iga25vd24gdG8gYmUgbWlzc2luZy4KKyAgICBpZiAob2JqZWN0LT5wbHVn aW5DcmFzaGVkT3JXYXNNaXNzaW5nKCkpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIEZJWE1F OiBUaGlzIGNvdWxkIHR1cm4gaW50byBhIHJlYWwgdmlydHVhbCBkaXNwYXRjaCBpZiB3ZSBkZWZp bmVkCisgICAgLy8gdXBkYXRlV2lkZ2V0KGJvb2wpIG9uIEhUTUxFbGVtZW50LgorICAgIGlmIChv d25lckVsZW1lbnQtPmhhc1RhZ05hbWUob2JqZWN0VGFnKSB8fCBvd25lckVsZW1lbnQtPmhhc1Rh Z05hbWUoZW1iZWRUYWcpKQorICAgICAgICBzdGF0aWNfY2FzdDxIVE1MUGx1Z0luSW1hZ2VFbGVt ZW50Kj4ob3duZXJFbGVtZW50KS0+dXBkYXRlV2lkZ2V0KGZhbHNlKTsKKyAgICAvLyBGSVhNRTog SXQgaXMgbm90IGNsZWFyIHRoYXQgTWVkaWEgZWxlbWVudHMgbmVlZCBvciB3YW50IHRoaXMgdXBk YXRlV2lkZ2V0KCkgY2FsbC4KKyNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykKKyAg ICBlbHNlIGlmIChvd25lckVsZW1lbnQtPmhhc1RhZ05hbWUodmlkZW9UYWcpIHx8IG93bmVyRWxl bWVudC0+aGFzVGFnTmFtZShhdWRpb1RhZykpCisgICAgICAgIHN0YXRpY19jYXN0PEhUTUxNZWRp YUVsZW1lbnQqPihvd25lckVsZW1lbnQpLT51cGRhdGVXaWRnZXQoZmFsc2UpOworI2VuZGlmCisg ICAgZWxzZQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKworICAgIC8vIENhdXRpb246 IGl0J3MgcG9zc2libGUgdGhlIG9iamVjdCB3YXMgZGVzdHJveWVkIGFnYWluLCBzaW5jZSBsb2Fk aW5nIGEKKyAgICAvLyBwbHVnaW4gbWF5IHJ1biBhbnkgYXJiaXRyYXJ5IGphdmFzY3JpcHQuCisg ICAgb2JqZWN0LT51cGRhdGVXaWRnZXRQb3NpdGlvbigpOworfQorCiBib29sIEZyYW1lVmlldzo6 dXBkYXRlV2lkZ2V0cygpCiB7CiAgICAgaWYgKG1fbmVzdGVkTGF5b3V0Q291bnQgPiAxIHx8ICFt X3dpZGdldFVwZGF0ZVNldCB8fCBtX3dpZGdldFVwZGF0ZVNldC0+aXNFbXB0eSgpKQpAQCAtMTU5 MSwxMSArMTYyMyw3IEBAIGJvb2wgRnJhbWVWaWV3Ojp1cGRhdGVXaWRnZXRzKCkKIAogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgc2l6ZTsgKytpKSB7CiAgICAgICAgIFJlbmRlckVtYmVkZGVk T2JqZWN0KiBvYmplY3QgPSBvYmplY3RzW2ldOwotCi0gICAgICAgIC8vIFRoZSBvYmplY3QgbWF5 IGhhdmUgYmVlbiBkZXN0cm95ZWQsIGJ1dCBvdXIgbWFudWFsIHJlZigpIGtlZXBzIHRoZSBvYmpl Y3QgZnJvbSBiZWluZyBkZWxldGVkLgotICAgICAgICBvYmplY3QtPnVwZGF0ZVdpZGdldChmYWxz ZSk7Ci0gICAgICAgIG9iamVjdC0+dXBkYXRlV2lkZ2V0UG9zaXRpb24oKTsKLQorICAgICAgICB1 cGRhdGVXaWRnZXQob2JqZWN0KTsKICAgICAgICAgbV93aWRnZXRVcGRhdGVTZXQtPnJlbW92ZShv YmplY3QpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IDQ2MzAyMGE2MDQ4Y2Y4YzU2MDQ4MGQ3ZjE3 ZjA0ZmQ1YWQyYzExYjcuLmY5YTRiZjM5MTg4MTQ2NjNiNTc3NmNiM2EzZmI5YTJlMjQ3ZmQ5YWQg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysgYi9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmgKQEAgLTI4MCw2ICsyODAsNyBAQCBwcml2YXRlOgogICAgIGRvdWJsZSBhZGp1 c3RlZERlZmVycmVkUmVwYWludERlbGF5KCkgY29uc3Q7CiAKICAgICBib29sIHVwZGF0ZVdpZGdl dHMoKTsKKyAgICB2b2lkIHVwZGF0ZVdpZGdldChSZW5kZXJFbWJlZGRlZE9iamVjdCopOwogICAg IHZvaWQgc2Nyb2xsVG9BbmNob3IoKTsKICAgICB2b2lkIHNjcm9sbFBvc2l0aW9uQ2hhbmdlZCgp OwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5j cHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAKaW5kZXggNDNj OGQyMmE0N2E2MGUxNjUxNTczMzllNjA4ZmRmODJkYzc3ZGE2OC4uZDA4MTc0ZDMxN2RmMGUzNGVk Yjg4Mjc3YTE2YTk3N2NjYjg2Zjc3YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRW1iZWRkZWRPYmplY3QuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVk ZGVkT2JqZWN0LmNwcApAQCAtMTAyLDMwICsxMDIsNiBAQCBib29sIFJlbmRlckVtYmVkZGVkT2Jq ZWN0OjphbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkgY29uc3QKIH0KICNlbmRpZgogCi0v LyBGSVhNRTogVGhpcyBzaG91bGQgYmUgbW92ZWQgaW50byBGcmFtZVZpZXcgKHRoZSBvbmx5IGNh bGxlcikKLXZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnVwZGF0ZVdpZGdldChib29sIG9ubHlD cmVhdGVOb25OZXRzY2FwZVBsdWdpbnMpCi17Ci0gICAgaWYgKCFtX3JlcGxhY2VtZW50VGV4dC5p c051bGwoKSB8fCAhbm9kZSgpKSAvLyBDaGVjayB0aGUgbm9kZSBpbiBjYXNlIGRlc3Ryb3koKSBo YXMgYmVlbiBjYWxsZWQuCi0gICAgICAgIHJldHVybjsKLQotICAgIC8vIFRoZSBjYWxscyB0byBT dWJmcmFtZUxvYWRlcjo6cmVxdWVzdE9iamVjdCB3aXRoaW4gdGhpcyBmdW5jdGlvbiBjYW4gcmVz dWx0IGluIGEgcGx1Zy1pbiBiZWluZyBpbml0aWFsaXplZC4KLSAgICAvLyBUaGlzIGNhbiBydW4g Y2F1c2UgYXJiaXRyYXJ5IEphdmFTY3JpcHQgdG8gcnVuIGFuZCBtYXkgcmVzdWx0IGluIHRoaXMg UmVuZGVyT2JqZWN0IGJlaW5nIGRldGFjaGVkIGZyb20KLSAgICAvLyB0aGUgcmVuZGVyIHRyZWUg YW5kIGRlc3Ryb3llZCwgY2F1c2luZyBhIGNyYXNoIGxpa2UgPHJkYXI6Ly9wcm9ibGVtLzY5NTQ1 NDY+LiAgQnkgZXh0ZW5kaW5nIG91ciBsaWZldGltZQotICAgIC8vIGFydGlmaWNhbGx5IHRvIGVu c3VyZSB0aGF0IHdlIHJlbWFpbiBhbGl2ZSBmb3IgdGhlIGR1cmF0aW9uIG9mIHBsdWctaW4gaW5p dGlhbGl6YXRpb24uCi0gICAgUmVuZGVyV2lkZ2V0UHJvdGVjdG9yIHByb3RlY3Rvcih0aGlzKTsK LQotICAgIGlmIChub2RlKCktPmhhc1RhZ05hbWUob2JqZWN0VGFnKSkKLSAgICAgICAgc3RhdGlj X2Nhc3Q8SFRNTE9iamVjdEVsZW1lbnQqPihub2RlKCkpLT51cGRhdGVXaWRnZXQob25seUNyZWF0 ZU5vbk5ldHNjYXBlUGx1Z2lucyk7Ci0gICAgZWxzZSBpZiAobm9kZSgpLT5oYXNUYWdOYW1lKGVt YmVkVGFnKSkKLSAgICAgICAgc3RhdGljX2Nhc3Q8SFRNTEVtYmVkRWxlbWVudCo+KG5vZGUoKSkt PnVwZGF0ZVdpZGdldChvbmx5Q3JlYXRlTm9uTmV0c2NhcGVQbHVnaW5zKTsKLSNpZiBFTkFCTEUo UExVR0lOX1BST1hZX0ZPUl9WSURFTykgICAgICAgIAotICAgIGVsc2UgaWYgKG5vZGUoKS0+aGFz VGFnTmFtZSh2aWRlb1RhZykgfHwgbm9kZSgpLT5oYXNUYWdOYW1lKGF1ZGlvVGFnKSkKLSAgICAg ICAgc3RhdGljX2Nhc3Q8SFRNTE1lZGlhRWxlbWVudCo+KG5vZGUoKSktPnVwZGF0ZVdpZGdldChv bmx5Q3JlYXRlTm9uTmV0c2NhcGVQbHVnaW5zKTsKLSNlbmRpZgotICAgIGVsc2UKLSAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7Ci19Ci0KIHZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnNl dFNob3dzTWlzc2luZ1BsdWdpbkluZGljYXRvcigpCiB7CiAgICAgQVNTRVJUKG1fcmVwbGFjZW1l bnRUZXh0LmlzRW1wdHkoKSk7CkBAIC0xMzksNiArMTE1LDExIEBAIHZvaWQgUmVuZGVyRW1iZWRk ZWRPYmplY3Q6OnNldFNob3dzQ3Jhc2hlZFBsdWdpbkluZGljYXRvcigpCiAgICAgbV9yZXBsYWNl bWVudFRleHQgPSBjcmFzaGVkUGx1Z2luVGV4dCgpOwogfQogCitib29sIFJlbmRlckVtYmVkZGVk T2JqZWN0OjpwbHVnaW5DcmFzaGVkT3JXYXNNaXNzaW5nKCkgY29uc3QKK3sKKyAgICByZXR1cm4g IW1fcmVwbGFjZW1lbnRUZXh0LmlzTnVsbCgpOworfQorICAgIAogdm9pZCBSZW5kZXJFbWJlZGRl ZE9iamVjdDo6c2V0TWlzc2luZ1BsdWdpbkluZGljYXRvcklzUHJlc3NlZChib29sIHByZXNzZWQp CiB7CiAgICAgaWYgKG1fbWlzc2luZ1BsdWdpbkluZGljYXRvcklzUHJlc3NlZCA9PSBwcmVzc2Vk KQpAQCAtMTUwLDcgKzEzMSw3IEBAIHZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnNldE1pc3Np bmdQbHVnaW5JbmRpY2F0b3JJc1ByZXNzZWQoYm9vbCBwcmVzc2VkKQogCiB2b2lkIFJlbmRlckVt YmVkZGVkT2JqZWN0OjpwYWludChQYWludEluZm8mIHBhaW50SW5mbywgaW50IHR4LCBpbnQgdHkp CiB7Ci0gICAgaWYgKCFtX3JlcGxhY2VtZW50VGV4dC5pc051bGwoKSkgeworICAgIGlmIChwbHVn aW5DcmFzaGVkT3JXYXNNaXNzaW5nKCkpIHsKICAgICAgICAgUmVuZGVyUmVwbGFjZWQ6OnBhaW50 KHBhaW50SW5mbywgdHgsIHR5KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTE2MCw3ICsx NDEsNyBAQCB2b2lkIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpwYWludChQYWludEluZm8mIHBhaW50 SW5mbywgaW50IHR4LCBpbnQgdHkpCiAKIHZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnBhaW50 UmVwbGFjZWQoUGFpbnRJbmZvJiBwYWludEluZm8sIGludCB0eCwgaW50IHR5KQogewotICAgIGlm ICghbV9yZXBsYWNlbWVudFRleHQpCisgICAgaWYgKHBsdWdpbkNyYXNoZWRPcldhc01pc3Npbmco KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKHBhaW50SW5mby5waGFzZSA9PSBQYWludFBo YXNlU2VsZWN0aW9uKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRk ZWRPYmplY3QuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmgKaW5k ZXggNjM3NmY5MzMzY2FhNGU4ZDE3ODZjYTA3YzgyNjQ2M2E0ODdlMzRlMC4uOGQwOWVkZWE4ZjVl ZWRiMjgzMWMwZTgxZGJmMDk4Mjc1Y2M4OGI4YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJF bWJlZGRlZE9iamVjdC5oCkBAIC0zNiw3ICszNiw4IEBAIHB1YmxpYzoKICAgICBSZW5kZXJFbWJl ZGRlZE9iamVjdChFbGVtZW50Kik7CiAgICAgdmlydHVhbCB+UmVuZGVyRW1iZWRkZWRPYmplY3Qo KTsKIAotICAgIHZvaWQgdXBkYXRlV2lkZ2V0KGJvb2wgb25seUNyZWF0ZU5vbk5ldHNjYXBlUGx1 Z2lucyk7CisgICAgYm9vbCBwbHVnaW5DcmFzaGVkT3JXYXNNaXNzaW5nKCkgY29uc3Q7CisgICAg CiAgICAgdm9pZCBzZXRTaG93c01pc3NpbmdQbHVnaW5JbmRpY2F0b3IoKTsKICAgICB2b2lkIHNl dFNob3dzQ3Jhc2hlZFBsdWdpbkluZGljYXRvcigpOwogICAgIGJvb2wgc2hvd3NNaXNzaW5nUGx1 Z2luSW5kaWNhdG9yKCkgY29uc3QgeyByZXR1cm4gbV9zaG93c01pc3NpbmdQbHVnaW5JbmRpY2F0 b3I7IH0K