42413 2010-07-15 15:11:57 -0700 Cancel stream loads when destroying NetscapePluginStreams 2010-07-15 15:23:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 252152 0 andersca 2010-07-15 15:11:57 -0700 Cancel stream loads when destroying NetscapePluginStreams 252154 1 61731 andersca 2010-07-15 15:16:13 -0700 Created attachment 61731 Patch 252158 2 61731 sam 2010-07-15 15:18:06 -0700 Comment on attachment 61731 Patch r=me 252160 3 webkit.review.bot 2010-07-15 15:19:07 -0700 Attachment 61731 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h:37: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 252169 4 andersca 2010-07-15 15:23:04 -0700 Committed r63473: <http://trac.webkit.org/changeset/63473> 61731 2010-07-15 15:16:13 -0700 2010-07-15 15:18:06 -0700 Patch bug-42413-20100715151612.patch text/plain 12734 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YjYxM2EwMDQ1ZmVmZmI4Y2JlNzViMTc5NGQzMjc1NDQ4ZDlkZGQwMC4uZTBlYzI5NTc2N2M2YTJi NTliNmRkNWE1NTg2NzRiNjA0ZjUyNmUwOSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0OCBAQAogMjAxMC0wNy0xNSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENhbmNlbCBzdHJlYW0gbG9hZHMgd2hlbiBkZXN0 cm95aW5nIE5ldHNjYXBlUGx1Z2luU3RyZWFtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI0MTMKKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBl UGx1Z2luOjpjYW5jZWxTdHJlYW1Mb2FkKToKKyAgICAgICAgQ2FsbCBQbHVnaW5Db250cm9sbGVy OjpjYW5jZWxTdHJlYW1Mb2FkLgorCisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpz dHJlYW1EaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICBDYWxsIE5ldHNjYXBlUGx1Z2luU3Ry ZWFtOjpkaWRSZWNlaXZlUmVzcG9uc2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRz Y2FwZVBsdWdpblN0cmVhbTo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgVHJ5IHRvIHN0 YXJ0IHRoZSBzdHJlYW0uCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5TdHJlYW06 OnNlbmRKYXZhU2NyaXB0U3RyZWFtKToKKyAgICAgICAgRG9uJ3Qgc3RvcCB0aGUgc3RyZWFtIGlm IGl0IGNhbid0IGJlIHN0YXJ0ZWQuIHN0YXJ0IGhhbmRsZXMgdGhhdCBub3cuCisKKyAgICAgICAg KFdlYktpdDo6aXNTdXBwb3J0ZWRUcmFuc2Zlck1vZGUpOgorICAgICAgICBSZXR1cm4gd2hldGhl ciB0aGUgZ2l2ZW4gdHJhbnNmZXIgbW9kZSBpcyBzdXBwb3J0ZWQuCisKKyAgICAgICAgKFdlYktp dDo6TmV0c2NhcGVQbHVnaW5TdHJlYW06OnN0YXJ0KToKKyAgICAgICAgSWYgdGhlIHN0cmVhbSBm YWlscyB0byBzdGFydCwgY2FsbCBub3RpZnlBbmREZXN0cm95U3RyZWFtLiBJZiBpdCBzdGFydHMg c3VjY2Vzc2Z1bGx5IGJ1dCBoYXMKKyAgICAgICAgYW4gdW5zdXBwb3J0ZWQgdHJhbnNmZXIgbW9k ZSwgY2FsbCBzdG9wLgorICAgICAgICAKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5T dHJlYW06Om5vdGlmeUFuZERlc3Ryb3lTdHJlYW0pOgorICAgICAgICBDYW5jZWwgdGhlIHN0cmVh bSBsb2FkIHVubGVzcyBpdCdzIGJlaW5nIGRlc3Ryb3llZCBiZWNhdXNlIGl0IGhhcyBmaW5pc2hl ZCBsb2FkaW5nLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkNvbnRyb2xs ZXIuaDoKKyAgICAgICAgQWRkIGNhbmNlbFN0cmVhbUxvYWQgcHVyZSB2aXJ0dWFsIG1lbWJlciBm dW5jdGlvbi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoK KyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6U3RyZWFtOjpjYW5jZWwpOgorICAgICAgICBU ZWxsIHRoZSBzdHJlYW0gbG9hZGVyIHRvIGNhbmNlbCBhbmQgbnVsbCBpdCBvdXQuCisKKyAgICAg ICAgKFdlYktpdDo6UGx1Z2luVmlldzo6Y2FuY2VsU3RyZWFtTG9hZCk6CisgICAgICAgIEdldCB0 aGUgc3RyZWFtIGFuZCBjYW5jZWwgaXQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luVmlldy5oOgorCisyMDEwLTA3LTE1ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KIAogICAgICAgICBT dGFydCBsb2FkaW5nIHBsdWctaW4gc3RyZWFtcwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwIGIvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCmluZGV4IDQzOWZlMzhmMGUz YjNlMTVmOGFiNWVhNTRkOWE1ODM1ZGU4NGZlMjkuLjZlYmM2N2UxNWMyMDhlZTE2M2JlYzg5OTIz ZTRkNjkwMzg5MTVhNzUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKQEAgLTE0MywxMCArMTQzLDE1IEBAIE5QRXJy b3IgTmV0c2NhcGVQbHVnaW46OmRlc3Ryb3lTdHJlYW0oTlBTdHJlYW0qIHN0cmVhbSwgTlBSZWFz b24gcmVhc29uKQogICAgIHJldHVybiBwbHVnaW5TdHJlYW0tPmRlc3Ryb3kocmVhc29uKTsKIH0K IAordm9pZCBOZXRzY2FwZVBsdWdpbjo6Y2FuY2VsU3RyZWFtTG9hZChOZXRzY2FwZVBsdWdpblN0 cmVhbSogcGx1Z2luU3RyZWFtKQoreworICAgIC8vIEFzayB0aGUgcGx1Zy1pbiBjb250cm9sbGVy IHRvIGNhbmNlbCB0aGlzIHN0cmVhbSBsb2FkLgorICAgIG1fcGx1Z2luQ29udHJvbGxlci0+Y2Fu Y2VsU3RyZWFtTG9hZChwbHVnaW5TdHJlYW0tPnN0cmVhbUlEKCkpOworfQorCiB2b2lkIE5ldHNj YXBlUGx1Z2luOjpyZW1vdmVQbHVnaW5TdHJlYW0oTmV0c2NhcGVQbHVnaW5TdHJlYW0qIHBsdWdp blN0cmVhbSkKIHsKICAgICBBU1NFUlQobV9zdHJlYW1zLmdldChwbHVnaW5TdHJlYW0tPnN0cmVh bUlEKCkpID09IHBsdWdpblN0cmVhbSk7Ci0gICAgCiAgICAgbV9zdHJlYW1zLnJlbW92ZShwbHVn aW5TdHJlYW0tPnN0cmVhbUlEKCkpOwogfQogCkBAIC0zMjgsNyArMzMzLDggQEAgdm9pZCBOZXRz Y2FwZVBsdWdpbjo6ZGlkRXZhbHVhdGVKYXZhU2NyaXB0KHVpbnQ2NF90IHJlcXVlc3RJRCwgY29u c3QgU3RyaW5nJiByZXEKIHZvaWQgTmV0c2NhcGVQbHVnaW46OnN0cmVhbURpZFJlY2VpdmVSZXNw b25zZSh1aW50NjRfdCBzdHJlYW1JRCwgY29uc3QgS1VSTCYgcmVzcG9uc2VVUkwsIHVpbnQzMl90 IHN0cmVhbUxlbmd0aCwgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdWludDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwg Y29uc3QgU3RyaW5nJiBoZWFkZXJzKQogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCisgICAg aWYgKE5ldHNjYXBlUGx1Z2luU3RyZWFtKiBwbHVnaW5TdHJlYW0gPSBzdHJlYW1Gcm9tSUQoc3Ry ZWFtSUQpKQorICAgICAgICBwbHVnaW5TdHJlYW0tPmRpZFJlY2VpdmVSZXNwb25zZShyZXNwb25z ZVVSTCwgc3RyZWFtTGVuZ3RoLCBsYXN0TW9kaWZpZWRUaW1lLCBtaW1lVHlwZSwgaGVhZGVycyk7 CiB9CiAKIFBsdWdpbkNvbnRyb2xsZXIqIE5ldHNjYXBlUGx1Z2luOjpjb250cm9sbGVyKCkKZGlm ZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1 Z2luLmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdp bi5oCmluZGV4IGU1NGZkZDU5MGQ4ZmJjNjkxOGVkMTEwMDBjYjQxNGMzNjQzMjEwZjkuLjEzZGY1 NjEwMDg5ZTdhNzFjNGU0YTBlM2YyYWE0YzUyODVjNmZhMTMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKKysrIGIvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaApAQCAtNTUsNiAr NTUsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBsb2FkVVJMKGNvbnN0IFdlYkNvcmU6OlN0cmluZyYg dXJsU3RyaW5nLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHRhcmdldCwgYm9vbCBzZW5kTm90aWZp Y2F0aW9uLCB2b2lkKiBub3RpZmljYXRpb25EYXRhKTsKICAgICBOUEVycm9yIGRlc3Ryb3lTdHJl YW0oTlBTdHJlYW0qLCBOUFJlYXNvbik7CiAKKyAgICB2b2lkIGNhbmNlbFN0cmVhbUxvYWQoTmV0 c2NhcGVQbHVnaW5TdHJlYW0qKTsKICAgICB2b2lkIHJlbW92ZVBsdWdpblN0cmVhbShOZXRzY2Fw ZVBsdWdpblN0cmVhbSopOwogCiAgICAgLy8gTWVtYmVyIGZ1bmN0aW9ucyBmb3IgY2FsbGluZyBp bnRvIHRoZSBwbHVnLWluLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uY3BwCmluZGV4IGM0YjU3MTk2ZTBm MWRiMWMyNTZmMDk5NDEyMzQyY2RmZWM3MDFhYjYuLmQ4MDkxNTNkMjE0MGJlMTMyZDUxN2VjMjMz NmQxMjA3YTQ0NDQzNmQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpblN0cmVhbS5jcHAKQEAgLTU2LDYgKzU2LDEx IEBAIE5ldHNjYXBlUGx1Z2luU3RyZWFtOjp+TmV0c2NhcGVQbHVnaW5TdHJlYW0oKQogICAgIEFT U0VSVCghbV9zZW5kTm90aWZpY2F0aW9uIHx8IG1fdXJsTm90aWZ5SGFzQmVlbkNhbGxlZCk7CiB9 CiAKK3ZvaWQgTmV0c2NhcGVQbHVnaW5TdHJlYW06OmRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBL VVJMJiByZXNwb25zZVVSTCwgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLCB1aW50MzJfdCBsYXN0TW9k aWZpZWRUaW1lLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGhlYWRlcnMp Cit7CisgICAgc3RhcnQocmVzcG9uc2VVUkwsIHN0cmVhbUxlbmd0aCwgbGFzdE1vZGlmaWVkVGlt ZSwgbWltZVR5cGUsIGhlYWRlcnMpOworfQorCiB2b2lkIE5ldHNjYXBlUGx1Z2luU3RyZWFtOjpz ZW5kSmF2YVNjcmlwdFN0cmVhbShjb25zdCBTdHJpbmcmIHJlcXVlc3RVUkxTdHJpbmcsIGNvbnN0 IFN0cmluZyYgcmVzdWx0KQogewogICAgIC8vIHN0YXJ0aW5nIHRoZSBzdHJlYW0gb3IgZGVsaXZl cmluZyB0aGUgZGF0YSB0byBpdCBtaWdodCBjYXVzZSB0aGUgcGx1Zy1pbiBzdHJlYW0gdG8gZ28g YXdheSwgc28gd2Uga2VlcApAQCAtNjksMTAgKzc0LDggQEAgdm9pZCBOZXRzY2FwZVBsdWdpblN0 cmVhbTo6c2VuZEphdmFTY3JpcHRTdHJlYW0oY29uc3QgU3RyaW5nJiByZXF1ZXN0VVJMU3RyaW5n LAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCFzdGFydChyZXF1ZXN0VVJMU3Ry aW5nLCByZXN1bHRDU3RyaW5nLmxlbmd0aCgpLCAwLCAidGV4dC9wbGFpbiIsICIiKSkgewotICAg ICAgICBzdG9wKE5QUkVTX05FVFdPUktfRVJSKTsKKyAgICBpZiAoIXN0YXJ0KHJlcXVlc3RVUkxT dHJpbmcsIHJlc3VsdENTdHJpbmcubGVuZ3RoKCksIDAsICJ0ZXh0L3BsYWluIiwgIiIpKQogICAg ICAgICByZXR1cm47Ci0gICAgfQogCiAgICAgZGVsaXZlckRhdGEocmVzdWx0Q1N0cmluZy5kYXRh KCksIHJlc3VsdENTdHJpbmcubGVuZ3RoKCkpOwogICAgIHN0b3AoTlBSRVNfRE9ORSk7CkBAIC05 Myw4ICs5NiwyNSBAQCBOUEVycm9yIE5ldHNjYXBlUGx1Z2luU3RyZWFtOjpkZXN0cm95KE5QUmVh c29uIHJlYXNvbikKICAgICByZXR1cm4gTlBFUlJfTk9fRVJST1I7CiB9CiAKLWJvb2wgTmV0c2Nh cGVQbHVnaW5TdHJlYW06OnN0YXJ0KGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgcmVzcG9uc2VVUkxT dHJpbmcsIHVpbnQzMl90IGV4cGVjdGVkQ29udGVudExlbmd0aCwgCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25zdCBXZWJDb3Jl OjpTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIGhlYWRlcnMpCitzdGF0 aWMgYm9vbCBpc1N1cHBvcnRlZFRyYW5zZmVyTW9kZSh1aW50MTZfdCB0cmFuc2Zlck1vZGUpCit7 CisgICAgc3dpdGNoICh0cmFuc2Zlck1vZGUpIHsKKyAgICBjYXNlIE5QX05PUk1BTDoKKyAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgLy8gRklYTUU6IFdlIGRvbid0IHN1cHBvcnQgc3RyZWFtaW5n IHRvIGZpbGVzLgorICAgIGNhc2UgTlBfQVNGSUxFT05MWToKKyAgICBjYXNlIE5QX0FTRklMRToK KyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIC8vIEZJWE1FOiBXZSBkb24ndCBzdXBwb3J0IHNl ZWthYmxlIHN0cmVhbXMuCisgICAgY2FzZSBOUF9TRUVLOgorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgfQorCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIGZhbHNlOwor fQorICAgIAorYm9vbCBOZXRzY2FwZVBsdWdpblN0cmVhbTo6c3RhcnQoY29uc3QgV2ViQ29yZTo6 U3RyaW5nJiByZXNwb25zZVVSTFN0cmluZywgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLCB1aW50MzJf dCBsYXN0TW9kaWZpZWRUaW1lLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcm IGhlYWRlcnMpCiB7CiAgICAgbV9yZXNwb25zZVVSTCA9IHJlc3BvbnNlVVJMU3RyaW5nLnV0Zjgo KTsKICAgICBtX21pbWVUeXBlID0gbWltZVR5cGUudXRmOCgpOwpAQCAtMTAyLDI4ICsxMjIsMjUg QEAgYm9vbCBOZXRzY2FwZVBsdWdpblN0cmVhbTo6c3RhcnQoY29uc3QgV2ViQ29yZTo6U3RyaW5n JiByZXNwb25zZVVSTFN0cmluZywgdWludDMKIAogICAgIG1fbnBTdHJlYW0ubmRhdGEgPSB0aGlz OwogICAgIG1fbnBTdHJlYW0udXJsID0gbV9yZXNwb25zZVVSTC5kYXRhKCk7Ci0gICAgbV9ucFN0 cmVhbS5lbmQgPSBleHBlY3RlZENvbnRlbnRMZW5ndGg7CisgICAgbV9ucFN0cmVhbS5lbmQgPSBz dHJlYW1MZW5ndGg7CiAgICAgbV9ucFN0cmVhbS5sYXN0bW9kaWZpZWQgPSBsYXN0TW9kaWZpZWRU aW1lOwogICAgIG1fbnBTdHJlYW0ubm90aWZ5RGF0YSA9IDA7CiAgICAgbV9ucFN0cmVhbS5oZWFk ZXJzID0gbV9oZWFkZXJzLmxlbmd0aCgpID09IDAgPyAwIDogbV9oZWFkZXJzLmRhdGEoKTsKIAog ICAgIE5QRXJyb3IgZXJyb3IgPSBtX3BsdWdpbi0+TlBQX05ld1N0cmVhbShjb25zdF9jYXN0PGNo YXIqPihtX21pbWVUeXBlLmRhdGEoKSksICZtX25wU3RyZWFtLCBmYWxzZSwgJm1fdHJhbnNmZXJN b2RlKTsKLSAgICBpZiAoZXJyb3IgIT0gTlBFUlJfTk9fRVJST1IpCisgICAgaWYgKGVycm9yICE9 IE5QRVJSX05PX0VSUk9SKSB7CisgICAgICAgIC8vIFdlIGZhaWxlZCB0byBzdGFydCB0aGUgc3Ry ZWFtLCBkZXN0cm95IGl0LgorICAgICAgICBub3RpZnlBbmREZXN0cm95U3RyZWFtKE5QUkVTX05F VFdPUktfRVJSKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KIAogICAgIC8vIFdlIHN1 Y2Nlc3NmdWxseSBzdGFydGVkIHRoZSBzdHJlYW0uCiAgICAgbV9pc1N0YXJ0ZWQgPSB0cnVlOwog Ci0gICAgc3dpdGNoIChtX3RyYW5zZmVyTW9kZSkgewotICAgICAgICBjYXNlIE5QX05PUk1BTDoK LSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAvLyBGSVhNRTogV2UgZG9uJ3Qgc3VwcG9ydCBz dHJlYW1pbmcgdG8gZmlsZXMuCi0gICAgICAgIGNhc2UgTlBfQVNGSUxFT05MWToKLSAgICAgICAg Y2FzZSBOUF9BU0ZJTEU6Ci0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIC8vIEZJ WE1FOiBXZSBkb24ndCBzdXBwb3J0IHNlZWthYmxlIHN0cmVhbXMuCi0gICAgICAgIGNhc2UgTlBf U0VFSzoKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWlzU3VwcG9ydGVkVHJh bnNmZXJNb2RlKG1fdHJhbnNmZXJNb2RlKSkgeworICAgICAgICAvLyBTdG9wIHRoZSBzdHJlYW0u CisgICAgICAgIHN0b3AoTlBSRVNfTkVUV09SS19FUlIpOworICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQogCiAgICAgcmV0dXJuIHRydWU7CkBAIC0yNDAsNiArMjU3LDkgQEAgdm9pZCBOZXRz Y2FwZVBsdWdpblN0cmVhbTo6bm90aWZ5QW5kRGVzdHJveVN0cmVhbShOUFJlYXNvbiByZWFzb24p CiAjZW5kaWYgICAgCiAgICAgfQogCisgICAgaWYgKHJlYXNvbiAhPSBOUFJFU19ET05FKQorICAg ICAgICBtX3BsdWdpbi0+Y2FuY2VsU3RyZWFtTG9hZCh0aGlzKTsKKwogICAgIG1fcGx1Z2luLT5y ZW1vdmVQbHVnaW5TdHJlYW0odGhpcyk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmggYi9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpblN0cmVhbS5oCmluZGV4IDI2 MDkxOGRlNWRjNzBmOTQ5YzM0MmU5MzZhYTI5YWZkOGExZDFjYTQuLjA3NDM1NWJmN2NhMTE1OTQw ZTkwODgxMWRiMDhiOGJhODgxYTY5ZjUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmgKKysrIGIvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uaApAQCAtMzQsNiAr MzQsNyBAQAogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNv cmUgeworICAgIGNsYXNzIEtVUkw7CiAgICAgY2xhc3MgU3RyaW5nOwogfQogCkBAIC01Miw2ICs1 Myw5IEBAIHB1YmxpYzoKICAgICB1aW50NjRfdCBzdHJlYW1JRCgpIGNvbnN0IHsgcmV0dXJuIG1f c3RyZWFtSUQ7IH0KICAgICBjb25zdCBOUFN0cmVhbSogbnBTdHJlYW0oKSBjb25zdCB7IHJldHVy biAmbV9ucFN0cmVhbTsgfQogCisgICAgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2UoY29uc3QgV2Vi Q29yZTo6S1VSTCYgcmVzcG9uc2VVUkwsIHVpbnQzMl90IHN0cmVhbUxlbmd0aCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25zdCBXZWJD b3JlOjpTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIGhlYWRlcnMpOwor CiAgICAgdm9pZCBzZW5kSmF2YVNjcmlwdFN0cmVhbShjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHJl cXVlc3RVUkxTdHJpbmcsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgcmVzdWx0KTsKIAogICAgIE5Q RXJyb3IgZGVzdHJveShOUFJlYXNvbik7CkBAIC01OSw3ICs2Myw3IEBAIHB1YmxpYzoKIHByaXZh dGU6CiAgICAgTmV0c2NhcGVQbHVnaW5TdHJlYW0oUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbj4s IHVpbnQ2NF90IHN0cmVhbUlELCBib29sIHNlbmROb3RpZmljYXRpb24sIHZvaWQqIG5vdGlmaWNh dGlvbkRhdGEpOwogCi0gICAgYm9vbCBzdGFydChjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHJlc3Bv bnNlVVJMU3RyaW5nLCB1aW50MzJfdCBleHBlY3RlZENvbnRlbnRMZW5ndGgsIAorICAgIGJvb2wg c3RhcnQoY29uc3QgV2ViQ29yZTo6U3RyaW5nJiByZXNwb25zZVVSTFN0cmluZywgdWludDMyX3Qg c3RyZWFtTGVuZ3RoLCAKICAgICAgICAgICAgICAgIHVpbnQzMl90IGxhc3RNb2RpZmllZFRpbWUs IGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYg aGVhZGVycyk7CiAgICAgdm9pZCBzdG9wKE5QUmVhc29uKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luQ29udHJvbGxlci5oIGIvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvUGx1Z2luQ29udHJvbGxlci5oCmluZGV4IDYyNWJkZGJjNjUyYmVkYzhlYTU1 Mzg0YzA2YjRkYWFiOGQ2NDkyNTEuLjAxNjBlMzVhZjA0MjY0MjRmZTY0YWM4NGZjMGQxNmE4ZjY2 OTk5ZTEgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkNvbnRy b2xsZXIuaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Db250cm9sbGVy LmgKQEAgLTQ3LDggKzQ3LDEzIEBAIHB1YmxpYzoKICAgICAvLyBJZiBhIHRhcmdldCBpcyBzcGVj aWZpZWQsIHRoZW4gdGhlIFVSTCB3aWxsIGJlIGxvYWRlZCBpbiB0aGUgd2luZG93IG9yIGZyYW1l IHRoYXQgdGhlIHRhcmdldCByZWZlcnMgdG8uCiAgICAgLy8gT25jZSB0aGUgVVJMIGZpbmlzaGVz IGxvYWRpbmcsIFBsdWdpbjo6ZnJhbWVEaWRGaW5pc2hMb2FkaW5nIHdpbGwgYmUgY2FsbGVkIHdp dGggdGhlIGdpdmVuIHJlcXVlc3RJRC4gSWYgdGhlIFVSTAogICAgIC8vIGZhaWxzIHRvIGxvYWQs IFBsdWdpbjo6ZnJhbWVEaWRGYWlsVG9Mb2FkIHdpbGwgYmUgY2FsbGVkLgorICAgIC8vCisgICAg Ly8gSWYgdGhlIFVSTCBpcyBhIEphdmFTY3JpcHQgVVJMLCB0aGUgSmF2YVNjcmlwdCBjb2RlIHdp bGwgYmUgZXZhbHVhdGVkIGFuZCB0aGUgcmVzdWx0IHNlbnQgYmFjayB1c2luZyBQbHVnaW46OmRp ZEV2YWx1YXRlSmF2YVNjcmlwdC4KICAgICB2aXJ0dWFsIHZvaWQgbG9hZFVSTCh1aW50NjRfdCBy ZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBXZWJDb3Jl OjpTdHJpbmcmIHRhcmdldCwgYm9vbCBhbGxvd1BvcHVwcykgPSAwOwotICAgIAorCisgICAgLy8v IENhbmNlbHMgdGhlIGxvYWQgb2YgYSBzdHJlYW0gdGhhdCB3YXMgcmVxdWVzdGVkIGJ5IGxvYWRV UkwuCisgICAgdmlydHVhbCB2b2lkIGNhbmNlbFN0cmVhbUxvYWQodWludDY0X3Qgc3RyZWFtSUQp ID0gMDsKKwogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgflBsdWdpbkNvbnRyb2xsZXIoKSB7IH0K IH07CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNw cCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IDBmZjJj ODkxOWJhMDBjZTQwYzVhYzk4MjU0NGZlNDg1YmFhZjRjYjYuLmZlZTFhYWMwNDU5MGFiY2M0MDI1 YmFjYjFiZDRkYWRjOWM3ZmY2NzAgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL1BsdWdpblZpZXcuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blZpZXcuY3BwCkBAIC03NCw2ICs3NCw3IEBAIHB1YmxpYzoKICAgICB9CiAKICAgICB2b2lkIHN0 YXJ0KCk7CisgICAgdm9pZCBjYW5jZWwoKTsKIAogICAgIHVpbnQ2NF90IHN0cmVhbUlEKCkgY29u c3QgeyByZXR1cm4gbV9zdHJlYW1JRDsgfQogCkBAIC0xMTIsNiArMTEzLDE0IEBAIHZvaWQgUGx1 Z2luVmlldzo6U3RyZWFtOjpzdGFydCgpCiAgICAgbV9sb2FkZXItPmxvYWQobV9yZXF1ZXN0KTsK IH0KIAordm9pZCBQbHVnaW5WaWV3OjpTdHJlYW06OmNhbmNlbCgpCit7CisgICAgQVNTRVJUKG1f bG9hZGVyKTsKKworICAgIG1fbG9hZGVyLT5jYW5jZWwobV9sb2FkZXItPmNhbmNlbGxlZEVycm9y KCkpOworICAgIG1fbG9hZGVyID0gMDsKK30KKwogdm9pZCBQbHVnaW5WaWV3OjpTdHJlYW06OmRp ZFJlY2VpdmVSZXNwb25zZShOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlciosIGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewogICAgIC8vIENvbXB1dGUgdGhlIHN0cmVhbSByZWxh dGVkIGRhdGEgZnJvbSB0aGUgcmVzb3VyY2UgcmVzcG9uc2UuCkBAIC00NzEsNiArNDgwLDE2IEBA IHZvaWQgUGx1Z2luVmlldzo6bG9hZFVSTCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFN0cmlu ZyYgdXJsU3RyaW5nLCBjb25zdCBTdHJpCiAgICAgbV9wZW5kaW5nVVJMUmVxdWVzdHNUaW1lci5z dGFydE9uZVNob3QoMCk7CiB9CiAKK3ZvaWQgUGx1Z2luVmlldzo6Y2FuY2VsU3RyZWFtTG9hZCh1 aW50NjRfdCBzdHJlYW1JRCkKK3sKKyAgICBQbHVnaW5WaWV3OjpTdHJlYW0qIHN0cmVhbSA9IG1f c3RyZWFtcy5nZXQoc3RyZWFtSUQpLmdldCgpOworICAgIGlmICghc3RyZWFtKQorICAgICAgICBy ZXR1cm47CisKKyAgICBzdHJlYW0tPmNhbmNlbCgpOworICAgIHJlbW92ZVN0cmVhbShzdHJlYW0p OworfQorCiB2b2lkIFBsdWdpblZpZXc6OmRpZEZpbmlzaExvYWQoV2ViRnJhbWUqIHdlYkZyYW1l KQogewogICAgIFJlZlB0cjxVUkxSZXF1ZXN0PiByZXF1ZXN0ID0gbV9wZW5kaW5nRnJhbWVMb2Fk cy50YWtlKHdlYkZyYW1lKTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L1BsdWdpblZpZXcuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaApp bmRleCA3MTA4MjEyYTRmYTU2YWM5ODExOWY1Mzc0OTVmNTYyMDE0Njk0NjQ4Li5iZmY0M2VlNDIy ZjBiMWY2ZjRhN2NhN2RlNDY2YjRmMzJiYzExN2FiIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvUGx1Z2luVmlldy5oCkBAIC04OCw2ICs4OCw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2 b2lkIGludmFsaWRhdGUoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOwogICAgIHZpcnR1YWwgV2Vi Q29yZTo6U3RyaW5nIHVzZXJBZ2VudChjb25zdCBXZWJDb3JlOjpLVVJMJik7CiAgICAgdmlydHVh bCB2b2lkIGxvYWRVUkwodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBXZWJDb3JlOjpTdHJpbmcm IHVybFN0cmluZywgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiB0YXJnZXQsIGJvb2wgYWxsb3dQb3B1 cHMpOworICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxTdHJlYW1Mb2FkKHVpbnQ2NF90IHN0cmVhbUlE KTsKIAogICAgIC8vIFdlYkZyYW1lOjpMb2FkTGlzdGVuZXIKICAgICB2aXJ0dWFsIHZvaWQgZGlk RmluaXNoTG9hZChXZWJGcmFtZSopOwo=