21708 2008-10-17 09:28:48 -0700 REGRESSION(r37622): starting a debugging session in another Web Inspector does show any scripts 2008-10-17 09:51:47 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Major --- 1 timothy timothy aroben ggaren kmccullough timothy oldest_to_newest 95740 0 timothy 2008-10-17 09:28:48 -0700 Steps: 1) Start debugging a page in one window. 2) Start debugging a page in another window. Results: The second window Web Inspector is empty and shows no scripts. 95744 1 24458 timothy 2008-10-17 09:33:02 -0700 Created attachment 24458 Proposed patch 95747 2 24458 darin 2008-10-17 09:37:18 -0700 Comment on attachment 24458 Proposed patch + void didAddListener(Page* page = 0); + void didRemoveListener(Page* page = 0); Don't need the name "page" here for the argument. Seems unclear what the "0" value means. I guess it means "global listener", but that should be mentioned explicitly. r=me 95749 3 timothy 2008-10-17 09:51:47 -0700 Landed in r37656. Removed the default arguments. 24458 2008-10-17 09:33:02 -0700 2008-10-17 09:37:18 -0700 Proposed patch 0001--Fixes-a-regression-where-starting-a-debuggin.patch text/plain 10194 timothy RnJvbSBjM2IwYzZjOWFmYmZkYzQ4ZTJjZGE0M2I5NGZlNjEyMDFjNzlkMjg1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBGcmksIDE3IE9jdCAyMDA4IDA5OjI5OjI1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gICAg ICAgICBGaXhlcyBhIHJlZ3Jlc3Npb24gd2hlcmUgc3RhcnRpbmcgYSBkZWJ1Z2dpbmcgc2Vzc2lv biBpbgogICAgICAgICBhbm90aGVyIFdlYiBJbnNwZWN0b3Igd2luZG93IHdvdWxkIG5vdCBzaG93 IGFueSBzY3JpcHRzLgogICAgICAgICBBbHNvIG9ubHkgYXR0YWNoIHRoZSBkZWJ1Z2dlciB0byBv bmx5IHRoZSByZXF1aXJlZCBQYWdlcy4KCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNzA4CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgoKICAgICAgICAqIGluc3BlY3Rvci9KYXZhU2NyaXB0RGVidWdTZXJ2ZXIuY3BwOgogICAgICAg IChXZWJDb3JlOjpKYXZhU2NyaXB0RGVidWdTZXJ2ZXI6OmFkZExpc3RlbmVyKTogQWRkIGFuIGFz c2VydCBhbmQKICAgICAgICByZW1vdmUgdGhlIGNhbGwgdG8gd2lsbEFkZEZpcnN0TGlzdGVuZXIo KS4gQWRkIGEgY2FsbCB0bwogICAgICAgIGRpZEFkZExpc3RlbmVyKCkuCiAgICAgICAgKFdlYkNv cmU6OkphdmFTY3JpcHREZWJ1Z1NlcnZlcjo6cmVtb3ZlTGlzdGVuZXIpOiBBZGQgYW4gYXNzZXJ0 CiAgICAgICAgYW5kIGNhbGwgdG8gZGlkUmVtb3ZlTGlzdGVuZXIoKS4KICAgICAgICAoV2ViQ29y ZTo6SmF2YVNjcmlwdERlYnVnU2VydmVyOjpwYWdlQ3JlYXRlZCk6IEF0dGFjaCB0aGUgZGVidWdn ZXIKICAgICAgICBpZiB0aGVyZSBpcyBhIGxpc3RlbmVyIGludGVyZXN0ZWQgaW4gdGhlIG5ldyBQ YWdlLgogICAgICAgIChXZWJDb3JlOjpKYXZhU2NyaXB0RGVidWdTZXJ2ZXI6Omhhc0xpc3RlbmVy c0ludGVyZXN0ZWRJblBhZ2UpOgogICAgICAgIFVzZSBoYXNHbG9iYWxMaXN0ZW5lcnMoKSBpbnN0 ZWFkIG9mIGlzRW1wdHkoKS4KICAgICAgICAoV2ViQ29yZTo6SmF2YVNjcmlwdERlYnVnU2VydmVy Ojpzb3VyY2VQYXJzZWQpOiBEaXR0by4KICAgICAgICAoV2ViQ29yZTo6SmF2YVNjcmlwdERlYnVn U2VydmVyOjpkaWRBZGRMaXN0ZW5lcik6IEFkZGVkLiBBdHRhY2ggdGhlCiAgICAgICAgZGVidWdn ZXIgdG8gdGhlIHBhZ2UgaWYgbm9uLW51bGwsIG9yIGFsbCBwYWdlcyBpZiBwYWdlIGlzIG51bGwu CiAgICAgICAgKFdlYkNvcmU6OkphdmFTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlkUmVtb3ZlTGlzdGVu ZXIpOiBBZGRlZC4gRGV0YWNoCiAgICAgICAgdGhlIGRlYnVnZ2VyIG9ubHkgaWYgdGhlcmUgYXJl IG5vIGludGVyZXN0ZWQgbGlzdGVuZXJzLgogICAgICAgIChXZWJDb3JlOjpKYXZhU2NyaXB0RGVi dWdTZXJ2ZXI6OmRpZFJlbW92ZUxhc3RMaXN0ZW5lcik6IFJlbW92ZSB0aGUKICAgICAgICBjYWxs IHRvIFBhZ2U6OnNldERlYnVnZ2VyRm9yQWxsUGFnZXMoKS4KICAgICAgICAqIGluc3BlY3Rvci9K YXZhU2NyaXB0RGVidWdTZXJ2ZXIuaDoKICAgICAgICAoV2ViQ29yZTo6SmF2YVNjcmlwdERlYnVn U2VydmVyOjpoYXNHbG9iYWxMaXN0ZW5lcnMpOiBBZGRlZC4KLS0tCiBXZWJDb3JlL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAzMCArKysrKysrKysrKysrKwogV2ViQ29y ZS9pbnNwZWN0b3IvSmF2YVNjcmlwdERlYnVnU2VydmVyLmNwcCB8ICAgNTkgKysrKysrKysrKysr KysrKysrLS0tLS0tLS0KIFdlYkNvcmUvaW5zcGVjdG9yL0phdmFTY3JpcHREZWJ1Z1NlcnZlci5o ICAgfCAgICA0ICstCiAzIGZpbGVzIGNoYW5nZWQsIDc0IGluc2VydGlvbnMoKyksIDE5IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggYWNiNTQyOC4uOTA2NmRjYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAwOC0xMC0xNyAgVGlt b3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4ZXMgYSByZWdy ZXNzaW9uIHdoZXJlIHN0YXJ0aW5nIGEgZGVidWdnaW5nIHNlc3Npb24gaW4KKyAgICAgICAgYW5v dGhlciBXZWIgSW5zcGVjdG9yIHdpbmRvdyB3b3VsZCBub3Qgc2hvdyBhbnkgc2NyaXB0cy4KKyAg ICAgICAgQWxzbyBvbmx5IGF0dGFjaCB0aGUgZGVidWdnZXIgdG8gb25seSB0aGUgcmVxdWlyZWQg UGFnZXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNzA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBpbnNwZWN0b3IvSmF2YVNjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkphdmFTY3JpcHREZWJ1Z1NlcnZlcjo6YWRkTGlzdGVuZXIpOiBBZGQgYW4gYXNzZXJ0IGFuZAor ICAgICAgICByZW1vdmUgdGhlIGNhbGwgdG8gd2lsbEFkZEZpcnN0TGlzdGVuZXIoKS4gQWRkIGEg Y2FsbCB0bworICAgICAgICBkaWRBZGRMaXN0ZW5lcigpLgorICAgICAgICAoV2ViQ29yZTo6SmF2 YVNjcmlwdERlYnVnU2VydmVyOjpyZW1vdmVMaXN0ZW5lcik6IEFkZCBhbiBhc3NlcnQKKyAgICAg ICAgYW5kIGNhbGwgdG8gZGlkUmVtb3ZlTGlzdGVuZXIoKS4KKyAgICAgICAgKFdlYkNvcmU6Okph dmFTY3JpcHREZWJ1Z1NlcnZlcjo6cGFnZUNyZWF0ZWQpOiBBdHRhY2ggdGhlIGRlYnVnZ2VyCisg ICAgICAgIGlmIHRoZXJlIGlzIGEgbGlzdGVuZXIgaW50ZXJlc3RlZCBpbiB0aGUgbmV3IFBhZ2Uu CisgICAgICAgIChXZWJDb3JlOjpKYXZhU2NyaXB0RGVidWdTZXJ2ZXI6Omhhc0xpc3RlbmVyc0lu dGVyZXN0ZWRJblBhZ2UpOgorICAgICAgICBVc2UgaGFzR2xvYmFsTGlzdGVuZXJzKCkgaW5zdGVh ZCBvZiBpc0VtcHR5KCkuCisgICAgICAgIChXZWJDb3JlOjpKYXZhU2NyaXB0RGVidWdTZXJ2ZXI6 OnNvdXJjZVBhcnNlZCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SmF2YVNjcmlwdERlYnVn U2VydmVyOjpkaWRBZGRMaXN0ZW5lcik6IEFkZGVkLiBBdHRhY2ggdGhlCisgICAgICAgIGRlYnVn Z2VyIHRvIHRoZSBwYWdlIGlmIG5vbi1udWxsLCBvciBhbGwgcGFnZXMgaWYgcGFnZSBpcyBudWxs LgorICAgICAgICAoV2ViQ29yZTo6SmF2YVNjcmlwdERlYnVnU2VydmVyOjpkaWRSZW1vdmVMaXN0 ZW5lcik6IEFkZGVkLiBEZXRhY2gKKyAgICAgICAgdGhlIGRlYnVnZ2VyIG9ubHkgaWYgdGhlcmUg YXJlIG5vIGludGVyZXN0ZWQgbGlzdGVuZXJzLgorICAgICAgICAoV2ViQ29yZTo6SmF2YVNjcmlw dERlYnVnU2VydmVyOjpkaWRSZW1vdmVMYXN0TGlzdGVuZXIpOiBSZW1vdmUgdGhlCisgICAgICAg IGNhbGwgdG8gUGFnZTo6c2V0RGVidWdnZXJGb3JBbGxQYWdlcygpLgorICAgICAgICAqIGluc3Bl Y3Rvci9KYXZhU2NyaXB0RGVidWdTZXJ2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkphdmFTY3Jp cHREZWJ1Z1NlcnZlcjo6aGFzR2xvYmFsTGlzdGVuZXJzKTogQWRkZWQuCisKIDIwMDgtMTAtMTcg IEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9KYXZhU2NyaXB0 RGVidWdTZXJ2ZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSmF2YVNjcmlwdERlYnVnU2VydmVy LmNwcAppbmRleCAzYzA4MWQ0Li4wY2YyMzA1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rv ci9KYXZhU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0phdmFT Y3JpcHREZWJ1Z1NlcnZlci5jcHAKQEAgLTgzLDM2ICs4Myw0MiBAQCBKYXZhU2NyaXB0RGVidWdT ZXJ2ZXI6On5KYXZhU2NyaXB0RGVidWdTZXJ2ZXIoKQogCiB2b2lkIEphdmFTY3JpcHREZWJ1Z1Nl cnZlcjo6YWRkTGlzdGVuZXIoSmF2YVNjcmlwdERlYnVnTGlzdGVuZXIqIGxpc3RlbmVyKQogewot ICAgIGlmICghaGFzTGlzdGVuZXJzKCkpCi0gICAgICAgIHdpbGxBZGRGaXJzdExpc3RlbmVyKCk7 CisgICAgQVNTRVJUX0FSRyhsaXN0ZW5lciwgbGlzdGVuZXIpOwogCiAgICAgbV9saXN0ZW5lcnMu YWRkKGxpc3RlbmVyKTsKKworICAgIGRpZEFkZExpc3RlbmVyKCk7CiB9CiAKIHZvaWQgSmF2YVNj cmlwdERlYnVnU2VydmVyOjpyZW1vdmVMaXN0ZW5lcihKYXZhU2NyaXB0RGVidWdMaXN0ZW5lciog bGlzdGVuZXIpCiB7CisgICAgQVNTRVJUX0FSRyhsaXN0ZW5lciwgbGlzdGVuZXIpOworCiAgICAg bV9saXN0ZW5lcnMucmVtb3ZlKGxpc3RlbmVyKTsKKworICAgIGRpZFJlbW92ZUxpc3RlbmVyKCk7 CiAgICAgaWYgKCFoYXNMaXN0ZW5lcnMoKSkKICAgICAgICAgZGlkUmVtb3ZlTGFzdExpc3RlbmVy KCk7CiB9CiAKIHZvaWQgSmF2YVNjcmlwdERlYnVnU2VydmVyOjphZGRMaXN0ZW5lcihKYXZhU2Ny aXB0RGVidWdMaXN0ZW5lciogbGlzdGVuZXIsIFBhZ2UqIHBhZ2UpCiB7CisgICAgQVNTRVJUX0FS RyhsaXN0ZW5lciwgbGlzdGVuZXIpOwogICAgIEFTU0VSVF9BUkcocGFnZSwgcGFnZSk7CiAKLSAg ICBpZiAoIWhhc0xpc3RlbmVycygpKQotICAgICAgICB3aWxsQWRkRmlyc3RMaXN0ZW5lcigpOwot CiAgICAgcGFpcjxQYWdlTGlzdGVuZXJzTWFwOjppdGVyYXRvciwgYm9vbD4gcmVzdWx0ID0gbV9w YWdlTGlzdGVuZXJzTWFwLmFkZChwYWdlLCAwKTsKICAgICBpZiAocmVzdWx0LnNlY29uZCkKICAg ICAgICAgcmVzdWx0LmZpcnN0LT5zZWNvbmQgPSBuZXcgTGlzdGVuZXJTZXQ7Ci0gICAgTGlzdGVu ZXJTZXQqIGxpc3RlbmVycyA9IHJlc3VsdC5maXJzdC0+c2Vjb25kOwogCisgICAgTGlzdGVuZXJT ZXQqIGxpc3RlbmVycyA9IHJlc3VsdC5maXJzdC0+c2Vjb25kOwogICAgIGxpc3RlbmVycy0+YWRk KGxpc3RlbmVyKTsKKworICAgIGRpZEFkZExpc3RlbmVyKHBhZ2UpOwogfQogCiB2b2lkIEphdmFT Y3JpcHREZWJ1Z1NlcnZlcjo6cmVtb3ZlTGlzdGVuZXIoSmF2YVNjcmlwdERlYnVnTGlzdGVuZXIq IGxpc3RlbmVyLCBQYWdlKiBwYWdlKQogeworICAgIEFTU0VSVF9BUkcobGlzdGVuZXIsIGxpc3Rl bmVyKTsKICAgICBBU1NFUlRfQVJHKHBhZ2UsIHBhZ2UpOwogCiAgICAgUGFnZUxpc3RlbmVyc01h cDo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VMaXN0ZW5lcnNNYXAuZmluZChwYWdlKTsKQEAgLTEyNiwx NSArMTMyLDE3IEBAIHZvaWQgSmF2YVNjcmlwdERlYnVnU2VydmVyOjpyZW1vdmVMaXN0ZW5lcihK YXZhU2NyaXB0RGVidWdMaXN0ZW5lciogbGlzdGVuZXIsIFBhCiAgICAgICAgIGRlbGV0ZSBsaXN0 ZW5lcnM7CiAgICAgfQogCisgICAgZGlkUmVtb3ZlTGlzdGVuZXIocGFnZSk7CiAgICAgaWYgKCFo YXNMaXN0ZW5lcnMoKSkKICAgICAgICAgZGlkUmVtb3ZlTGFzdExpc3RlbmVyKCk7CiB9CiAKIHZv aWQgSmF2YVNjcmlwdERlYnVnU2VydmVyOjpwYWdlQ3JlYXRlZChQYWdlKiBwYWdlKQogewotICAg IGlmICghaGFzTGlzdGVuZXJzKCkpCi0gICAgICAgIHJldHVybjsKKyAgICBBU1NFUlRfQVJHKHBh Z2UsIHBhZ2UpOwogCisgICAgaWYgKCFoYXNMaXN0ZW5lcnNJbnRlcmVzdGVkSW5QYWdlKHBhZ2Up KQorICAgICAgICByZXR1cm47CiAgICAgcGFnZS0+c2V0RGVidWdnZXIodGhpcyk7CiB9CiAKQEAg LTE0Miw3ICsxNTAsNyBAQCBib29sIEphdmFTY3JpcHREZWJ1Z1NlcnZlcjo6aGFzTGlzdGVuZXJz SW50ZXJlc3RlZEluUGFnZShQYWdlKiBwYWdlKQogewogICAgIEFTU0VSVF9BUkcocGFnZSwgcGFn ZSk7CiAKLSAgICBpZiAoIW1fbGlzdGVuZXJzLmlzRW1wdHkoKSkKKyAgICBpZiAoaGFzR2xvYmFs TGlzdGVuZXJzKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgcmV0dXJuIG1fcGFnZUxp c3RlbmVyc01hcC5jb250YWlucyhwYWdlKTsKQEAgLTI4MSw3ICsyODksNyBAQCB2b2lkIEphdmFT Y3JpcHREZWJ1Z1NlcnZlcjo6c291cmNlUGFyc2VkKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgU291 cmNlQ29kZSYgc291cgogCiAgICAgYm9vbCBpc0Vycm9yID0gZXJyb3JMaW5lICE9IC0xOwogCi0g ICAgaWYgKCFtX2xpc3RlbmVycy5pc0VtcHR5KCkpIHsKKyAgICBpZiAoaGFzR2xvYmFsTGlzdGVu ZXJzKCkpIHsKICAgICAgICAgaWYgKGlzRXJyb3IpCiAgICAgICAgICAgICBkaXNwYXRjaEZhaWxl ZFRvUGFyc2VTb3VyY2UobV9saXN0ZW5lcnMsIGV4ZWMsIHNvdXJjZSwgZXJyb3JMaW5lLCBlcnJv ck1lc3NhZ2UpOwogICAgICAgICBlbHNlCkBAIC0zMTcsNiArMzI1LDcgQEAgdm9pZCBKYXZhU2Ny aXB0RGVidWdTZXJ2ZXI6OmRpc3BhdGNoRnVuY3Rpb25Ub0xpc3RlbmVycyhKYXZhU2NyaXB0RXhl Y3V0aW9uQ2FsbGIKICAgICBBU1NFUlQoaGFzTGlzdGVuZXJzKCkpOwogCiAgICAgV2ViQ29yZTo6 ZGlzcGF0Y2hGdW5jdGlvblRvTGlzdGVuZXJzKG1fbGlzdGVuZXJzLCBjYWxsYmFjayk7CisKICAg ICBpZiAoTGlzdGVuZXJTZXQqIHBhZ2VMaXN0ZW5lcnMgPSBtX3BhZ2VMaXN0ZW5lcnNNYXAuZ2V0 KHBhZ2UpKSB7CiAgICAgICAgIEFTU0VSVCghcGFnZUxpc3RlbmVycy0+aXNFbXB0eSgpKTsKICAg ICAgICAgV2ViQ29yZTo6ZGlzcGF0Y2hGdW5jdGlvblRvTGlzdGVuZXJzKCpwYWdlTGlzdGVuZXJz LCBjYWxsYmFjayk7CkBAIC01MDksNyArNTE4LDcgQEAgdm9pZCBKYXZhU2NyaXB0RGVidWdTZXJ2 ZXI6OmRpZFJlYWNoQnJlYWtwb2ludChjb25zdCBEZWJ1Z2dlckNhbGxGcmFtZSYgZGVidWdnZXIK IHsKICAgICBpZiAobV9wYXVzZWQpCiAgICAgICAgIHJldHVybjsKLSAgICAKKwogICAgIEFTU0VS VChtX2N1cnJlbnRDYWxsRnJhbWUpOwogICAgIGlmICghbV9jdXJyZW50Q2FsbEZyYW1lKQogICAg ICAgICByZXR1cm47CkBAIC01MjMsNyArNTMyLDcgQEAgdm9pZCBKYXZhU2NyaXB0RGVidWdTZXJ2 ZXI6OnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKFRpbWVyPEphdmFTY3JpcHREZWJ1Z1NlcnZlcj4K IHsKICAgICBKU0xvY2sgbG9jayhmYWxzZSk7CiAgICAgSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRh ID0gSlNET01XaW5kb3c6OmNvbW1vbkpTR2xvYmFsRGF0YSgpOwotICAgIAorCiAgICAgLy8gSWYg SmF2YVNjcmlwdCBpcyBydW5uaW5nLCBpdCdzIG5vdCBzYWZlIHRvIHJlY29tcGlsZSwgc2luY2Ug d2UnbGwgZW5kCiAgICAgLy8gdXAgdGhyb3dpbmcgYXdheSBjb2RlIHRoYXQgaXMgbGl2ZSBvbiB0 aGUgc3RhY2suCiAgICAgQVNTRVJUKCFnbG9iYWxEYXRhLT5keW5hbWljR2xvYmFsT2JqZWN0KTsK QEAgLTU0MiwxMSArNTUxLDExIEBAIHZvaWQgSmF2YVNjcmlwdERlYnVnU2VydmVyOjpyZWNvbXBp bGVBbGxKU0Z1bmN0aW9ucyhUaW1lcjxKYXZhU2NyaXB0RGVidWdTZXJ2ZXI+CiAKICAgICBGdW5j dGlvbkJvZHlNYXAgZnVuY3Rpb25Cb2RpZXM7CiAgICAgU291cmNlUHJvdmlkZXJTZXQgc291cmNl UHJvdmlkZXJzOwotICAgIAorCiAgICAgc2l6ZV90IHNpemUgPSBmdW5jdGlvbnMuc2l6ZSgpOwog ICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2l6ZTsgKytpKSB7CiAgICAgICAgIEpTRnVuY3Rp b24qIGZ1bmN0aW9uID0gZnVuY3Rpb25zW2ldOwotICAgICAgICAKKwogICAgICAgICBGdW5jdGlv bkJvZHlOb2RlKiBvbGRCb2R5ID0gZnVuY3Rpb24tPm1fYm9keS5nZXQoKTsKICAgICAgICAgcGFp cjxGdW5jdGlvbkJvZHlNYXA6Oml0ZXJhdG9yLCBib29sPiByZXN1bHQgPSBmdW5jdGlvbkJvZGll cy5hZGQob2xkQm9keSwgMCk7CiAgICAgICAgIGlmICghcmVzdWx0LnNlY29uZCkgewpAQCAtNTYw LDcgKzU2OSw3IEBAIHZvaWQgSmF2YVNjcmlwdERlYnVnU2VydmVyOjpyZWNvbXBpbGVBbGxKU0Z1 bmN0aW9ucyhUaW1lcjxKYXZhU2NyaXB0RGVidWdTZXJ2ZXI+CiAgICAgICAgIFJlZlB0cjxGdW5j dGlvbkJvZHlOb2RlPiBuZXdCb2R5ID0gZ2xvYmFsRGF0YS0+cGFyc2VyLT5wYXJzZTxGdW5jdGlv bkJvZHlOb2RlPihleGVjLCAwLCBzb3VyY2VDb2RlKTsKICAgICAgICAgQVNTRVJUKG5ld0JvZHkp OwogICAgICAgICBuZXdCb2R5LT5maW5pc2hQYXJzaW5nKG9sZEJvZHktPmNvcHlQYXJhbWV0ZXJz KCksIG9sZEJvZHktPnBhcmFtZXRlckNvdW50KCkpOwotICAgICAgICAKKwogICAgICAgICByZXN1 bHQuZmlyc3QtPnNlY29uZCA9IG5ld0JvZHk7CiAgICAgICAgIGZ1bmN0aW9uLT5tX2JvZHkgPSBu ZXdCb2R5LnJlbGVhc2UoKTsKIApAQCAtNTcyLDE1ICs1ODEsMjkgQEAgdm9pZCBKYXZhU2NyaXB0 RGVidWdTZXJ2ZXI6OnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKFRpbWVyPEphdmFTY3JpcHREZWJ1 Z1NlcnZlcj4KICAgICB9CiB9CiAKLXZvaWQgSmF2YVNjcmlwdERlYnVnU2VydmVyOjp3aWxsQWRk Rmlyc3RMaXN0ZW5lcigpCit2b2lkIEphdmFTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlkQWRkTGlzdGVu ZXIoUGFnZSogcGFnZSkKIHsKLSAgICBQYWdlOjpzZXREZWJ1Z2dlckZvckFsbFBhZ2VzKHRoaXMp OwogICAgIG1fcmVjb21waWxlVGltZXIuc3RhcnRPbmVTaG90KDApOworCisgICAgaWYgKHBhZ2Up CisgICAgICAgIHBhZ2UtPnNldERlYnVnZ2VyKHRoaXMpOworICAgIGVsc2UKKyAgICAgICAgUGFn ZTo6c2V0RGVidWdnZXJGb3JBbGxQYWdlcyh0aGlzKTsKK30KKwordm9pZCBKYXZhU2NyaXB0RGVi dWdTZXJ2ZXI6OmRpZFJlbW92ZUxpc3RlbmVyKFBhZ2UqIHBhZ2UpCit7CisgICAgaWYgKGhhc0ds b2JhbExpc3RlbmVycygpIHx8IChwYWdlICYmIGhhc0xpc3RlbmVyc0ludGVyZXN0ZWRJblBhZ2Uo cGFnZSkpKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAocGFnZSkKKyAgICAgICAgcGFnZS0+ c2V0RGVidWdnZXIoMCk7CisgICAgZWxzZQorICAgICAgICBQYWdlOjpzZXREZWJ1Z2dlckZvckFs bFBhZ2VzKDApOwogfQogCiB2b2lkIEphdmFTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlkUmVtb3ZlTGFz dExpc3RlbmVyKCkKIHsKLSAgICBQYWdlOjpzZXREZWJ1Z2dlckZvckFsbFBhZ2VzKDApOwogICAg IG1fZG9uZVByb2Nlc3NpbmdEZWJ1Z2dlckV2ZW50cyA9IHRydWU7CiAgICAgbV9yZWNvbXBpbGVU aW1lci5zdGFydE9uZVNob3QoMCk7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9K YXZhU2NyaXB0RGVidWdTZXJ2ZXIuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0phdmFTY3JpcHREZWJ1 Z1NlcnZlci5oCmluZGV4IGQ2Y2NmOTAuLjY5MzQ0OTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL0phdmFTY3JpcHREZWJ1Z1NlcnZlci5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0ph dmFTY3JpcHREZWJ1Z1NlcnZlci5oCkBAIC04Nyw2ICs4Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgfkphdmFTY3JpcHREZWJ1Z1NlcnZlcigpOwogCiAgICAgICAgIGJvb2wgaGFz TGlzdGVuZXJzKCkgY29uc3QgeyByZXR1cm4gIW1fbGlzdGVuZXJzLmlzRW1wdHkoKSB8fCAhbV9w YWdlTGlzdGVuZXJzTWFwLmlzRW1wdHkoKTsgfQorICAgICAgICBib29sIGhhc0dsb2JhbExpc3Rl bmVycygpIGNvbnN0IHsgcmV0dXJuICFtX2xpc3RlbmVycy5pc0VtcHR5KCk7IH0KICAgICAgICAg Ym9vbCBoYXNMaXN0ZW5lcnNJbnRlcmVzdGVkSW5QYWdlKFBhZ2UqKTsKIAogICAgICAgICB2b2lk IHNldEphdmFTY3JpcHRQYXVzZWQoY29uc3QgUGFnZUdyb3VwJiwgYm9vbCBwYXVzZWQpOwpAQCAt MTA2LDcgKzEwNyw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVhbCB2b2lk IGRpZEV4ZWN1dGVQcm9ncmFtKGNvbnN0IEpTQzo6RGVidWdnZXJDYWxsRnJhbWUmLCBpbnRwdHJf dCBzb3VyY2VJRCwgaW50IGxpbmVubyk7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRSZWFjaEJy ZWFrcG9pbnQoY29uc3QgSlNDOjpEZWJ1Z2dlckNhbGxGcmFtZSYsIGludHB0cl90IHNvdXJjZUlE LCBpbnQgbGluZW5vKTsKICAgICAgICAgCi0gICAgICAgIHZvaWQgd2lsbEFkZEZpcnN0TGlzdGVu ZXIoKTsKKyAgICAgICAgdm9pZCBkaWRBZGRMaXN0ZW5lcihQYWdlKiBwYWdlID0gMCk7CisgICAg ICAgIHZvaWQgZGlkUmVtb3ZlTGlzdGVuZXIoUGFnZSogcGFnZSA9IDApOwogICAgICAgICB2b2lk IGRpZFJlbW92ZUxhc3RMaXN0ZW5lcigpOwogCiAgICAgICAgIHR5cGVkZWYgSGFzaE1hcDxQYWdl KiwgTGlzdGVuZXJTZXQqPiBQYWdlTGlzdGVuZXJzTWFwOwotLSAKMS42LjAuMgoK