59458 2011-04-26 08:03:13 -0700 DumpRenderTree/chromium should play nice with strict OwnPtrs 2011-04-26 11:49:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth abarth commit-queue eric levin webkit.review.bot oldest_to_newest 392464 0 abarth 2011-04-26 08:03:13 -0700 DumpRenderTree/chromium should play nice with strict OwnPtrs 392466 1 91108 abarth 2011-04-26 08:04:59 -0700 Created attachment 91108 Patch 392474 2 91108 abarth 2011-04-26 08:16:33 -0700 Comment on attachment 91108 Patch Many thanks. 392547 3 91108 commit-queue 2011-04-26 10:21:58 -0700 Comment on attachment 91108 Patch Clearing flags on attachment: 91108 Committed r84926: <http://trac.webkit.org/changeset/84926> 392548 4 commit-queue 2011-04-26 10:22:01 -0700 All reviewed patches have been landed. Closing bug. 392603 5 webkit.review.bot 2011-04-26 11:49:10 -0700 http://trac.webkit.org/changeset/84926 might have broken SnowLeopard Intel Release (WebKit2 Tests) The following tests are not passing: fast/loader/file-protocol-fragment.html 91108 2011-04-26 08:04:59 -0700 2011-04-26 10:21:58 -0700 Patch bug-59458-20110426080458.patch text/plain 14608 abarth SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg0OTEyKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMzkgQEAKKzIwMTEtMDQtMjYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEdW1wUmVuZGVy VHJlZS9jaHJvbWl1bSBzaG91bGQgcGxheSBuaWNlIHdpdGggc3RyaWN0IE93blB0cnMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5NDU4CisKKyAgICAg ICAgQWxsIHRoZXNlIGNoYW5nZXMgYXJlIHByZXR0eSBzdHJhaWdodCBmb3J3YXJkLgorCisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vQ3BwQm91bmRDbGFzcy5jcHA6CisgICAgICAg IChHZXR0ZXJQcm9wZXJ0eUNhbGxiYWNrOjpHZXR0ZXJQcm9wZXJ0eUNhbGxiYWNrKToKKyAgICAg ICAgKENwcEJvdW5kQ2xhc3M6OmJpbmRHZXR0ZXJDYWxsYmFjayk6CisgICAgICAgICogRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vQ3BwQm91bmRDbGFzcy5oOgorICAgICAgICAoQ3BwQm91bmRDbGFz czo6YmluZFByb3BlcnR5KToKKyAgICAgICAgKENwcEJvdW5kQ2xhc3M6OmJpbmRGYWxsYmFja0Nh bGxiYWNrKToKKyAgICAgICAgKENwcEJvdW5kQ2xhc3M6OmJpbmRGYWxsYmFja01ldGhvZCk6Cisg ICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRFJURGV2VG9vbHNDbGllbnQuY3BwOgor ICAgICAgICAoRFJURGV2VG9vbHNDbGllbnQ6OkRSVERldlRvb2xzQ2xpZW50KToKKyAgICAgICAg KiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0RXZlbnRQcmludGVyLmNwcDoKKyAgICAgICAg KFRlc3RFdmVudFByaW50ZXI6OmNyZWF0ZURSVFByaW50ZXIpOgorICAgICAgICAoVGVzdEV2ZW50 UHJpbnRlcjo6Y3JlYXRlVGVzdFNoZWxsUHJpbnRlcik6CisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vVGVzdEV2ZW50UHJpbnRlci5oOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1Rlc3RTaGVsbC5jcHA6CisgICAgICAgIChUZXN0U2hlbGw6OlRlc3RTaGVsbCk6 CisgICAgICAgIChUZXN0U2hlbGw6OmNyZWF0ZU1haW5XaW5kb3cpOgorICAgICAgICAoVGVzdFNo ZWxsOjpjcmVhdGVEUlREZXZUb29sc0NsaWVudCk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vV2ViVmlld0hvc3QuY3BwOgorICAgICAgICAoV2ViVmlld0hvc3Q6Omdlb2xvY2F0 aW9uQ2xpZW50TW9jayk6CisgICAgICAgIChXZWJWaWV3SG9zdDo6c3BlZWNoSW5wdXRDb250cm9s bGVyKToKKyAgICAgICAgKFdlYlZpZXdIb3N0OjpkZXZpY2VPcmllbnRhdGlvbkNsaWVudE1vY2sp OgorICAgICAgICAoV2ViVmlld0hvc3Q6OnJlc2V0KToKKyAgICAgICAgKFdlYlZpZXdIb3N0Ojpu YXZpZ2F0ZSk6CisgICAgICAgIChXZWJWaWV3SG9zdDo6c2V0UGVuZGluZ0V4dHJhRGF0YSk6Cisg ICAgICAgIChXZWJWaWV3SG9zdDo6Y2FudmFzKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9XZWJWaWV3SG9zdC5oOgorCiAyMDExLTA0LTI2ICBNaWhhaSBQYXJwYXJpdGEgIDxt aWhhaXBAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJ bmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vQ3BwQm91bmRDbGFzcy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vQ3BwQm91bmRDbGFzcy5j cHAJKHJldmlzaW9uIDg0ODg2KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vQ3Bw Qm91bmRDbGFzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTczLDggKzczLDEwIEBAIHByaXZhdGU6 CiAKIGNsYXNzIEdldHRlclByb3BlcnR5Q2FsbGJhY2sgOiBwdWJsaWMgQ3BwQm91bmRDbGFzczo6 UHJvcGVydHlDYWxsYmFjayB7CiBwdWJsaWM6Ci0gICAgR2V0dGVyUHJvcGVydHlDYWxsYmFjayhD cHBCb3VuZENsYXNzOjpHZXR0ZXJDYWxsYmFjayogY2FsbGJhY2spCi0gICAgICAgIDogbV9jYWxs YmFjayhjYWxsYmFjaykgeyB9CisgICAgR2V0dGVyUHJvcGVydHlDYWxsYmFjayhQYXNzT3duUHRy PENwcEJvdW5kQ2xhc3M6OkdldHRlckNhbGxiYWNrPiBjYWxsYmFjaykKKyAgICAgICAgOiBtX2Nh bGxiYWNrKGNhbGxiYWNrKQorICAgIHsKKyAgICB9CiAKICAgICB2aXJ0dWFsIGJvb2wgZ2V0VmFs dWUoQ3BwVmFyaWFudCogdmFsdWUpCiAgICAgewpAQCAtMjkwLDcgKzI5Miw3IEBAIHZvaWQgQ3Bw Qm91bmRDbGFzczo6YmluZENhbGxiYWNrKGNvbnN0IHMKICAgICBtX21ldGhvZHMuc2V0KGlkZW50 LCBjYWxsYmFjayk7CiB9CiAKLXZvaWQgQ3BwQm91bmRDbGFzczo6YmluZEdldHRlckNhbGxiYWNr KGNvbnN0IHN0cmluZyYgbmFtZSwgR2V0dGVyQ2FsbGJhY2sqIGNhbGxiYWNrKQordm9pZCBDcHBC b3VuZENsYXNzOjpiaW5kR2V0dGVyQ2FsbGJhY2soY29uc3Qgc3RyaW5nJiBuYW1lLCBQYXNzT3du UHRyPEdldHRlckNhbGxiYWNrPiBjYWxsYmFjaykKIHsKICAgICBQcm9wZXJ0eUNhbGxiYWNrKiBw cm9wZXJ0eUNhbGxiYWNrID0gY2FsbGJhY2sgPyBuZXcgR2V0dGVyUHJvcGVydHlDYWxsYmFjayhj YWxsYmFjaykgOiAwOwogICAgIGJpbmRQcm9wZXJ0eShuYW1lLCBwcm9wZXJ0eUNhbGxiYWNrKTsK SW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0NwcEJvdW5kQ2xhc3MuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9DcHBCb3VuZENsYXNzLmgJ KHJldmlzaW9uIDg0ODg2KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vQ3BwQm91 bmRDbGFzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0Nyw3IEBACiAjaW5jbHVkZSA8d3Rm L0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KICNpbmNsdWRlIDx3dGYv T3duUHRyLmg+CisjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvVmVj dG9yLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtMTU5LDcgKzE2MCw3IEBAIHByb3RlY3Rl ZDoKIAogICAgIC8vIEJpbmQgSmF2YXNjcmlwdCBwcm9wZXJ0eSB8bmFtZXwgdG8gdGhlIEMrKyBn ZXR0ZXIgY2FsbGJhY2sgfGNhbGxiYWNrfC4KICAgICAvLyBUaGlzIGNhbiBiZSB1c2VkIHRvIGNy ZWF0ZSByZWFkLW9ubHkgcHJvcGVydGllcy4KLSAgICB2b2lkIGJpbmRHZXR0ZXJDYWxsYmFjayhj b25zdCBzdGQ6OnN0cmluZyYsIEdldHRlckNhbGxiYWNrKik7CisgICAgdm9pZCBiaW5kR2V0dGVy Q2FsbGJhY2soY29uc3Qgc3RkOjpzdHJpbmcmLCBQYXNzT3duUHRyPEdldHRlckNhbGxiYWNrPik7 CiAKICAgICAvLyBBIHdyYXBwZXIgZm9yIEJpbmRHZXR0ZXJDYWxsYmFjaywgdG8gc2ltcGxpZnkg dGhlIGNvbW1vbiBjYXNlIG9mIGJpbmRpbmcgYQogICAgIC8vIHByb3BlcnR5IG9uIHRoZSBjdXJy ZW50IG9iamVjdC4gIFRob3VnaCBub3QgdmVyaWZpZWQgaGVyZSwgfG1ldGhvZHwKQEAgLTE2Nyw4 ICsxNjgsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdGVtcGxhdGU8Y2xhc3MgVD4KICAgICB2b2lkIGJp bmRQcm9wZXJ0eShjb25zdCBzdGQ6OnN0cmluZyYgbmFtZSwgdm9pZCAoVDo6Km1ldGhvZCkoQ3Bw VmFyaWFudCopKQogICAgIHsKLSAgICAgICAgR2V0dGVyQ2FsbGJhY2sqIGNhbGxiYWNrID0gbmV3 IE1lbWJlckdldHRlckNhbGxiYWNrPFQ+KHN0YXRpY19jYXN0PFQqPih0aGlzKSwgbWV0aG9kKTsK LSAgICAgICAgYmluZEdldHRlckNhbGxiYWNrKG5hbWUsIGNhbGxiYWNrKTsKKyAgICAgICAgT3du UHRyPEdldHRlckNhbGxiYWNrPiBjYWxsYmFjayA9IGFkb3B0UHRyKG5ldyBNZW1iZXJHZXR0ZXJD YWxsYmFjazxUPihzdGF0aWNfY2FzdDxUKj4odGhpcyksIG1ldGhvZCkpOworICAgICAgICBiaW5k R2V0dGVyQ2FsbGJhY2sobmFtZSwgY2FsbGJhY2sucmVsZWFzZSgpKTsKICAgICB9CiAKICAgICAv LyBCaW5kIHRoZSBKYXZhc2NyaXB0IHByb3BlcnR5IGNhbGxlZCB8bmFtZXwgdG8gYSBDcHBWYXJp YW50LgpAQCAtMTg4LDkgKzE4OSw5IEBAIHByb3RlY3RlZDoKICAgICAvLyBhcyBpdCBtYXkgY2F1 c2UgdW5leHBlY3RlZCBiZWhhdmlvcnMgKGEgSmF2YVNjcmlwdCBvYmplY3Qgd2l0aCBhCiAgICAg Ly8gZmFsbGJhY2sgYWx3YXlzIHJldHVybnMgdHJ1ZSB3aGVuIGNoZWNrZWQgZm9yIGEgbWV0aG9k J3MKICAgICAvLyBleGlzdGVuY2UpLgotICAgIHZvaWQgYmluZEZhbGxiYWNrQ2FsbGJhY2soQ2Fs bGJhY2sqIGZhbGxiYWNrQ2FsbGJhY2spCisgICAgdm9pZCBiaW5kRmFsbGJhY2tDYWxsYmFjayhQ YXNzT3duUHRyPENhbGxiYWNrPiBmYWxsYmFja0NhbGxiYWNrKQogICAgIHsKLSAgICAgICAgbV9m YWxsYmFja0NhbGxiYWNrLnNldChmYWxsYmFja0NhbGxiYWNrKTsKKyAgICAgICAgbV9mYWxsYmFj a0NhbGxiYWNrID0gZmFsbGJhY2tDYWxsYmFjazsKICAgICB9CiAKICAgICAvLyBBIHdyYXBwZXIg Zm9yIEJpbmRGYWxsYmFja0NhbGxiYWNrLCB0byBzaW1wbGlmeSB0aGUgY29tbW9uIGNhc2Ugb2YK QEAgLTIwMSwxMCArMjAyLDEwIEBAIHByb3RlY3RlZDoKICAgICB2b2lkIGJpbmRGYWxsYmFja01l dGhvZCh2b2lkIChUOjoqbWV0aG9kKShjb25zdCBDcHBBcmd1bWVudExpc3QmLCBDcHBWYXJpYW50 KikpCiAgICAgewogICAgICAgICBpZiAobWV0aG9kKSB7Ci0gICAgICAgICAgICBDYWxsYmFjayog Y2FsbGJhY2sgPSBuZXcgTWVtYmVyQ2FsbGJhY2s8VD4oc3RhdGljX2Nhc3Q8VCo+KHRoaXMpLCBt ZXRob2QpOwotICAgICAgICAgICAgYmluZEZhbGxiYWNrQ2FsbGJhY2soY2FsbGJhY2spOworICAg ICAgICAgICAgT3duUHRyPENhbGxiYWNrPiBjYWxsYmFjayA9IGFkb3B0UHRyKG5ldyBNZW1iZXJD YWxsYmFjazxUPihzdGF0aWNfY2FzdDxUKj4odGhpcyksIG1ldGhvZCkpOworICAgICAgICAgICAg YmluZEZhbGxiYWNrQ2FsbGJhY2soY2FsbGJhY2sucmVsZWFzZSgpKTsKICAgICAgICAgfSBlbHNl Ci0gICAgICAgICAgICBiaW5kRmFsbGJhY2tDYWxsYmFjaygwKTsKKyAgICAgICAgICAgIGJpbmRG YWxsYmFja0NhbGxiYWNrKFBhc3NPd25QdHI8Q2FsbGJhY2s+KCkpOwogICAgIH0KIAogICAgIC8v IFNvbWUgZmllbGRzIGFyZSBwcm90ZWN0ZWQgYmVjYXVzZSBzb21lIHRlc3RzIGRlcGVuZCBvbiBh Y2Nlc3NpbmcgdGhlbSwKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0RSVERl dlRvb2xzQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9EUlREZXZUb29sc0NsaWVudC5jcHAJKHJldmlzaW9uIDg0ODg2KQorKysgVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vRFJURGV2VG9vbHNDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zMiwxMyArMzIsMTMgQEAKICNpbmNsdWRlICJEUlREZXZUb29sc0NsaWVudC5oIgogCiAj aW5jbHVkZSAiRFJURGV2VG9vbHNBZ2VudC5oIgotCiAjaW5jbHVkZSAiV2ViRGV2VG9vbHNBZ2Vu dC5oIgogI2luY2x1ZGUgIldlYkRldlRvb2xzRnJvbnRlbmQuaCIKICNpbmNsdWRlICJXZWJGcmFt ZS5oIgogI2luY2x1ZGUgIldlYlNjcmlwdFNvdXJjZS5oIgogI2luY2x1ZGUgIldlYlZpZXcuaCIK ICNpbmNsdWRlICJ3ZWJraXQvc3VwcG9ydC93ZWJraXRfc3VwcG9ydC5oIgorI2luY2x1ZGUgPHd0 Zi9QYXNzT3duUHRyLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAgLTQ2LDkgKzQ2 LDcgQEAgRFJURGV2VG9vbHNDbGllbnQ6OkRSVERldlRvb2xzQ2xpZW50KERSVAogICAgIDogbV93 ZWJWaWV3KHdlYlZpZXcpCiAgICAgLCBtX2RydERldlRvb2xzQWdlbnQoYWdlbnQpCiB7Ci0gICAg bV93ZWJEZXZUb29sc0Zyb250ZW5kLnNldChXZWJEZXZUb29sc0Zyb250ZW5kOjpjcmVhdGUobV93 ZWJWaWV3LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRoaXMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgV2ViU3RyaW5nOjpmcm9tVVRGOCgiZW4tVVMiKSkpOworICAgIG1f d2ViRGV2VG9vbHNGcm9udGVuZCA9IGFkb3B0UHRyKFdlYkRldlRvb2xzRnJvbnRlbmQ6OmNyZWF0 ZShtX3dlYlZpZXcsIHRoaXMsIFdlYlN0cmluZzo6ZnJvbVVURjgoImVuLVVTIikpKTsKICAgICBt X2RydERldlRvb2xzQWdlbnQtPmF0dGFjaCh0aGlzKTsKIH0KIApJbmRleDogVG9vbHMvRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vVGVzdEV2ZW50UHJpbnRlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdEV2ZW50UHJpbnRlci5jcHAJKHJldmlzaW9u IDg0ODg2KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdEV2ZW50UHJpbnRl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5LDE0ICs1OSwxNCBAQCBwdWJsaWM6CiAgICAgdm9p ZCBoYW5kbGVUZXN0Rm9vdGVyKGJvb2wgZHVtcGVkQW55dGhpbmcpIGNvbnN0OwogfTsKIAotVGVz dEV2ZW50UHJpbnRlciogVGVzdEV2ZW50UHJpbnRlcjo6Y3JlYXRlRFJUUHJpbnRlcigpCitQYXNz T3duUHRyPFRlc3RFdmVudFByaW50ZXI+IFRlc3RFdmVudFByaW50ZXI6OmNyZWF0ZURSVFByaW50 ZXIoKQogewotICAgIHJldHVybiBuZXcgRFJUUHJpbnRlcjsKKyAgICByZXR1cm4gYWRvcHRQdHIo bmV3IERSVFByaW50ZXIpOwogfQogCi1UZXN0RXZlbnRQcmludGVyKiBUZXN0RXZlbnRQcmludGVy OjpjcmVhdGVUZXN0U2hlbGxQcmludGVyKCkKK1Bhc3NPd25QdHI8VGVzdEV2ZW50UHJpbnRlcj4g VGVzdEV2ZW50UHJpbnRlcjo6Y3JlYXRlVGVzdFNoZWxsUHJpbnRlcigpCiB7Ci0gICAgcmV0dXJu IG5ldyBUZXN0U2hlbGxQcmludGVyOworICAgIHJldHVybiBhZG9wdFB0cihuZXcgVGVzdFNoZWxs UHJpbnRlcik7CiB9CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1Rlc3RFdmVudFByaW50ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9UZXN0RXZlbnRQcmludGVyLmgJKHJldmlzaW9uIDg0ODg2KQorKysgVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdEV2ZW50UHJpbnRlci5oCSh3b3JraW5nIGNv cHkpCkBAIC0zMSwxMCArMzEsMTIgQEAKICNpZm5kZWYgVGVzdEV2ZW50UHJpbnRlcl9oCiAjZGVm aW5lIFRlc3RFdmVudFByaW50ZXJfaAogCisjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKwog Y2xhc3MgVGVzdEV2ZW50UHJpbnRlciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFRlc3RFdmVudFBy aW50ZXIqIGNyZWF0ZURSVFByaW50ZXIoKTsKLSAgICBzdGF0aWMgVGVzdEV2ZW50UHJpbnRlciog Y3JlYXRlVGVzdFNoZWxsUHJpbnRlcigpOworICAgIHN0YXRpYyBQYXNzT3duUHRyPFRlc3RFdmVu dFByaW50ZXI+IGNyZWF0ZURSVFByaW50ZXIoKTsKKyAgICBzdGF0aWMgUGFzc093blB0cjxUZXN0 RXZlbnRQcmludGVyPiBjcmVhdGVUZXN0U2hlbGxQcmludGVyKCk7CiAKICAgICB2aXJ0dWFsIHZv aWQgaGFuZGxlVGVzdEhlYWRlcihjb25zdCBjaGFyKiB1cmwpIGNvbnN0ID0gMDsKICAgICB2aXJ0 dWFsIHZvaWQgaGFuZGxlVGltZWRPdXQoKSBjb25zdCA9IDA7CkluZGV4OiBUb29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAJKHJldmlzaW9uIDg0ODg2KQorKysgVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTExLDEzICsxMTEsMTMgQEAgVGVzdFNoZWxsOjpUZXN0U2hlbGwoYm9vbCB0ZXN0U2hlbGxN b2RlKQogICAgIFdlYlJ1bnRpbWVGZWF0dXJlczo6ZW5hYmxlSW5kZXhlZERhdGFiYXNlKHRydWUp OwogICAgIFdlYlJ1bnRpbWVGZWF0dXJlczo6ZW5hYmxlRmlsZVN5c3RlbSh0cnVlKTsKICAgICBX ZWJSdW50aW1lRmVhdHVyZXM6OmVuYWJsZUphdmFTY3JpcHRJMThOQVBJKHRydWUpOwotICAgIG1f YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuc2V0KG5ldyBBY2Nlc3NpYmlsaXR5Q29udHJvbGxlcih0 aGlzKSk7Ci0gICAgbV9sYXlvdXRUZXN0Q29udHJvbGxlci5zZXQobmV3IExheW91dFRlc3RDb250 cm9sbGVyKHRoaXMpKTsKLSAgICBtX2V2ZW50U2VuZGVyLnNldChuZXcgRXZlbnRTZW5kZXIodGhp cykpOwotICAgIG1fcGxhaW5UZXh0Q29udHJvbGxlci5zZXQobmV3IFBsYWluVGV4dENvbnRyb2xs ZXIoKSk7Ci0gICAgbV90ZXh0SW5wdXRDb250cm9sbGVyLnNldChuZXcgVGV4dElucHV0Q29udHJv bGxlcih0aGlzKSk7Ci0gICAgbV9ub3RpZmljYXRpb25QcmVzZW50ZXIuc2V0KG5ldyBOb3RpZmlj YXRpb25QcmVzZW50ZXIodGhpcykpOwotICAgIG1fcHJpbnRlci5zZXQobV90ZXN0U2hlbGxNb2Rl ID8gVGVzdEV2ZW50UHJpbnRlcjo6Y3JlYXRlVGVzdFNoZWxsUHJpbnRlcigpIDogVGVzdEV2ZW50 UHJpbnRlcjo6Y3JlYXRlRFJUUHJpbnRlcigpKTsKKyAgICBtX2FjY2Vzc2liaWxpdHlDb250cm9s bGVyID0gYWRvcHRQdHIobmV3IEFjY2Vzc2liaWxpdHlDb250cm9sbGVyKHRoaXMpKTsKKyAgICBt X2xheW91dFRlc3RDb250cm9sbGVyID0gYWRvcHRQdHIobmV3IExheW91dFRlc3RDb250cm9sbGVy KHRoaXMpKTsKKyAgICBtX2V2ZW50U2VuZGVyID0gYWRvcHRQdHIobmV3IEV2ZW50U2VuZGVyKHRo aXMpKTsKKyAgICBtX3BsYWluVGV4dENvbnRyb2xsZXIgPSBhZG9wdFB0cihuZXcgUGxhaW5UZXh0 Q29udHJvbGxlcigpKTsKKyAgICBtX3RleHRJbnB1dENvbnRyb2xsZXIgPSBhZG9wdFB0cihuZXcg VGV4dElucHV0Q29udHJvbGxlcih0aGlzKSk7CisgICAgbV9ub3RpZmljYXRpb25QcmVzZW50ZXIg PSBhZG9wdFB0cihuZXcgTm90aWZpY2F0aW9uUHJlc2VudGVyKHRoaXMpKTsKKyAgICBtX3ByaW50 ZXIgPSBtX3Rlc3RTaGVsbE1vZGUgPyBUZXN0RXZlbnRQcmludGVyOjpjcmVhdGVUZXN0U2hlbGxQ cmludGVyKCkgOiBUZXN0RXZlbnRQcmludGVyOjpjcmVhdGVEUlRQcmludGVyKCk7CiAKICAgICAv LyAzMCBzZWNvbmQgaXMgdGhlIHNhbWUgYXMgdGhlIHZhbHVlIGluIE1hYyBEUlQuCiAgICAgLy8g SWYgd2UgdXNlIGEgdmFsdWUgc21hbGxlciB0aGFuIHRoZSB0aW1lb3V0IHZhbHVlIG9mCkBAIC0x MzAsNyArMTMwLDcgQEAgVGVzdFNoZWxsOjpUZXN0U2hlbGwoYm9vbCB0ZXN0U2hlbGxNb2RlKQog CiB2b2lkIFRlc3RTaGVsbDo6Y3JlYXRlTWFpbldpbmRvdygpCiB7Ci0gICAgbV9kcnREZXZUb29s c0FnZW50LnNldChuZXcgRFJURGV2VG9vbHNBZ2VudCk7CisgICAgbV9kcnREZXZUb29sc0FnZW50 ID0gYWRvcHRQdHIobmV3IERSVERldlRvb2xzQWdlbnQpOwogICAgIG1fd2ViVmlld0hvc3QgPSBj cmVhdGVOZXdXaW5kb3coV2ViVVJMKCksIG1fZHJ0RGV2VG9vbHNBZ2VudC5nZXQoKSk7CiAgICAg bV93ZWJWaWV3ID0gbV93ZWJWaWV3SG9zdC0+d2ViVmlldygpOwogICAgIG1fZHJ0RGV2VG9vbHNB Z2VudC0+c2V0V2ViVmlldyhtX3dlYlZpZXcpOwpAQCAtMTQ3LDcgKzE0Nyw3IEBAIFRlc3RTaGVs bDo6flRlc3RTaGVsbCgpCiAKIHZvaWQgVGVzdFNoZWxsOjpjcmVhdGVEUlREZXZUb29sc0NsaWVu dChEUlREZXZUb29sc0FnZW50KiBhZ2VudCkKIHsKLSAgICBtX2RydERldlRvb2xzQ2xpZW50LnNl dChuZXcgRFJURGV2VG9vbHNDbGllbnQoYWdlbnQsIG1fZGV2VG9vbHMtPndlYlZpZXcoKSkpOwor ICAgIG1fZHJ0RGV2VG9vbHNDbGllbnQgPSBhZG9wdFB0cihuZXcgRFJURGV2VG9vbHNDbGllbnQo YWdlbnQsIG1fZGV2VG9vbHMtPndlYlZpZXcoKSkpOwogfQogCiB2b2lkIFRlc3RTaGVsbDo6c2hv d0RldlRvb2xzKCkKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdI b3N0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJW aWV3SG9zdC5jcHAJKHJldmlzaW9uIDg0ODg2KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vV2ViVmlld0hvc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MDYsMjEgKzYwNiwyMSBA QCBXZWJLaXQ6OldlYkdlb2xvY2F0aW9uQ2xpZW50KiBXZWJWaWV3SG9zCiBXZWJLaXQ6OldlYkdl b2xvY2F0aW9uQ2xpZW50TW9jayogV2ViVmlld0hvc3Q6Omdlb2xvY2F0aW9uQ2xpZW50TW9jaygp CiB7CiAgICAgaWYgKCFtX2dlb2xvY2F0aW9uQ2xpZW50TW9jaykKLSAgICAgICAgbV9nZW9sb2Nh dGlvbkNsaWVudE1vY2suc2V0KFdlYkdlb2xvY2F0aW9uQ2xpZW50TW9jazo6Y3JlYXRlKCkpOwor ICAgICAgICBtX2dlb2xvY2F0aW9uQ2xpZW50TW9jayA9IGFkb3B0UHRyKFdlYkdlb2xvY2F0aW9u Q2xpZW50TW9jazo6Y3JlYXRlKCkpOwogICAgIHJldHVybiBtX2dlb2xvY2F0aW9uQ2xpZW50TW9j ay5nZXQoKTsKIH0KIAogV2ViU3BlZWNoSW5wdXRDb250cm9sbGVyKiBXZWJWaWV3SG9zdDo6c3Bl ZWNoSW5wdXRDb250cm9sbGVyKFdlYktpdDo6V2ViU3BlZWNoSW5wdXRMaXN0ZW5lciogbGlzdGVu ZXIpCiB7CiAgICAgaWYgKCFtX3NwZWVjaElucHV0Q29udHJvbGxlck1vY2spCi0gICAgICAgIG1f c3BlZWNoSW5wdXRDb250cm9sbGVyTW9jay5zZXQoV2ViU3BlZWNoSW5wdXRDb250cm9sbGVyTW9j azo6Y3JlYXRlKGxpc3RlbmVyKSk7CisgICAgICAgIG1fc3BlZWNoSW5wdXRDb250cm9sbGVyTW9j ayA9IGFkb3B0UHRyKFdlYlNwZWVjaElucHV0Q29udHJvbGxlck1vY2s6OmNyZWF0ZShsaXN0ZW5l cikpOwogICAgIHJldHVybiBtX3NwZWVjaElucHV0Q29udHJvbGxlck1vY2suZ2V0KCk7CiB9CiAK IFdlYkRldmljZU9yaWVudGF0aW9uQ2xpZW50TW9jayogV2ViVmlld0hvc3Q6OmRldmljZU9yaWVu dGF0aW9uQ2xpZW50TW9jaygpCiB7CiAgICAgaWYgKCFtX2RldmljZU9yaWVudGF0aW9uQ2xpZW50 TW9jay5nZXQoKSkKLSAgICAgICAgbV9kZXZpY2VPcmllbnRhdGlvbkNsaWVudE1vY2suc2V0KFdl YkRldmljZU9yaWVudGF0aW9uQ2xpZW50TW9jazo6Y3JlYXRlKCkpOworICAgICAgICBtX2Rldmlj ZU9yaWVudGF0aW9uQ2xpZW50TW9jayA9IGFkb3B0UHRyKFdlYkRldmljZU9yaWVudGF0aW9uQ2xp ZW50TW9jazo6Y3JlYXRlKCkpOwogICAgIHJldHVybiBtX2RldmljZU9yaWVudGF0aW9uQ2xpZW50 TW9jay5nZXQoKTsKIH0KIApAQCAtMTE5Niw3ICsxMTk2LDcgQEAgdm9pZCBXZWJWaWV3SG9zdDo6 cmVzZXQoKQogICAgIG1faXNQYWludGluZyA9IGZhbHNlOwogICAgIG1fY2FudmFzLmNsZWFyKCk7 CiAKLSAgICBtX25hdmlnYXRpb25Db250cm9sbGVyLnNldChuZXcgVGVzdE5hdmlnYXRpb25Db250 cm9sbGVyKHRoaXMpKTsKKyAgICBtX25hdmlnYXRpb25Db250cm9sbGVyID0gYWRvcHRQdHIobmV3 IFRlc3ROYXZpZ2F0aW9uQ29udHJvbGxlcih0aGlzKSk7CiAKICAgICBtX3BlbmRpbmdFeHRyYURh dGEuY2xlYXIoKTsKICAgICBtX3Jlc291cmNlSWRlbnRpZmllck1hcC5jbGVhcigpOwpAQCAtMTI4 Miw3ICsxMjgyLDcgQEAgYm9vbCBXZWJWaWV3SG9zdDo6bmF2aWdhdGUoY29uc3QgVGVzdE5hdgog ICAgIC8vIHRyZWF0ZWQgYXMgYSBicm93c2VyIGluaXRpYXRlZCBldmVudC4gIEluc3RlYWQsIHdl IHdhbnQgaXQgdG8gbG9vayBhcyBpZgogICAgIC8vIHRoZSBwYWdlIGluaXRpYXRlZCBhbnkgbG9h ZCByZXN1bHRpbmcgZnJvbSBKUyBleGVjdXRpb24uCiAgICAgaWYgKCFHVVJMKGVudHJ5LlVSTCgp KS5TY2hlbWVJcygiamF2YXNjcmlwdCIpKQotICAgICAgICBzZXRQZW5kaW5nRXh0cmFEYXRhKG5l dyBUZXN0U2hlbGxFeHRyYURhdGEoZW50cnkucGFnZUlEKCkpKTsKKyAgICAgICAgc2V0UGVuZGlu Z0V4dHJhRGF0YShhZG9wdFB0cihuZXcgVGVzdFNoZWxsRXh0cmFEYXRhKGVudHJ5LnBhZ2VJRCgp KSkpOwogCiAgICAgLy8gSWYgd2UgYXJlIHJlbG9hZGluZywgdGhlbiBXZWJLaXQgd2lsbCB1c2Ug dGhlIHN0YXRlIG9mIHRoZSBjdXJyZW50IHBhZ2UuCiAgICAgLy8gT3RoZXJ3aXNlLCB3ZSBnaXZl IGl0IHRoZSBzdGF0ZSB0byBuYXZpZ2F0ZSB0by4KQEAgLTEyOTcsNyArMTI5Nyw3IEBAIGJvb2wg V2ViVmlld0hvc3Q6Om5hdmlnYXRlKGNvbnN0IFRlc3ROYXYKICAgICB9CiAKICAgICAvLyBJbiBj YXNlIExvYWRSZXF1ZXN0IGZhaWxlZCBiZWZvcmUgRGlkQ3JlYXRlRGF0YVNvdXJjZSB3YXMgY2Fs bGVkLgotICAgIHNldFBlbmRpbmdFeHRyYURhdGEoMCk7CisgICAgc2V0UGVuZGluZ0V4dHJhRGF0 YShQYXNzT3duUHRyPFRlc3RTaGVsbEV4dHJhRGF0YT4oKSk7CiAKICAgICAvLyBSZXN0b3JlIGZv Y3VzIHRvIHRoZSBtYWluIGZyYW1lIHByaW9yIHRvIGxvYWRpbmcgbmV3IHJlcXVlc3QuCiAgICAg Ly8gVGhpcyBtYWtlcyBzdXJlIHRoYXQgd2UgZG9uJ3QgaGF2ZSBhIGZvY3VzZWQgaWZyYW1lLiBP dGhlcndpc2UsIHRoYXQKQEAgLTE0MzIsOSArMTQzMiw5IEBAIHZvaWQgV2ViVmlld0hvc3Q6OnBy aW50UmVzb3VyY2VEZXNjcmlwdGkKICAgICBwcmludGYoIiVzIiwgaXQgIT0gbV9yZXNvdXJjZUlk ZW50aWZpZXJNYXAuZW5kKCkgPyBpdC0+c2Vjb25kLmNfc3RyKCkgOiAiPHVua25vd24+Iik7CiB9 CiAKLXZvaWQgV2ViVmlld0hvc3Q6OnNldFBlbmRpbmdFeHRyYURhdGEoVGVzdFNoZWxsRXh0cmFE YXRhKiBleHRyYURhdGEpCit2b2lkIFdlYlZpZXdIb3N0OjpzZXRQZW5kaW5nRXh0cmFEYXRhKFBh c3NPd25QdHI8VGVzdFNoZWxsRXh0cmFEYXRhPiBleHRyYURhdGEpCiB7Ci0gICAgbV9wZW5kaW5n RXh0cmFEYXRhLnNldChleHRyYURhdGEpOworICAgIG1fcGVuZGluZ0V4dHJhRGF0YSA9IGV4dHJh RGF0YTsKIH0KIAogdm9pZCBXZWJWaWV3SG9zdDo6c2V0UGFnZVRpdGxlKGNvbnN0IFdlYlN0cmlu ZyYpCkBAIC0xNTE5LDggKzE1MTksNyBAQCBTa0NhbnZhcyogV2ViVmlld0hvc3Q6OmNhbnZhcygp CiAgICAgICAgIHJldHVybiBtX2NhbnZhcy5nZXQoKTsKICAgICBXZWJTaXplIHdpZGdldFNpemUg PSB3ZWJXaWRnZXQoKS0+c2l6ZSgpOwogICAgIHJlc2V0U2Nyb2xsUmVjdCgpOwotICAgIG1fY2Fu dmFzLnNldChza2lhOjpDcmVhdGVCaXRtYXBDYW52YXMoCi0gICAgICAgIHdpZGdldFNpemUud2lk dGgsIHdpZGdldFNpemUuaGVpZ2h0LCB0cnVlKSk7CisgICAgbV9jYW52YXMgPSBhZG9wdFB0cihz a2lhOjpDcmVhdGVCaXRtYXBDYW52YXMod2lkZ2V0U2l6ZS53aWR0aCwgd2lkZ2V0U2l6ZS5oZWln aHQsIHRydWUpKTsKICAgICByZXR1cm4gbV9jYW52YXMuZ2V0KCk7CiB9CiAKSW5kZXg6IFRvb2xz L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaAkocmV2aXNpb24gODQ4ODYp CisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCSh3b3JraW5n IGNvcHkpCkBAIC04MSw3ICs4MSw3IEBAIGNsYXNzIFdlYlZpZXdIb3N0IDogcHVibGljIFdlYktp dDo6V2ViU3AKICAgICB2b2lkIHNldFJlcXVlc3RSZXR1cm5OdWxsKGJvb2wgcmV0dXJuTnVsbCkg eyBtX3JlcXVlc3RSZXR1cm5OdWxsID0gcmV0dXJuTnVsbDsgfQogICAgIHZvaWQgc2V0RWRpdENv bW1hbmQoY29uc3Qgc3RkOjpzdHJpbmcmIG5hbWUsIGNvbnN0IHN0ZDo6c3RyaW5nJiB2YWx1ZSk7 CiAgICAgdm9pZCBjbGVhckVkaXRDb21tYW5kKCk7Ci0gICAgdm9pZCBzZXRQZW5kaW5nRXh0cmFE YXRhKFRlc3RTaGVsbEV4dHJhRGF0YSopOworICAgIHZvaWQgc2V0UGVuZGluZ0V4dHJhRGF0YShQ YXNzT3duUHRyPFRlc3RTaGVsbEV4dHJhRGF0YT4pOwogCiAgICAgdm9pZCBwYWludFJlY3QoY29u c3QgV2ViS2l0OjpXZWJSZWN0Jik7CiAgICAgdm9pZCB1cGRhdGVQYWludFJlY3QoY29uc3QgV2Vi S2l0OjpXZWJSZWN0Jik7Cg==