80788 2012-03-11 08:59:26 -0700 Web Inspector: [chromium] ScriptGCEvent should not be static 2012-05-04 08:13:33 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq loislo abarth apavlov bweinstein haraken japhet keishi loislo pfeldman pmuellr rik webkit.review.bot yurys oldest_to_newest 575734 0 caseq 2012-03-11 08:59:26 -0700 Currently, all fields/methods of ScriptGCEvent are static and it will only register its callbacks on for first thread it's called on -- subsequent calls will bail out from addEventListener(). If we need to instrument multiple isolates concurrently, one instance of ScriptGCEvent should be maintained per isolate. 616123 1 140202 loislo 2012-05-04 06:07:18 -0700 Created attachment 140202 Patch 616159 2 140202 yurys 2012-05-04 06:49:27 -0700 Comment on attachment 140202 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140202&action=review > Source/WebCore/bindings/v8/ScriptGCEvent.cpp:113 > for (GCEventListeners::iterator i = listeners.begin(); i != listeners.end(); ++i) Please get rid of this static list of listeners as all of the listeners will be called for all GC events no matter in which isolate they happen. 616182 3 140219 loislo 2012-05-04 07:20:19 -0700 Created attachment 140219 Patch 616236 4 loislo 2012-05-04 08:13:33 -0700 Committed r116103: <http://trac.webkit.org/changeset/116103> 140202 2012-05-04 06:07:18 -0700 2012-05-04 07:20:10 -0700 Patch bug-80788-20120504170716.patch text/plain 5522 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjY2MTg1OGY5ZjYxYTZk M2E0MjAyY2IzYTI5MWFhYTIwM2Y2NGI2Ni4uY2I4YjE5ZmIyN2Y5NTJlZGQwMzgwYWVlNGI4NDVm MGZjOGExMDdiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA1LTA0ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBbY2hyb21pdW1dIFNjcmlwdEdDRXZlbnQgc2hvdWxkIG5vdCBiZSBzdGF0aWMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDc4OAorCisgICAg ICAgIFRoZSBzdGF0aWMgbWVtYmVycyBvZiBTY3JpcHRHQ0V2ZW50IHdlcmUgbW92ZWQgaW50byBw ZXIgaXNvbGF0ZSBkYXRhIHN0cnVjdHVyZS4KKyAgICAgICAgRHJpdmUgYnkgZml4OiBTb21ldGlt ZXMgdGhlIHVzZWQgaGVhcCBzaXplIGFmdGVyIGEgR0MgaXMgc2xpZ2h0bHkgbW9yZSB0aGFuIGl0 IHdhcyBiZWZvcmUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRHQ0V2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNjcmlwdEdDRXZlbnQ6OmdjUHJvbG9ndWVDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpT Y3JpcHRHQ0V2ZW50OjpnY0VwaWxvZ3VlQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4 L1Y4QmluZGluZy5oOgorICAgICAgICAoV2ViQ29yZTo6R0NFdmVudERhdGE6OkdDRXZlbnREYXRh KToKKyAgICAgICAgKFdlYkNvcmU6OkdDRXZlbnREYXRhOjpjbGVhcik6CisgICAgICAgIChHQ0V2 ZW50RGF0YSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlY4QmluZGlu Z1Blcklzb2xhdGVEYXRhOjpnY0V2ZW50RGF0YSk6CisgICAgICAgIChWOEJpbmRpbmdQZXJJc29s YXRlRGF0YSk6CisKIDIwMTItMDUtMDMgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNyZWF0ZVJhd0xvY2F0aW9uQnlVUkwg aXMgdG9vIHNsb3cgaWYgYSBiaWcgbnVtYmVyIG9mIGV2YWxzIGhhcHBlbi4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdEdDRXZlbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0R0NFdmVudC5jcHAKaW5kZXggNTM5ZWFlNmQxMjlkYzRl ODE5ODkzOGEzY2RkMzg1NDRmNDczMzY3ZC4uMzE4ODVhYThlYTRiY2FkZWVjZTljN2QyNmE2OGFk MWJmYjAzZmI1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0 R0NFdmVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0R0NFdmVu dC5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKIAogI2luY2x1ZGUgIlNjcmlwdEdDRXZlbnQuaCIKICNp bmNsdWRlICJTY3JpcHRHQ0V2ZW50TGlzdGVuZXIuaCIKKyNpbmNsdWRlICJWOEJpbmRpbmcuaCIK IAogI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgogCkBAIC00Niw5ICs0Nyw2IEBAIHN0YXRp YyBHQ0V2ZW50TGlzdGVuZXJzJiBldmVudExpc3RlbmVycygpCiAgICAgcmV0dXJuIGxpc3RlbmVy czsKIH0KIAotZG91YmxlIFNjcmlwdEdDRXZlbnQ6OnNfc3RhcnRUaW1lID0gMC4wOwotc2l6ZV90 IFNjcmlwdEdDRXZlbnQ6OnNfdXNlZEhlYXBTaXplID0gMDsKLQogdm9pZCBTY3JpcHRHQ0V2ZW50 OjphZGRFdmVudExpc3RlbmVyKFNjcmlwdEdDRXZlbnRMaXN0ZW5lciogZXZlbnRMaXN0ZW5lcikK IHsKICAgICBBU1NFUlQoZXZlbnRMaXN0ZW5lcik7CkBAIC05MCwxNyArODgsMzEgQEAgc2l6ZV90 IFNjcmlwdEdDRXZlbnQ6OmdldFVzZWRIZWFwU2l6ZSgpCiAKIHZvaWQgU2NyaXB0R0NFdmVudDo6 Z2NQcm9sb2d1ZUNhbGxiYWNrKHY4OjpHQ1R5cGUgdHlwZSwgdjg6OkdDQ2FsbGJhY2tGbGFncyBm bGFncykKIHsKLSAgICBzX3N0YXJ0VGltZSA9IFdURjo6bW9ub3RvbmljYWxseUluY3JlYXNpbmdU aW1lKCk7Ci0gICAgc191c2VkSGVhcFNpemUgPSBnZXRVc2VkSGVhcFNpemUoKTsKKyAgICBWOEJp bmRpbmdQZXJJc29sYXRlRGF0YSogaXNvbGF0ZURhdGEgPSBWOEJpbmRpbmdQZXJJc29sYXRlRGF0 YTo6Y3VycmVudCgpOworICAgIEFTU0VSVChpc29sYXRlRGF0YSk7CisgICAgaWYgKCFpc29sYXRl RGF0YSkKKyAgICAgICAgcmV0dXJuOworICAgIEdDRXZlbnREYXRhJiBnY0V2ZW50RGF0YSA9IGlz b2xhdGVEYXRhLT5nY0V2ZW50RGF0YSgpOworICAgIGdjRXZlbnREYXRhLnN0YXJ0VGltZSA9IFdU Rjo6bW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCk7CisgICAgZ2NFdmVudERhdGEudXNlZEhl YXBTaXplID0gZ2V0VXNlZEhlYXBTaXplKCk7CiB9CiAKIHZvaWQgU2NyaXB0R0NFdmVudDo6Z2NF cGlsb2d1ZUNhbGxiYWNrKHY4OjpHQ1R5cGUgdHlwZSwgdjg6OkdDQ2FsbGJhY2tGbGFncyBmbGFn cykKIHsKKyAgICBWOEJpbmRpbmdQZXJJc29sYXRlRGF0YSogaXNvbGF0ZURhdGEgPSBWOEJpbmRp bmdQZXJJc29sYXRlRGF0YTo6Y3VycmVudCgpOworICAgIEFTU0VSVChpc29sYXRlRGF0YSk7Cisg ICAgaWYgKCFpc29sYXRlRGF0YSkKKyAgICAgICAgcmV0dXJuOworICAgIEdDRXZlbnREYXRhJiBn Y0V2ZW50RGF0YSA9IGlzb2xhdGVEYXRhLT5nY0V2ZW50RGF0YSgpOworICAgIGlmICghZ2NFdmVu dERhdGEudXNlZEhlYXBTaXplKQorICAgICAgICByZXR1cm47CiAgICAgZG91YmxlIGVuZFRpbWUg PSBXVEY6Om1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpOwotICAgIHNpemVfdCBjb2xsZWN0 ZWRCeXRlcyA9IHNfdXNlZEhlYXBTaXplIC0gZ2V0VXNlZEhlYXBTaXplKCk7CisgICAgc2l6ZV90 IHVzZWRIZWFwU2l6ZSA9IGdldFVzZWRIZWFwU2l6ZSgpOworICAgIHNpemVfdCBjb2xsZWN0ZWRC eXRlcyA9IHVzZWRIZWFwU2l6ZSA+IGdjRXZlbnREYXRhLnVzZWRIZWFwU2l6ZSA/IDAgOiBnY0V2 ZW50RGF0YS51c2VkSGVhcFNpemUgLSB1c2VkSGVhcFNpemU7CiAgICAgR0NFdmVudExpc3RlbmVy cyBsaXN0ZW5lcnMoZXZlbnRMaXN0ZW5lcnMoKSk7CiAgICAgZm9yIChHQ0V2ZW50TGlzdGVuZXJz OjppdGVyYXRvciBpID0gbGlzdGVuZXJzLmJlZ2luKCk7IGkgIT0gbGlzdGVuZXJzLmVuZCgpOyAr K2kpCi0gICAgICAgICgqaSktPmRpZEdDKHNfc3RhcnRUaW1lLCBlbmRUaW1lLCBjb2xsZWN0ZWRC eXRlcyk7CisgICAgICAgICgqaSktPmRpZEdDKGdjRXZlbnREYXRhLnN0YXJ0VGltZSwgZW5kVGlt ZSwgY29sbGVjdGVkQnl0ZXMpOworICAgIGdjRXZlbnREYXRhLmNsZWFyKCk7CiB9CiAgICAgCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9TY3JpcHRHQ0V2ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRH Q0V2ZW50LmgKaW5kZXggMDY0NGE4NTBiOWUxN2I4OTg1MWZlYjhkMmZkNDhiZWI2NTc2NTczNS4u ZjJiYTQ5NTI1ZjZlODk4Y2MzZDY1NWYxMzM5YzE1ZGYzZDRhNDM2YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0R0NFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1NjcmlwdEdDRXZlbnQuaApAQCAtNDcsOSArNDcsNiBAQCBwdWJsaWM6 CiAgICAgc3RhdGljIHZvaWQgcmVtb3ZlRXZlbnRMaXN0ZW5lcihTY3JpcHRHQ0V2ZW50TGlzdGVu ZXIqKTsKICAgICBzdGF0aWMgdm9pZCBnZXRIZWFwU2l6ZShzaXplX3QmLCBzaXplX3QmLCBzaXpl X3QmKTsKIHByaXZhdGU6Ci0gICAgc3RhdGljIGRvdWJsZSBzX3N0YXJ0VGltZTsKLSAgICBzdGF0 aWMgc2l6ZV90IHNfdXNlZEhlYXBTaXplOwotIAogICAgIHN0YXRpYyB2b2lkIGdjRXBpbG9ndWVD YWxsYmFjayh2ODo6R0NUeXBlIHR5cGUsIHY4OjpHQ0NhbGxiYWNrRmxhZ3MgZmxhZ3MpOwogICAg IHN0YXRpYyB2b2lkIGdjUHJvbG9ndWVDYWxsYmFjayh2ODo6R0NUeXBlIHR5cGUsIHY4OjpHQ0Nh bGxiYWNrRmxhZ3MgZmxhZ3MpOwogICAgIHN0YXRpYyBzaXplX3QgZ2V0VXNlZEhlYXBTaXplKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJpbmRpbmcuaCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5oCmluZGV4IDExOTYxOTFkODQxOThk N2ExMDQxZGQ3NmM1Mzk5YTM5ZjcxMTIyZWIuLjJjYzQyYzVhYmQwZTI3NGM1YWU2NzM3MmUxOTBl ZmYzODU4YmI5ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Qmlu ZGluZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5oCkBAIC05 NSw2ICs5NSwxOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgdHlwZWRlZiBIYXNoTWFwPHY4 OjpWYWx1ZSosIEdsb2JhbEhhbmRsZUluZm8qPiBHbG9iYWxIYW5kbGVNYXA7CiAjZW5kaWYKIAor ICAgIHN0cnVjdCBHQ0V2ZW50RGF0YSB7CisgICAgICAgIEdDRXZlbnREYXRhKCkgOiBzdGFydFRp bWUoMC4wKSwgdXNlZEhlYXBTaXplKDApIHsgfQorICAgICAgICB2b2lkIGNsZWFyKCkKKyAgICAg ICAgeworICAgICAgICAgICAgc3RhcnRUaW1lID0gMC4wOworICAgICAgICAgICAgdXNlZEhlYXBT aXplID0gMDsKKyAgICAgICAgfQorCisgICAgICAgIGRvdWJsZSBzdGFydFRpbWU7CisgICAgICAg IHNpemVfdCB1c2VkSGVhcFNpemU7CisgICAgfTsKKwogICAgIGNsYXNzIFY4QmluZGluZ1Blcklz b2xhdGVEYXRhIHsKICAgICBwdWJsaWM6CiAgICAgICAgIHN0YXRpYyBWOEJpbmRpbmdQZXJJc29s YXRlRGF0YSogY3JlYXRlKHY4OjpJc29sYXRlKik7CkBAIC0xNjAsNiArMTcyLDggQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICBpbnQgZGVjcmVtZW50SW50ZXJuYWxTY3JpcHRSZWN1cnNp b25MZXZlbCgpIHsgcmV0dXJuIC0tbV9pbnRlcm5hbFNjcmlwdFJlY3Vyc2lvbkxldmVsOyB9CiAj ZW5kaWYKIAorICAgICAgICBHQ0V2ZW50RGF0YSYgZ2NFdmVudERhdGEoKSB7IHJldHVybiBtX2dj RXZlbnREYXRhOyB9CisKICAgICBwcml2YXRlOgogICAgICAgICBleHBsaWNpdCBWOEJpbmRpbmdQ ZXJJc29sYXRlRGF0YSh2ODo6SXNvbGF0ZSopOwogICAgICAgICB+VjhCaW5kaW5nUGVySXNvbGF0 ZURhdGEoKTsKQEAgLTE4Niw2ICsyMDAsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAg IEdsb2JhbEhhbmRsZU1hcCBtX2dsb2JhbEhhbmRsZU1hcDsKICAgICAgICAgaW50IG1faW50ZXJu YWxTY3JpcHRSZWN1cnNpb25MZXZlbDsKICNlbmRpZgorICAgICAgICBHQ0V2ZW50RGF0YSBtX2dj RXZlbnREYXRhOwogICAgIH07CiAKICAgICBjbGFzcyBDb25zdHJ1Y3Rvck1vZGUgewo= 140219 2012-05-04 07:20:19 -0700 2012-05-04 08:00:25 -0700 Patch bug-80788-20120504182017.patch text/plain 6910 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzY1NGM0Njg2YjU2MDM5 NDVhZmIxMWU0N2M5NzFhMmMyZTUwYjgxNS4uOTFmZDY4M2M5ZjE5ZDY0MmY5ZjM3MTg1NWUyNGRl YjZmNzY0NjVhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA1LTA0ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBbY2hyb21pdW1dIFNjcmlwdEdDRXZlbnQgc2hvdWxkIG5vdCBiZSBzdGF0aWMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDc4OAorCisgICAg ICAgIFRoZSBzdGF0aWMgbWVtYmVycyBvZiBTY3JpcHRHQ0V2ZW50IHdlcmUgbW92ZWQgaW50byBw ZXIgaXNvbGF0ZSBkYXRhIHN0cnVjdHVyZS4KKyAgICAgICAgRHJpdmUgYnkgZml4OiBTb21ldGlt ZXMgdGhlIHVzZWQgaGVhcCBzaXplIGFmdGVyIGEgR0MgaXMgc2xpZ2h0bHkgbW9yZSB0aGFuIGl0 IHdhcyBiZWZvcmUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRHQ0V2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNjcmlwdEdDRXZlbnQ6OmdjUHJvbG9ndWVDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpT Y3JpcHRHQ0V2ZW50OjpnY0VwaWxvZ3VlQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4 L1Y4QmluZGluZy5oOgorICAgICAgICAoV2ViQ29yZTo6R0NFdmVudERhdGE6OkdDRXZlbnREYXRh KToKKyAgICAgICAgKFdlYkNvcmU6OkdDRXZlbnREYXRhOjpjbGVhcik6CisgICAgICAgIChHQ0V2 ZW50RGF0YSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlY4QmluZGlu Z1Blcklzb2xhdGVEYXRhOjpnY0V2ZW50RGF0YSk6CisgICAgICAgIChWOEJpbmRpbmdQZXJJc29s YXRlRGF0YSk6CisKIDIwMTItMDUtMDQgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9w ZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW1F0XSBCdWlsZCBmaXggd2hlbiB1c2luZyBsaWJwbmcg dmVyc2lvbiA+IDEuMi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Nj cmlwdEdDRXZlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0R0NFdmVu dC5jcHAKaW5kZXggNTM5ZWFlNmQxMjlkYzRlODE5ODkzOGEzY2RkMzg1NDRmNDczMzY3ZC4uNjIy ZjIyYmNkYWU3NzE2ZTMzYmFiNWE2OGZjNjcxODE1ZTUzODllZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0R0NFdmVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvU2NyaXB0R0NFdmVudC5jcHAKQEAgLTM0LDM5ICszNCwzOCBAQAogCiAj aW5jbHVkZSAiU2NyaXB0R0NFdmVudC5oIgogI2luY2x1ZGUgIlNjcmlwdEdDRXZlbnRMaXN0ZW5l ci5oIgorI2luY2x1ZGUgIlY4QmluZGluZy5oIgogCiAjaW5jbHVkZSA8d3RmL0N1cnJlbnRUaW1l Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotdHlwZWRlZiBWZWN0b3I8U2NyaXB0R0NFdmVu dExpc3RlbmVyKj4gR0NFdmVudExpc3RlbmVyczsKLXN0YXRpYyBHQ0V2ZW50TGlzdGVuZXJzJiBl dmVudExpc3RlbmVycygpCitzdGF0aWMgR0NFdmVudERhdGEmIGlzb2xhdGVHQ0V2ZW50RGF0YSgp CiB7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChHQ0V2ZW50TGlzdGVuZXJzLCBsaXN0ZW5lcnMs ICgpKTsKLSAgICByZXR1cm4gbGlzdGVuZXJzOworICAgIFY4QmluZGluZ1Blcklzb2xhdGVEYXRh KiBpc29sYXRlRGF0YSA9IFY4QmluZGluZ1Blcklzb2xhdGVEYXRhOjpjdXJyZW50KCk7CisgICAg QVNTRVJUKGlzb2xhdGVEYXRhKTsKKyAgICByZXR1cm4gaXNvbGF0ZURhdGEtPmdjRXZlbnREYXRh KCk7CiB9CiAKLWRvdWJsZSBTY3JpcHRHQ0V2ZW50OjpzX3N0YXJ0VGltZSA9IDAuMDsKLXNpemVf dCBTY3JpcHRHQ0V2ZW50OjpzX3VzZWRIZWFwU2l6ZSA9IDA7Ci0KIHZvaWQgU2NyaXB0R0NFdmVu dDo6YWRkRXZlbnRMaXN0ZW5lcihTY3JpcHRHQ0V2ZW50TGlzdGVuZXIqIGV2ZW50TGlzdGVuZXIp CiB7Ci0gICAgQVNTRVJUKGV2ZW50TGlzdGVuZXIpOwotICAgIGlmIChldmVudExpc3RlbmVycygp LmlzRW1wdHkoKSkgeworICAgIEdDRXZlbnREYXRhOjpHQ0V2ZW50TGlzdGVuZXJzJiBsaXN0ZW5l cnMgPSBpc29sYXRlR0NFdmVudERhdGEoKS5saXN0ZW5lcnMoKTsKKyAgICBpZiAobGlzdGVuZXJz LmlzRW1wdHkoKSkgewogICAgICAgICB2ODo6Vjg6OkFkZEdDUHJvbG9ndWVDYWxsYmFjayhTY3Jp cHRHQ0V2ZW50OjpnY1Byb2xvZ3VlQ2FsbGJhY2spOwogICAgICAgICB2ODo6Vjg6OkFkZEdDRXBp bG9ndWVDYWxsYmFjayhTY3JpcHRHQ0V2ZW50OjpnY0VwaWxvZ3VlQ2FsbGJhY2spOwogICAgIH0K LSAgICBldmVudExpc3RlbmVycygpLmFwcGVuZChldmVudExpc3RlbmVyKTsKKyAgICBsaXN0ZW5l cnMuYXBwZW5kKGV2ZW50TGlzdGVuZXIpOwogfQogCiB2b2lkIFNjcmlwdEdDRXZlbnQ6OnJlbW92 ZUV2ZW50TGlzdGVuZXIoU2NyaXB0R0NFdmVudExpc3RlbmVyKiBldmVudExpc3RlbmVyKQogewog ICAgIEFTU0VSVChldmVudExpc3RlbmVyKTsKLSAgICBBU1NFUlQoIWV2ZW50TGlzdGVuZXJzKCku aXNFbXB0eSgpKTsKLSAgICBzaXplX3QgaSA9IGV2ZW50TGlzdGVuZXJzKCkuZmluZChldmVudExp c3RlbmVyKTsKKyAgICBHQ0V2ZW50RGF0YTo6R0NFdmVudExpc3RlbmVycyYgbGlzdGVuZXJzID0g aXNvbGF0ZUdDRXZlbnREYXRhKCkubGlzdGVuZXJzKCk7CisgICAgQVNTRVJUKCFsaXN0ZW5lcnMu aXNFbXB0eSgpKTsKKyAgICBzaXplX3QgaSA9IGxpc3RlbmVycy5maW5kKGV2ZW50TGlzdGVuZXIp OwogICAgIEFTU0VSVChpICE9IG5vdEZvdW5kKTsKLSAgICBldmVudExpc3RlbmVycygpLnJlbW92 ZShpKTsKLSAgICBpZiAoZXZlbnRMaXN0ZW5lcnMoKS5pc0VtcHR5KCkpIHsKKyAgICBsaXN0ZW5l cnMucmVtb3ZlKGkpOworICAgIGlmIChsaXN0ZW5lcnMuaXNFbXB0eSgpKSB7CiAgICAgICAgIHY4 OjpWODo6UmVtb3ZlR0NQcm9sb2d1ZUNhbGxiYWNrKFNjcmlwdEdDRXZlbnQ6OmdjUHJvbG9ndWVD YWxsYmFjayk7CiAgICAgICAgIHY4OjpWODo6UmVtb3ZlR0NFcGlsb2d1ZUNhbGxiYWNrKFNjcmlw dEdDRXZlbnQ6OmdjRXBpbG9ndWVDYWxsYmFjayk7CiAgICAgfQpAQCAtOTAsMTcgKzg5LDIzIEBA IHNpemVfdCBTY3JpcHRHQ0V2ZW50OjpnZXRVc2VkSGVhcFNpemUoKQogCiB2b2lkIFNjcmlwdEdD RXZlbnQ6OmdjUHJvbG9ndWVDYWxsYmFjayh2ODo6R0NUeXBlIHR5cGUsIHY4OjpHQ0NhbGxiYWNr RmxhZ3MgZmxhZ3MpCiB7Ci0gICAgc19zdGFydFRpbWUgPSBXVEY6Om1vbm90b25pY2FsbHlJbmNy ZWFzaW5nVGltZSgpOwotICAgIHNfdXNlZEhlYXBTaXplID0gZ2V0VXNlZEhlYXBTaXplKCk7Cisg ICAgR0NFdmVudERhdGEmIGdjRXZlbnREYXRhID0gaXNvbGF0ZUdDRXZlbnREYXRhKCk7CisgICAg Z2NFdmVudERhdGEuc3RhcnRUaW1lID0gV1RGOjptb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUo KTsKKyAgICBnY0V2ZW50RGF0YS51c2VkSGVhcFNpemUgPSBnZXRVc2VkSGVhcFNpemUoKTsKIH0K IAogdm9pZCBTY3JpcHRHQ0V2ZW50OjpnY0VwaWxvZ3VlQ2FsbGJhY2sodjg6OkdDVHlwZSB0eXBl LCB2ODo6R0NDYWxsYmFja0ZsYWdzIGZsYWdzKQogeworICAgIEdDRXZlbnREYXRhJiBnY0V2ZW50 RGF0YSA9IGlzb2xhdGVHQ0V2ZW50RGF0YSgpOworICAgIGlmICghZ2NFdmVudERhdGEudXNlZEhl YXBTaXplKQorICAgICAgICByZXR1cm47CiAgICAgZG91YmxlIGVuZFRpbWUgPSBXVEY6Om1vbm90 b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpOwotICAgIHNpemVfdCBjb2xsZWN0ZWRCeXRlcyA9IHNf dXNlZEhlYXBTaXplIC0gZ2V0VXNlZEhlYXBTaXplKCk7Ci0gICAgR0NFdmVudExpc3RlbmVycyBs aXN0ZW5lcnMoZXZlbnRMaXN0ZW5lcnMoKSk7Ci0gICAgZm9yIChHQ0V2ZW50TGlzdGVuZXJzOjpp dGVyYXRvciBpID0gbGlzdGVuZXJzLmJlZ2luKCk7IGkgIT0gbGlzdGVuZXJzLmVuZCgpOyArK2kp Ci0gICAgICAgICgqaSktPmRpZEdDKHNfc3RhcnRUaW1lLCBlbmRUaW1lLCBjb2xsZWN0ZWRCeXRl cyk7CisgICAgc2l6ZV90IHVzZWRIZWFwU2l6ZSA9IGdldFVzZWRIZWFwU2l6ZSgpOworICAgIHNp emVfdCBjb2xsZWN0ZWRCeXRlcyA9IHVzZWRIZWFwU2l6ZSA+IGdjRXZlbnREYXRhLnVzZWRIZWFw U2l6ZSA/IDAgOiBnY0V2ZW50RGF0YS51c2VkSGVhcFNpemUgLSB1c2VkSGVhcFNpemU7CisgICAg R0NFdmVudERhdGE6OkdDRXZlbnRMaXN0ZW5lcnMmIGxpc3RlbmVycyA9IGdjRXZlbnREYXRhLmxp c3RlbmVycygpOworICAgIGZvciAoR0NFdmVudERhdGE6OkdDRXZlbnRMaXN0ZW5lcnM6Oml0ZXJh dG9yIGkgPSBsaXN0ZW5lcnMuYmVnaW4oKTsgaSAhPSBsaXN0ZW5lcnMuZW5kKCk7ICsraSkKKyAg ICAgICAgKCppKS0+ZGlkR0MoZ2NFdmVudERhdGEuc3RhcnRUaW1lLCBlbmRUaW1lLCBjb2xsZWN0 ZWRCeXRlcyk7CisgICAgZ2NFdmVudERhdGEuY2xlYXIoKTsKIH0KICAgICAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dEdDRXZlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdEdDRXZlbnQuaApp bmRleCAwNjQ0YTg1MGI5ZTE3Yjg5ODUxZmViOGQyZmQ0OGJlYjY1NzY1NzM1Li5mMmJhNDk1MjVm NmU4OThjYzNkNjU1ZjEzMzljMTVkZjNkNGE0MzZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9TY3JpcHRHQ0V2ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvU2NyaXB0R0NFdmVudC5oCkBAIC00Nyw5ICs0Nyw2IEBAIHB1YmxpYzoKICAgICBzdGF0 aWMgdm9pZCByZW1vdmVFdmVudExpc3RlbmVyKFNjcmlwdEdDRXZlbnRMaXN0ZW5lciopOwogICAg IHN0YXRpYyB2b2lkIGdldEhlYXBTaXplKHNpemVfdCYsIHNpemVfdCYsIHNpemVfdCYpOwogcHJp dmF0ZToKLSAgICBzdGF0aWMgZG91YmxlIHNfc3RhcnRUaW1lOwotICAgIHN0YXRpYyBzaXplX3Qg c191c2VkSGVhcFNpemU7Ci0gCiAgICAgc3RhdGljIHZvaWQgZ2NFcGlsb2d1ZUNhbGxiYWNrKHY4 OjpHQ1R5cGUgdHlwZSwgdjg6OkdDQ2FsbGJhY2tGbGFncyBmbGFncyk7CiAgICAgc3RhdGljIHZv aWQgZ2NQcm9sb2d1ZUNhbGxiYWNrKHY4OjpHQ1R5cGUgdHlwZSwgdjg6OkdDQ2FsbGJhY2tGbGFn cyBmbGFncyk7CiAgICAgc3RhdGljIHNpemVfdCBnZXRVc2VkSGVhcFNpemUoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5oIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmgKaW5kZXggMTE5NjE5MWQ4NDE5OGQ3YTEwNDFkZDc2 YzUzOTlhMzlmNzExMjJlYi4uM2VlNjkyZGEwMTM0MTMyOGJmODA4ZTIwZTQ5ODEzZmJlMjEwNmFi NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmgKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmgKQEAgLTg5LDYgKzg5LDI3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgUmVmUHRyPFN0cmluZ0ltcGw+IG1fbGFz dFN0cmluZ0ltcGw7CiAgICAgfTsKIAorICAgIGNsYXNzIFNjcmlwdEdDRXZlbnRMaXN0ZW5lcjsK KworICAgIGNsYXNzIEdDRXZlbnREYXRhIHsKKyAgICBwdWJsaWM6CisgICAgICAgIHR5cGVkZWYg VmVjdG9yPFNjcmlwdEdDRXZlbnRMaXN0ZW5lcio+IEdDRXZlbnRMaXN0ZW5lcnM7CisKKyAgICAg ICAgR0NFdmVudERhdGEoKSA6IHN0YXJ0VGltZSgwLjApLCB1c2VkSGVhcFNpemUoMCkgeyB9Cisg ICAgICAgIHZvaWQgY2xlYXIoKQorICAgICAgICB7CisgICAgICAgICAgICBzdGFydFRpbWUgPSAw LjA7CisgICAgICAgICAgICB1c2VkSGVhcFNpemUgPSAwOworICAgICAgICB9CisgICAgICAgIEdD RXZlbnRMaXN0ZW5lcnMmIGxpc3RlbmVycygpIHsgcmV0dXJuIG1fbGlzdGVuZXJzOyB9CisKKyAg ICAgICAgZG91YmxlIHN0YXJ0VGltZTsKKyAgICAgICAgc2l6ZV90IHVzZWRIZWFwU2l6ZTsKKwor ICAgIHByaXZhdGU6CisgICAgICAgIEdDRXZlbnRMaXN0ZW5lcnMgbV9saXN0ZW5lcnM7CisgICAg fTsKKwogICAgIGNsYXNzIENvbnN0cnVjdG9yTW9kZTsKIAogI2lmbmRlZiBOREVCVUcKQEAgLTE2 MCw2ICsxODEsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGludCBkZWNyZW1lbnRJ bnRlcm5hbFNjcmlwdFJlY3Vyc2lvbkxldmVsKCkgeyByZXR1cm4gLS1tX2ludGVybmFsU2NyaXB0 UmVjdXJzaW9uTGV2ZWw7IH0KICNlbmRpZgogCisgICAgICAgIEdDRXZlbnREYXRhJiBnY0V2ZW50 RGF0YSgpIHsgcmV0dXJuIG1fZ2NFdmVudERhdGE7IH0KKwogICAgIHByaXZhdGU6CiAgICAgICAg IGV4cGxpY2l0IFY4QmluZGluZ1Blcklzb2xhdGVEYXRhKHY4OjpJc29sYXRlKik7CiAgICAgICAg IH5WOEJpbmRpbmdQZXJJc29sYXRlRGF0YSgpOwpAQCAtMTg2LDYgKzIwOSw3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgR2xvYmFsSGFuZGxlTWFwIG1fZ2xvYmFsSGFuZGxlTWFwOwog ICAgICAgICBpbnQgbV9pbnRlcm5hbFNjcmlwdFJlY3Vyc2lvbkxldmVsOwogI2VuZGlmCisgICAg ICAgIEdDRXZlbnREYXRhIG1fZ2NFdmVudERhdGE7CiAgICAgfTsKIAogICAgIGNsYXNzIENvbnN0 cnVjdG9yTW9kZSB7Cg==