144779 2015-05-07 18:17:00 -0700 Clean up some possible RefPtr to PassRefPtr churn 2016-09-07 21:42:21 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck commit-queue joepeck oldest_to_newest 1092942 0 joepeck 2015-05-07 18:17:00 -0700 * SUMMARY Clean up some possible RefPtr to PassRefPtr churn. There are a few cases where the last use of a RefPtr can be releasing and isn't. This could likely converted to rvalue references, but for now just using release() should save a ref churn. 1092944 1 252670 joepeck 2015-05-07 18:18:51 -0700 Created attachment 252670 [PATCH] Proposed Fix Lets see what the bots think of this. 1092959 2 252670 joepeck 2015-05-07 18:31:37 -0700 Comment on attachment 252670 [PATCH] Proposed Fix LayoutTests/js tests passed for me locally. 1093602 3 252670 darin 2015-05-10 15:15:38 -0700 Comment on attachment 252670 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=252670&action=review Breaks the GTK build. > Source/JavaScriptCore/ChangeLog:20 > + Release the last use of a RefPtr as it is passed on. Need to move these call sites to RefPtr or Ref instead of PassRefPtr: <http://www.webkit.org/coding/RefPtr.html>. Then the issue will still exist, but in far fewer cases because the compiler will do the move optimization since it can see the lifetimes. > Source/JavaScriptCore/runtime/GenericTypedArrayViewInlines.h:70 > + return adoptRef(new GenericTypedArrayView(buffer.release(), byteOffset, length)); platform/graphics/ISOVTTCue.cpp.o:ISOVTTCue.cpp:function WebCore::ISOBox::peekString(JSC::ArrayBuffer*, unsigned int, unsigned int): error: undefined reference to 'JSC::GenericTypedArrayView<JSC::Uint8Adaptor>::create(WTF::PassRefPtr<JSC::ArrayBuffer>, unsigned int, unsigned int)' 1094527 4 252670 joepeck 2015-05-13 12:24:33 -0700 Comment on attachment 252670 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=252670&action=review >> Source/JavaScriptCore/runtime/GenericTypedArrayViewInlines.h:70 >> + return adoptRef(new GenericTypedArrayView(buffer.release(), byteOffset, length)); > > platform/graphics/ISOVTTCue.cpp.o:ISOVTTCue.cpp:function WebCore::ISOBox::peekString(JSC::ArrayBuffer*, unsigned int, unsigned int): error: undefined reference to 'JSC::GenericTypedArrayView<JSC::Uint8Adaptor>::create(WTF::PassRefPtr<JSC::ArrayBuffer>, unsigned int, unsigned int)' Hmm, I don't understand the error. I'm not changing the signature of anything and the error messages don't mention an error inside the inline code, just that the top level method is not available. Maybe "undefined reference to" might mean it doesn't have an include it needs to TypedArrayInlines? How would this have worked before? 1094541 5 253048 joepeck 2015-05-13 12:33:08 -0700 Created attachment 253048 [PATCH] For Bots 1094568 6 253055 joepeck 2015-05-13 13:41:06 -0700 Created attachment 253055 [PATCH] For Bots 1094668 7 253055 joepeck 2015-05-13 17:43:29 -0700 Comment on attachment 253055 [PATCH] For Bots Yay. Seems it might have just been missing includes. 1094682 8 253055 commit-queue 2015-05-13 18:35:36 -0700 Comment on attachment 253055 [PATCH] For Bots Clearing flags on attachment: 253055 Committed r184325: <http://trac.webkit.org/changeset/184325> 252670 2015-05-07 18:18:51 -0700 2015-05-10 15:15:38 -0700 [PATCH] Proposed Fix release.patch text/plain 6758 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGI1MmViZTcuLmRmYWUxNDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE1LTA1LTA3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4gdXAgc29tZSBwb3NzaWJs ZSBSZWZQdHIgdG8gUGFzc1JlZlB0ciBjaHVybgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0Nzc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBydW50aW1lL0dlbmVyaWNUeXBlZEFycmF5Vmlld0lubGlu ZXMuaDoKKyAgICAgICAgKEpTQzo6R2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+OjpjcmVh dGUpOgorICAgICAgICAoSlNDOjpHZW5lcmljVHlwZWRBcnJheVZpZXc8QWRhcHRvcj46OmNyZWF0 ZVVuaW5pdGlhbGl6ZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNBcnJheUJ1ZmZlckNvbnN0cnVj dG9yLmNwcDoKKyAgICAgICAgKEpTQzo6Y29uc3RydWN0QXJyYXlCdWZmZXIpOgorICAgICAgICAq IHJ1bnRpbWUvU3RydWN0dXJlLmNwcDoKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjp0b1N0cnVj dHVyZVNoYXBlKToKKyAgICAgICAgKiBydW50aW1lL1R5cGVkQXJyYXlCYXNlLmg6CisgICAgICAg IChKU0M6OlR5cGVkQXJyYXlCYXNlOjpjcmVhdGUpOgorICAgICAgICAoSlNDOjpUeXBlZEFycmF5 QmFzZTo6Y3JlYXRlVW5pbml0aWFsaXplZCk6CisgICAgICAgICogdG9vbHMvRnVuY3Rpb25PdmVy cmlkZXMuY3BwOgorICAgICAgICAoSlNDOjppbml0aWFsaXplT3ZlcnJpZGVJbmZvKToKKyAgICAg ICAgUmVsZWFzZSB0aGUgbGFzdCB1c2Ugb2YgYSBSZWZQdHIgYXMgaXQgaXMgcGFzc2VkIG9uLgor CisyMDE1LTA1LTA3ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAg ICAgICAgQXZvaWQgYWx3YXlzIHJ1bm5pbmcgc29tZSBkZWJ1ZyBjb2RlIGluIHR5cGUgcHJvZmls aW5nCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ3 NzUKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2VuZXJpY1R5 cGVkQXJyYXlWaWV3SW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2Vu ZXJpY1R5cGVkQXJyYXlWaWV3SW5saW5lcy5oCmluZGV4IGFiNjliZTUuLmUzMjNhYjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0dlbmVyaWNUeXBlZEFycmF5Vmll d0lubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HZW5lcmljVHlw ZWRBcnJheVZpZXdJbmxpbmVzLmgKQEAgLTQ1LDcgKzQ1LDcgQEAgUGFzc1JlZlB0cjxHZW5lcmlj VHlwZWRBcnJheVZpZXc8QWRhcHRvcj4+IEdlbmVyaWNUeXBlZEFycmF5VmlldzxBZGFwdG9yPjo6 Y3JlYXQKICAgICBSZWZQdHI8QXJyYXlCdWZmZXI+IGJ1ZmZlciA9IEFycmF5QnVmZmVyOjpjcmVh dGUobGVuZ3RoLCBzaXplb2YodHlwZW5hbWUgQWRhcHRvcjo6VHlwZSkpOwogICAgIGlmICghYnVm ZmVyKQogICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gY3JlYXRlKGJ1ZmZlciwgMCwgbGVu Z3RoKTsKKyAgICByZXR1cm4gY3JlYXRlKGJ1ZmZlci5yZWxlYXNlKCksIDAsIGxlbmd0aCk7CiB9 CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEFkYXB0b3I+CkBAIC01NCw3ICs1NCw3IEBAIFBhc3NSZWZQ dHI8R2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+PiBHZW5lcmljVHlwZWRBcnJheVZpZXc8 QWRhcHRvcj46OmNyZWF0CiB7CiAgICAgUmVmUHRyPEdlbmVyaWNUeXBlZEFycmF5Vmlldz4gcmVz dWx0ID0gY3JlYXRlKGxlbmd0aCk7CiAgICAgbWVtY3B5KHJlc3VsdC0+ZGF0YSgpLCBhcnJheSwg bGVuZ3RoICogc2l6ZW9mKHR5cGVuYW1lIEFkYXB0b3I6OlR5cGUpKTsKLSAgICByZXR1cm4gcmVz dWx0OworICAgIHJldHVybiByZXN1bHQucmVsZWFzZSgpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFt ZSBBZGFwdG9yPgpAQCAtNjcsNyArNjcsNyBAQCBQYXNzUmVmUHRyPEdlbmVyaWNUeXBlZEFycmF5 VmlldzxBZGFwdG9yPj4gR2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+OjpjcmVhdAogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAgICAgCi0gICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBHZW5lcmljVHlwZWRBcnJheVZpZXcoYnVmZmVyLCBieXRlT2Zmc2V0LCBsZW5ndGgpKTsKKyAg ICByZXR1cm4gYWRvcHRSZWYobmV3IEdlbmVyaWNUeXBlZEFycmF5VmlldyhidWZmZXIucmVsZWFz ZSgpLCBieXRlT2Zmc2V0LCBsZW5ndGgpKTsKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgQWRhcHRv cj4KQEAgLTc4LDcgKzc4LDcgQEAgR2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+OjpjcmVh dGVVbmluaXRpYWxpemVkKHVuc2lnbmVkIGxlbmd0aCkKICAgICAgICAgQXJyYXlCdWZmZXI6OmNy ZWF0ZVVuaW5pdGlhbGl6ZWQobGVuZ3RoLCBzaXplb2YodHlwZW5hbWUgQWRhcHRvcjo6VHlwZSkp OwogICAgIGlmICghYnVmZmVyKQogICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gY3JlYXRl KGJ1ZmZlciwgMCwgbGVuZ3RoKTsKKyAgICByZXR1cm4gY3JlYXRlKGJ1ZmZlci5yZWxlYXNlKCks IDAsIGxlbmd0aCk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEFkYXB0b3I+CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5QnVmZmVyQ29uc3RydWN0b3Iu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNBcnJheUJ1ZmZlckNvbnN0cnVj dG9yLmNwcAppbmRleCA0MWFmYmUxLi4zZDE0YTllIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU0FycmF5QnVmZmVyQ29uc3RydWN0b3IuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvci5jcHAKQEAg LTk1LDcgKzk1LDcgQEAgc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgY29uc3Ry dWN0QXJyYXlCdWZmZXIoRXhlY1N0YXRlKiBleGVjKQogICAgICAgICByZXR1cm4gdGhyb3dWTUVy cm9yKGV4ZWMsIGNyZWF0ZU91dE9mTWVtb3J5RXJyb3IoZXhlYykpOwogICAgIAogICAgIEpTQXJy YXlCdWZmZXIqIHJlc3VsdCA9IEpTQXJyYXlCdWZmZXI6OmNyZWF0ZSgKLSAgICAgICAgZXhlYy0+ dm0oKSwgY29uc3RydWN0b3ItPmdsb2JhbE9iamVjdCgpLT5hcnJheUJ1ZmZlclN0cnVjdHVyZSgp LCBidWZmZXIpOworICAgICAgICBleGVjLT52bSgpLCBjb25zdHJ1Y3Rvci0+Z2xvYmFsT2JqZWN0 KCktPmFycmF5QnVmZmVyU3RydWN0dXJlKCksIGJ1ZmZlci5yZWxlYXNlKCkpOwogICAgIAogICAg IHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9TdHJ1Y3R1cmUuY3BwCmluZGV4IDk5OTg1NzguLmMxZjcxNGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmNwcApAQCAtMTA1Miw3ICsxMDUy LDYgQEAgUGFzc1JlZlB0cjxTdHJ1Y3R1cmVTaGFwZT4gU3RydWN0dXJlOjp0b1N0cnVjdHVyZVNo YXBlKEpTVmFsdWUgdmFsdWUpCiAgICAgICAgICAgICAgICAgY3VyU2hhcGUtPmFkZFByb3BlcnR5 KHN0cnVjdHVyZS0+bV9uYW1lSW5QcmV2aW91cy5nZXQoKSk7CiAgICAgICAgIH0KIAotICAgICAg ICAKICAgICAgICAgaWYgKEpTT2JqZWN0KiBjdXJPYmplY3QgPSBjdXJWYWx1ZS5nZXRPYmplY3Qo KSkKICAgICAgICAgICAgIGN1clNoYXBlLT5zZXRDb25zdHJ1Y3Rvck5hbWUoSlNPYmplY3Q6OmNh bGN1bGF0ZWRDbGFzc05hbWUoY3VyT2JqZWN0KSk7CiAgICAgICAgIGVsc2UKQEAgLTEwNjYsNyAr MTA2NSw3IEBAIFBhc3NSZWZQdHI8U3RydWN0dXJlU2hhcGU+IFN0cnVjdHVyZTo6dG9TdHJ1Y3R1 cmVTaGFwZShKU1ZhbHVlIHZhbHVlKQogICAgICAgICBpZiAoY3VyU3RydWN0dXJlLT5zdG9yZWRQ cm90b3R5cGVTdHJ1Y3R1cmUoKSkgewogICAgICAgICAgICAgUmVmUHRyPFN0cnVjdHVyZVNoYXBl PiBuZXdTaGFwZSA9IFN0cnVjdHVyZVNoYXBlOjpjcmVhdGUoKTsKICAgICAgICAgICAgIGN1clNo YXBlLT5zZXRQcm90byhuZXdTaGFwZSk7Ci0gICAgICAgICAgICBjdXJTaGFwZSA9IG5ld1NoYXBl OworICAgICAgICAgICAgY3VyU2hhcGUgPSBuZXdTaGFwZS5yZWxlYXNlKCk7CiAgICAgICAgICAg ICBjdXJWYWx1ZSA9IGN1clN0cnVjdHVyZS0+c3RvcmVkUHJvdG90eXBlKCk7CiAgICAgICAgIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVHlwZWRBcnJheUJh c2UuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1R5cGVkQXJyYXlCYXNlLmgKaW5k ZXggODY5NGI1NS4uZDY0OGZjZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvVHlwZWRBcnJheUJhc2UuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9UeXBlZEFycmF5QmFzZS5oCkBAIC05NCw3ICs5NCw3IEBAIHByb3RlY3RlZDoKICAgICAgICAg UmVmUHRyPEFycmF5QnVmZmVyPiBidWZmZXIgPSBBcnJheUJ1ZmZlcjo6Y3JlYXRlKGxlbmd0aCwg c2l6ZW9mKFQpKTsKICAgICAgICAgaWYgKCFidWZmZXIuZ2V0KCkpCiAgICAgICAgICAgICByZXR1 cm4gMDsKLSAgICAgICAgcmV0dXJuIGNyZWF0ZTxTdWJjbGFzcz4oYnVmZmVyLCAwLCBsZW5ndGgp OworICAgICAgICByZXR1cm4gY3JlYXRlPFN1YmNsYXNzPihidWZmZXIucmVsZWFzZSgpLCAwLCBs ZW5ndGgpOwogICAgIH0KIAogICAgIHRlbXBsYXRlIDxjbGFzcyBTdWJjbGFzcz4KQEAgLTEwNCw3 ICsxMDQsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIGlmIChhKQogICAgICAgICAgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKQogICAgICAgICAgICAgICAgIGEtPnNldChp LCBhcnJheVtpXSk7Ci0gICAgICAgIHJldHVybiBhOworICAgICAgICByZXR1cm4gYS5yZWxlYXNl KCk7CiAgICAgfQogCiAgICAgdGVtcGxhdGUgPGNsYXNzIFN1YmNsYXNzPgpAQCAtMTE0LDcgKzEx NCw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgaWYgKCF2ZXJpZnlTdWJSYW5nZTxUPihidWYsIGJ5 dGVPZmZzZXQsIGxlbmd0aCkpCiAgICAgICAgICAgICByZXR1cm4gMDsKIAotICAgICAgICByZXR1 cm4gYWRvcHRSZWYobmV3IFN1YmNsYXNzKGJ1ZiwgYnl0ZU9mZnNldCwgbGVuZ3RoKSk7CisgICAg ICAgIHJldHVybiBhZG9wdFJlZihuZXcgU3ViY2xhc3MoYnVmLnJlbGVhc2UoKSwgYnl0ZU9mZnNl dCwgbGVuZ3RoKSk7CiAgICAgfQogCiAgICAgdGVtcGxhdGUgPGNsYXNzIFN1YmNsYXNzPgpAQCAt MTIzLDcgKzEyMyw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgUmVmUHRyPEFycmF5QnVmZmVyPiBi dWZmZXIgPSBBcnJheUJ1ZmZlcjo6Y3JlYXRlVW5pbml0aWFsaXplZChsZW5ndGgsIHNpemVvZihU KSk7CiAgICAgICAgIGlmICghYnVmZmVyLmdldCgpKQogICAgICAgICAgICAgcmV0dXJuIDA7Ci0g ICAgICAgIHJldHVybiBjcmVhdGU8U3ViY2xhc3M+KGJ1ZmZlciwgMCwgbGVuZ3RoKTsKKyAgICAg ICAgcmV0dXJuIGNyZWF0ZTxTdWJjbGFzcz4oYnVmZmVyLnJlbGVhc2UoKSwgMCwgbGVuZ3RoKTsK ICAgICB9CiAKICAgICB0ZW1wbGF0ZSA8Y2xhc3MgU3ViY2xhc3M+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvRnVuY3Rpb25PdmVycmlkZXMuY3BwIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3Rvb2xzL0Z1bmN0aW9uT3ZlcnJpZGVzLmNwcAppbmRleCAyMzUzMWJiLi4y MDM0ZDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvRnVuY3Rpb25P dmVycmlkZXMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9GdW5jdGlvbk92 ZXJyaWRlcy5jcHAKQEAgLTEyNyw3ICsxMjcsNyBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplT3Zl cnJpZGVJbmZvKGNvbnN0IFNvdXJjZUNvZGUmIG9yaWdDb2RlLCBjb25zdCBTdHJpbmcmIG5ldwog ICAgIGluZm8udHlwZVByb2ZpbGluZ0VuZE9mZnNldCA9IG5ld1Byb3ZpZGVyU3RyLmxlbmd0aCgp IC0gMTsKIAogICAgIGluZm8uc291cmNlQ29kZSA9Ci0gICAgICAgIFNvdXJjZUNvZGUobmV3UHJv dmlkZXIsIGluZm8udHlwZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0LCBpbmZvLnR5cGVQcm9maWxpbmdF bmRPZmZzZXQgKyAxLCAxLCAxKTsKKyAgICAgICAgU291cmNlQ29kZShuZXdQcm92aWRlci5yZWxl YXNlKCksIGluZm8udHlwZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0LCBpbmZvLnR5cGVQcm9maWxpbmdF bmRPZmZzZXQgKyAxLCAxLCAxKTsKIH0KICAgICAKIGJvb2wgRnVuY3Rpb25PdmVycmlkZXM6Omlu aXRpYWxpemVPdmVycmlkZUZvcihjb25zdCBTb3VyY2VDb2RlJiBvcmlnQ29kZSwgRnVuY3Rpb25P dmVycmlkZXM6Ok92ZXJyaWRlSW5mbyYgcmVzdWx0KQo= 253048 2015-05-13 12:33:08 -0700 2015-05-13 13:41:06 -0700 [PATCH] For Bots cleanup-2.patch text/plain 7256 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDQ5NmZlZjAuLjkzMzFhNjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE1LTA1LTEzICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4gdXAgc29tZSBwb3NzaWJs ZSBSZWZQdHIgdG8gUGFzc1JlZlB0ciBjaHVybgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0Nzc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCisKKyAgICAgICAgKiBydW50aW1lL0dlbmVyaWNUeXBlZEFycmF5Vmlld0lubGluZXMu aDoKKyAgICAgICAgKEpTQzo6R2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+OjpjcmVhdGUp OgorICAgICAgICAoSlNDOjpHZW5lcmljVHlwZWRBcnJheVZpZXc8QWRhcHRvcj46OmNyZWF0ZVVu aW5pdGlhbGl6ZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNBcnJheUJ1ZmZlckNvbnN0cnVjdG9y LmNwcDoKKyAgICAgICAgKEpTQzo6Y29uc3RydWN0QXJyYXlCdWZmZXIpOgorICAgICAgICAqIHJ1 bnRpbWUvU3RydWN0dXJlLmNwcDoKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjp0b1N0cnVjdHVy ZVNoYXBlKToKKyAgICAgICAgKiBydW50aW1lL1R5cGVkQXJyYXlCYXNlLmg6CisgICAgICAgIChK U0M6OlR5cGVkQXJyYXlCYXNlOjpjcmVhdGUpOgorICAgICAgICAoSlNDOjpUeXBlZEFycmF5QmFz ZTo6Y3JlYXRlVW5pbml0aWFsaXplZCk6CisgICAgICAgICogdG9vbHMvRnVuY3Rpb25PdmVycmlk ZXMuY3BwOgorICAgICAgICAoSlNDOjppbml0aWFsaXplT3ZlcnJpZGVJbmZvKToKKyAgICAgICAg UmVsZWFzZSB0aGUgbGFzdCB1c2Ugb2YgYSBSZWZQdHIgYXMgaXQgaXMgcGFzc2VkIG9uLgorCisy MDE1LTA1LTEzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAg ICAgQXZvaWQgYWx3YXlzIHJ1bm5pbmcgc29tZSBkZWJ1ZyBjb2RlIGluIHR5cGUgcHJvZmlsaW5n CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ3NzUK IApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2VuZXJpY1R5cGVk QXJyYXlWaWV3SW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2VuZXJp Y1R5cGVkQXJyYXlWaWV3SW5saW5lcy5oCmluZGV4IGFiNjliZTUuLmUzMjNhYjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0dlbmVyaWNUeXBlZEFycmF5Vmlld0lu bGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HZW5lcmljVHlwZWRB cnJheVZpZXdJbmxpbmVzLmgKQEAgLTQ1LDcgKzQ1LDcgQEAgUGFzc1JlZlB0cjxHZW5lcmljVHlw ZWRBcnJheVZpZXc8QWRhcHRvcj4+IEdlbmVyaWNUeXBlZEFycmF5VmlldzxBZGFwdG9yPjo6Y3Jl YXQKICAgICBSZWZQdHI8QXJyYXlCdWZmZXI+IGJ1ZmZlciA9IEFycmF5QnVmZmVyOjpjcmVhdGUo bGVuZ3RoLCBzaXplb2YodHlwZW5hbWUgQWRhcHRvcjo6VHlwZSkpOwogICAgIGlmICghYnVmZmVy KQogICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gY3JlYXRlKGJ1ZmZlciwgMCwgbGVuZ3Ro KTsKKyAgICByZXR1cm4gY3JlYXRlKGJ1ZmZlci5yZWxlYXNlKCksIDAsIGxlbmd0aCk7CiB9CiAK IHRlbXBsYXRlPHR5cGVuYW1lIEFkYXB0b3I+CkBAIC01NCw3ICs1NCw3IEBAIFBhc3NSZWZQdHI8 R2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+PiBHZW5lcmljVHlwZWRBcnJheVZpZXc8QWRh cHRvcj46OmNyZWF0CiB7CiAgICAgUmVmUHRyPEdlbmVyaWNUeXBlZEFycmF5Vmlldz4gcmVzdWx0 ID0gY3JlYXRlKGxlbmd0aCk7CiAgICAgbWVtY3B5KHJlc3VsdC0+ZGF0YSgpLCBhcnJheSwgbGVu Z3RoICogc2l6ZW9mKHR5cGVuYW1lIEFkYXB0b3I6OlR5cGUpKTsKLSAgICByZXR1cm4gcmVzdWx0 OworICAgIHJldHVybiByZXN1bHQucmVsZWFzZSgpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBB ZGFwdG9yPgpAQCAtNjcsNyArNjcsNyBAQCBQYXNzUmVmUHRyPEdlbmVyaWNUeXBlZEFycmF5Vmll dzxBZGFwdG9yPj4gR2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+OjpjcmVhdAogICAgICAg ICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAgICAgCi0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBH ZW5lcmljVHlwZWRBcnJheVZpZXcoYnVmZmVyLCBieXRlT2Zmc2V0LCBsZW5ndGgpKTsKKyAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IEdlbmVyaWNUeXBlZEFycmF5VmlldyhidWZmZXIucmVsZWFzZSgp LCBieXRlT2Zmc2V0LCBsZW5ndGgpKTsKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgQWRhcHRvcj4K QEAgLTc4LDcgKzc4LDcgQEAgR2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+OjpjcmVhdGVV bmluaXRpYWxpemVkKHVuc2lnbmVkIGxlbmd0aCkKICAgICAgICAgQXJyYXlCdWZmZXI6OmNyZWF0 ZVVuaW5pdGlhbGl6ZWQobGVuZ3RoLCBzaXplb2YodHlwZW5hbWUgQWRhcHRvcjo6VHlwZSkpOwog ICAgIGlmICghYnVmZmVyKQogICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gY3JlYXRlKGJ1 ZmZlciwgMCwgbGVuZ3RoKTsKKyAgICByZXR1cm4gY3JlYXRlKGJ1ZmZlci5yZWxlYXNlKCksIDAs IGxlbmd0aCk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEFkYXB0b3I+CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5QnVmZmVyQ29uc3RydWN0b3IuY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNBcnJheUJ1ZmZlckNvbnN0cnVjdG9y LmNwcAppbmRleCA0MWFmYmUxLi4zZDE0YTllIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0FycmF5QnVmZmVyQ29uc3RydWN0b3IuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvci5jcHAKQEAgLTk1 LDcgKzk1LDcgQEAgc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgY29uc3RydWN0 QXJyYXlCdWZmZXIoRXhlY1N0YXRlKiBleGVjKQogICAgICAgICByZXR1cm4gdGhyb3dWTUVycm9y KGV4ZWMsIGNyZWF0ZU91dE9mTWVtb3J5RXJyb3IoZXhlYykpOwogICAgIAogICAgIEpTQXJyYXlC dWZmZXIqIHJlc3VsdCA9IEpTQXJyYXlCdWZmZXI6OmNyZWF0ZSgKLSAgICAgICAgZXhlYy0+dm0o KSwgY29uc3RydWN0b3ItPmdsb2JhbE9iamVjdCgpLT5hcnJheUJ1ZmZlclN0cnVjdHVyZSgpLCBi dWZmZXIpOworICAgICAgICBleGVjLT52bSgpLCBjb25zdHJ1Y3Rvci0+Z2xvYmFsT2JqZWN0KCkt PmFycmF5QnVmZmVyU3RydWN0dXJlKCksIGJ1ZmZlci5yZWxlYXNlKCkpOwogICAgIAogICAgIHJl dHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9TdHJ1Y3R1cmUuY3BwCmluZGV4IDk5OTg1NzguLmMxZjcxNGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmNwcApAQCAtMTA1Miw3ICsxMDUyLDYg QEAgUGFzc1JlZlB0cjxTdHJ1Y3R1cmVTaGFwZT4gU3RydWN0dXJlOjp0b1N0cnVjdHVyZVNoYXBl KEpTVmFsdWUgdmFsdWUpCiAgICAgICAgICAgICAgICAgY3VyU2hhcGUtPmFkZFByb3BlcnR5KHN0 cnVjdHVyZS0+bV9uYW1lSW5QcmV2aW91cy5nZXQoKSk7CiAgICAgICAgIH0KIAotICAgICAgICAK ICAgICAgICAgaWYgKEpTT2JqZWN0KiBjdXJPYmplY3QgPSBjdXJWYWx1ZS5nZXRPYmplY3QoKSkK ICAgICAgICAgICAgIGN1clNoYXBlLT5zZXRDb25zdHJ1Y3Rvck5hbWUoSlNPYmplY3Q6OmNhbGN1 bGF0ZWRDbGFzc05hbWUoY3VyT2JqZWN0KSk7CiAgICAgICAgIGVsc2UKQEAgLTEwNjYsNyArMTA2 NSw3IEBAIFBhc3NSZWZQdHI8U3RydWN0dXJlU2hhcGU+IFN0cnVjdHVyZTo6dG9TdHJ1Y3R1cmVT aGFwZShKU1ZhbHVlIHZhbHVlKQogICAgICAgICBpZiAoY3VyU3RydWN0dXJlLT5zdG9yZWRQcm90 b3R5cGVTdHJ1Y3R1cmUoKSkgewogICAgICAgICAgICAgUmVmUHRyPFN0cnVjdHVyZVNoYXBlPiBu ZXdTaGFwZSA9IFN0cnVjdHVyZVNoYXBlOjpjcmVhdGUoKTsKICAgICAgICAgICAgIGN1clNoYXBl LT5zZXRQcm90byhuZXdTaGFwZSk7Ci0gICAgICAgICAgICBjdXJTaGFwZSA9IG5ld1NoYXBlOwor ICAgICAgICAgICAgY3VyU2hhcGUgPSBuZXdTaGFwZS5yZWxlYXNlKCk7CiAgICAgICAgICAgICBj dXJWYWx1ZSA9IGN1clN0cnVjdHVyZS0+c3RvcmVkUHJvdG90eXBlKCk7CiAgICAgICAgIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVHlwZWRBcnJheUJhc2Uu aCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1R5cGVkQXJyYXlCYXNlLmgKaW5kZXgg ODY5NGI1NS4uZDY0OGZjZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvVHlwZWRBcnJheUJhc2UuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9U eXBlZEFycmF5QmFzZS5oCkBAIC05NCw3ICs5NCw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgUmVm UHRyPEFycmF5QnVmZmVyPiBidWZmZXIgPSBBcnJheUJ1ZmZlcjo6Y3JlYXRlKGxlbmd0aCwgc2l6 ZW9mKFQpKTsKICAgICAgICAgaWYgKCFidWZmZXIuZ2V0KCkpCiAgICAgICAgICAgICByZXR1cm4g MDsKLSAgICAgICAgcmV0dXJuIGNyZWF0ZTxTdWJjbGFzcz4oYnVmZmVyLCAwLCBsZW5ndGgpOwor ICAgICAgICByZXR1cm4gY3JlYXRlPFN1YmNsYXNzPihidWZmZXIucmVsZWFzZSgpLCAwLCBsZW5n dGgpOwogICAgIH0KIAogICAgIHRlbXBsYXRlIDxjbGFzcyBTdWJjbGFzcz4KQEAgLTEwNCw3ICsx MDQsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIGlmIChhKQogICAgICAgICAgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKQogICAgICAgICAgICAgICAgIGEtPnNldChpLCBh cnJheVtpXSk7Ci0gICAgICAgIHJldHVybiBhOworICAgICAgICByZXR1cm4gYS5yZWxlYXNlKCk7 CiAgICAgfQogCiAgICAgdGVtcGxhdGUgPGNsYXNzIFN1YmNsYXNzPgpAQCAtMTE0LDcgKzExNCw3 IEBAIHByb3RlY3RlZDoKICAgICAgICAgaWYgKCF2ZXJpZnlTdWJSYW5nZTxUPihidWYsIGJ5dGVP ZmZzZXQsIGxlbmd0aCkpCiAgICAgICAgICAgICByZXR1cm4gMDsKIAotICAgICAgICByZXR1cm4g YWRvcHRSZWYobmV3IFN1YmNsYXNzKGJ1ZiwgYnl0ZU9mZnNldCwgbGVuZ3RoKSk7CisgICAgICAg IHJldHVybiBhZG9wdFJlZihuZXcgU3ViY2xhc3MoYnVmLnJlbGVhc2UoKSwgYnl0ZU9mZnNldCwg bGVuZ3RoKSk7CiAgICAgfQogCiAgICAgdGVtcGxhdGUgPGNsYXNzIFN1YmNsYXNzPgpAQCAtMTIz LDcgKzEyMyw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgUmVmUHRyPEFycmF5QnVmZmVyPiBidWZm ZXIgPSBBcnJheUJ1ZmZlcjo6Y3JlYXRlVW5pbml0aWFsaXplZChsZW5ndGgsIHNpemVvZihUKSk7 CiAgICAgICAgIGlmICghYnVmZmVyLmdldCgpKQogICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAg ICAgIHJldHVybiBjcmVhdGU8U3ViY2xhc3M+KGJ1ZmZlciwgMCwgbGVuZ3RoKTsKKyAgICAgICAg cmV0dXJuIGNyZWF0ZTxTdWJjbGFzcz4oYnVmZmVyLnJlbGVhc2UoKSwgMCwgbGVuZ3RoKTsKICAg ICB9CiAKICAgICB0ZW1wbGF0ZSA8Y2xhc3MgU3ViY2xhc3M+CmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvdG9vbHMvRnVuY3Rpb25PdmVycmlkZXMuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3Rvb2xzL0Z1bmN0aW9uT3ZlcnJpZGVzLmNwcAppbmRleCAyMzUzMWJiLi4yMDM0 ZDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvRnVuY3Rpb25PdmVy cmlkZXMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9GdW5jdGlvbk92ZXJy aWRlcy5jcHAKQEAgLTEyNyw3ICsxMjcsNyBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplT3ZlcnJp ZGVJbmZvKGNvbnN0IFNvdXJjZUNvZGUmIG9yaWdDb2RlLCBjb25zdCBTdHJpbmcmIG5ldwogICAg IGluZm8udHlwZVByb2ZpbGluZ0VuZE9mZnNldCA9IG5ld1Byb3ZpZGVyU3RyLmxlbmd0aCgpIC0g MTsKIAogICAgIGluZm8uc291cmNlQ29kZSA9Ci0gICAgICAgIFNvdXJjZUNvZGUobmV3UHJvdmlk ZXIsIGluZm8udHlwZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0LCBpbmZvLnR5cGVQcm9maWxpbmdFbmRP ZmZzZXQgKyAxLCAxLCAxKTsKKyAgICAgICAgU291cmNlQ29kZShuZXdQcm92aWRlci5yZWxlYXNl KCksIGluZm8udHlwZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0LCBpbmZvLnR5cGVQcm9maWxpbmdFbmRP ZmZzZXQgKyAxLCAxLCAxKTsKIH0KICAgICAKIGJvb2wgRnVuY3Rpb25PdmVycmlkZXM6OmluaXRp YWxpemVPdmVycmlkZUZvcihjb25zdCBTb3VyY2VDb2RlJiBvcmlnQ29kZSwgRnVuY3Rpb25PdmVy cmlkZXM6Ok92ZXJyaWRlSW5mbyYgcmVzdWx0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvSVNPVlRUQ3VlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0lTT1ZUVEN1ZS5jcHAKaW5kZXggOGE5NmQ4Yi4uYTZjNGU4YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSVNPVlRUQ3VlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JU09WVFRDdWUuY3BwCkBAIC0zMCw2ICsz MCw3IEBACiAjaW5jbHVkZSA8cnVudGltZS9BcnJheUJ1ZmZlci5oPgogI2luY2x1ZGUgPHJ1bnRp bWUvRGF0YVZpZXcuaD4KICNpbmNsdWRlIDxydW50aW1lL0ludDhBcnJheS5oPgorI2luY2x1ZGUg PHJ1bnRpbWUvVHlwZWRBcnJheUlubGluZXMuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95 ZWQuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv U3RyaW5nQnVpbGRlci5oPgo= 253055 2015-05-13 13:41:06 -0700 2015-05-13 18:35:36 -0700 [PATCH] For Bots errbetter.patch text/plain 7289 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDQ5NmZlZjAuLjkzMzFhNjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE1LTA1LTEzICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4gdXAgc29tZSBwb3NzaWJs ZSBSZWZQdHIgdG8gUGFzc1JlZlB0ciBjaHVybgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0Nzc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCisKKyAgICAgICAgKiBydW50aW1lL0dlbmVyaWNUeXBlZEFycmF5Vmlld0lubGluZXMu aDoKKyAgICAgICAgKEpTQzo6R2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+OjpjcmVhdGUp OgorICAgICAgICAoSlNDOjpHZW5lcmljVHlwZWRBcnJheVZpZXc8QWRhcHRvcj46OmNyZWF0ZVVu aW5pdGlhbGl6ZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNBcnJheUJ1ZmZlckNvbnN0cnVjdG9y LmNwcDoKKyAgICAgICAgKEpTQzo6Y29uc3RydWN0QXJyYXlCdWZmZXIpOgorICAgICAgICAqIHJ1 bnRpbWUvU3RydWN0dXJlLmNwcDoKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjp0b1N0cnVjdHVy ZVNoYXBlKToKKyAgICAgICAgKiBydW50aW1lL1R5cGVkQXJyYXlCYXNlLmg6CisgICAgICAgIChK U0M6OlR5cGVkQXJyYXlCYXNlOjpjcmVhdGUpOgorICAgICAgICAoSlNDOjpUeXBlZEFycmF5QmFz ZTo6Y3JlYXRlVW5pbml0aWFsaXplZCk6CisgICAgICAgICogdG9vbHMvRnVuY3Rpb25PdmVycmlk ZXMuY3BwOgorICAgICAgICAoSlNDOjppbml0aWFsaXplT3ZlcnJpZGVJbmZvKToKKyAgICAgICAg UmVsZWFzZSB0aGUgbGFzdCB1c2Ugb2YgYSBSZWZQdHIgYXMgaXQgaXMgcGFzc2VkIG9uLgorCisy MDE1LTA1LTEzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAg ICAgQXZvaWQgYWx3YXlzIHJ1bm5pbmcgc29tZSBkZWJ1ZyBjb2RlIGluIHR5cGUgcHJvZmlsaW5n CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ3NzUK IApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2VuZXJpY1R5cGVk QXJyYXlWaWV3SW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2VuZXJp Y1R5cGVkQXJyYXlWaWV3SW5saW5lcy5oCmluZGV4IGFiNjliZTUuLmUzMjNhYjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0dlbmVyaWNUeXBlZEFycmF5Vmlld0lu bGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HZW5lcmljVHlwZWRB cnJheVZpZXdJbmxpbmVzLmgKQEAgLTQ1LDcgKzQ1LDcgQEAgUGFzc1JlZlB0cjxHZW5lcmljVHlw ZWRBcnJheVZpZXc8QWRhcHRvcj4+IEdlbmVyaWNUeXBlZEFycmF5VmlldzxBZGFwdG9yPjo6Y3Jl YXQKICAgICBSZWZQdHI8QXJyYXlCdWZmZXI+IGJ1ZmZlciA9IEFycmF5QnVmZmVyOjpjcmVhdGUo bGVuZ3RoLCBzaXplb2YodHlwZW5hbWUgQWRhcHRvcjo6VHlwZSkpOwogICAgIGlmICghYnVmZmVy KQogICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gY3JlYXRlKGJ1ZmZlciwgMCwgbGVuZ3Ro KTsKKyAgICByZXR1cm4gY3JlYXRlKGJ1ZmZlci5yZWxlYXNlKCksIDAsIGxlbmd0aCk7CiB9CiAK IHRlbXBsYXRlPHR5cGVuYW1lIEFkYXB0b3I+CkBAIC01NCw3ICs1NCw3IEBAIFBhc3NSZWZQdHI8 R2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+PiBHZW5lcmljVHlwZWRBcnJheVZpZXc8QWRh cHRvcj46OmNyZWF0CiB7CiAgICAgUmVmUHRyPEdlbmVyaWNUeXBlZEFycmF5Vmlldz4gcmVzdWx0 ID0gY3JlYXRlKGxlbmd0aCk7CiAgICAgbWVtY3B5KHJlc3VsdC0+ZGF0YSgpLCBhcnJheSwgbGVu Z3RoICogc2l6ZW9mKHR5cGVuYW1lIEFkYXB0b3I6OlR5cGUpKTsKLSAgICByZXR1cm4gcmVzdWx0 OworICAgIHJldHVybiByZXN1bHQucmVsZWFzZSgpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBB ZGFwdG9yPgpAQCAtNjcsNyArNjcsNyBAQCBQYXNzUmVmUHRyPEdlbmVyaWNUeXBlZEFycmF5Vmll dzxBZGFwdG9yPj4gR2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+OjpjcmVhdAogICAgICAg ICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAgICAgCi0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBH ZW5lcmljVHlwZWRBcnJheVZpZXcoYnVmZmVyLCBieXRlT2Zmc2V0LCBsZW5ndGgpKTsKKyAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IEdlbmVyaWNUeXBlZEFycmF5VmlldyhidWZmZXIucmVsZWFzZSgp LCBieXRlT2Zmc2V0LCBsZW5ndGgpKTsKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgQWRhcHRvcj4K QEAgLTc4LDcgKzc4LDcgQEAgR2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+OjpjcmVhdGVV bmluaXRpYWxpemVkKHVuc2lnbmVkIGxlbmd0aCkKICAgICAgICAgQXJyYXlCdWZmZXI6OmNyZWF0 ZVVuaW5pdGlhbGl6ZWQobGVuZ3RoLCBzaXplb2YodHlwZW5hbWUgQWRhcHRvcjo6VHlwZSkpOwog ICAgIGlmICghYnVmZmVyKQogICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gY3JlYXRlKGJ1 ZmZlciwgMCwgbGVuZ3RoKTsKKyAgICByZXR1cm4gY3JlYXRlKGJ1ZmZlci5yZWxlYXNlKCksIDAs IGxlbmd0aCk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEFkYXB0b3I+CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5QnVmZmVyQ29uc3RydWN0b3IuY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNBcnJheUJ1ZmZlckNvbnN0cnVjdG9y LmNwcAppbmRleCA0MWFmYmUxLi4zZDE0YTllIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0FycmF5QnVmZmVyQ29uc3RydWN0b3IuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvci5jcHAKQEAgLTk1 LDcgKzk1LDcgQEAgc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgY29uc3RydWN0 QXJyYXlCdWZmZXIoRXhlY1N0YXRlKiBleGVjKQogICAgICAgICByZXR1cm4gdGhyb3dWTUVycm9y KGV4ZWMsIGNyZWF0ZU91dE9mTWVtb3J5RXJyb3IoZXhlYykpOwogICAgIAogICAgIEpTQXJyYXlC dWZmZXIqIHJlc3VsdCA9IEpTQXJyYXlCdWZmZXI6OmNyZWF0ZSgKLSAgICAgICAgZXhlYy0+dm0o KSwgY29uc3RydWN0b3ItPmdsb2JhbE9iamVjdCgpLT5hcnJheUJ1ZmZlclN0cnVjdHVyZSgpLCBi dWZmZXIpOworICAgICAgICBleGVjLT52bSgpLCBjb25zdHJ1Y3Rvci0+Z2xvYmFsT2JqZWN0KCkt PmFycmF5QnVmZmVyU3RydWN0dXJlKCksIGJ1ZmZlci5yZWxlYXNlKCkpOwogICAgIAogICAgIHJl dHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9TdHJ1Y3R1cmUuY3BwCmluZGV4IDk5OTg1NzguLmMxZjcxNGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmNwcApAQCAtMTA1Miw3ICsxMDUyLDYg QEAgUGFzc1JlZlB0cjxTdHJ1Y3R1cmVTaGFwZT4gU3RydWN0dXJlOjp0b1N0cnVjdHVyZVNoYXBl KEpTVmFsdWUgdmFsdWUpCiAgICAgICAgICAgICAgICAgY3VyU2hhcGUtPmFkZFByb3BlcnR5KHN0 cnVjdHVyZS0+bV9uYW1lSW5QcmV2aW91cy5nZXQoKSk7CiAgICAgICAgIH0KIAotICAgICAgICAK ICAgICAgICAgaWYgKEpTT2JqZWN0KiBjdXJPYmplY3QgPSBjdXJWYWx1ZS5nZXRPYmplY3QoKSkK ICAgICAgICAgICAgIGN1clNoYXBlLT5zZXRDb25zdHJ1Y3Rvck5hbWUoSlNPYmplY3Q6OmNhbGN1 bGF0ZWRDbGFzc05hbWUoY3VyT2JqZWN0KSk7CiAgICAgICAgIGVsc2UKQEAgLTEwNjYsNyArMTA2 NSw3IEBAIFBhc3NSZWZQdHI8U3RydWN0dXJlU2hhcGU+IFN0cnVjdHVyZTo6dG9TdHJ1Y3R1cmVT aGFwZShKU1ZhbHVlIHZhbHVlKQogICAgICAgICBpZiAoY3VyU3RydWN0dXJlLT5zdG9yZWRQcm90 b3R5cGVTdHJ1Y3R1cmUoKSkgewogICAgICAgICAgICAgUmVmUHRyPFN0cnVjdHVyZVNoYXBlPiBu ZXdTaGFwZSA9IFN0cnVjdHVyZVNoYXBlOjpjcmVhdGUoKTsKICAgICAgICAgICAgIGN1clNoYXBl LT5zZXRQcm90byhuZXdTaGFwZSk7Ci0gICAgICAgICAgICBjdXJTaGFwZSA9IG5ld1NoYXBlOwor ICAgICAgICAgICAgY3VyU2hhcGUgPSBuZXdTaGFwZS5yZWxlYXNlKCk7CiAgICAgICAgICAgICBj dXJWYWx1ZSA9IGN1clN0cnVjdHVyZS0+c3RvcmVkUHJvdG90eXBlKCk7CiAgICAgICAgIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVHlwZWRBcnJheUJhc2Uu aCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1R5cGVkQXJyYXlCYXNlLmgKaW5kZXgg ODY5NGI1NS4uZDY0OGZjZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvVHlwZWRBcnJheUJhc2UuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9U eXBlZEFycmF5QmFzZS5oCkBAIC05NCw3ICs5NCw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgUmVm UHRyPEFycmF5QnVmZmVyPiBidWZmZXIgPSBBcnJheUJ1ZmZlcjo6Y3JlYXRlKGxlbmd0aCwgc2l6 ZW9mKFQpKTsKICAgICAgICAgaWYgKCFidWZmZXIuZ2V0KCkpCiAgICAgICAgICAgICByZXR1cm4g MDsKLSAgICAgICAgcmV0dXJuIGNyZWF0ZTxTdWJjbGFzcz4oYnVmZmVyLCAwLCBsZW5ndGgpOwor ICAgICAgICByZXR1cm4gY3JlYXRlPFN1YmNsYXNzPihidWZmZXIucmVsZWFzZSgpLCAwLCBsZW5n dGgpOwogICAgIH0KIAogICAgIHRlbXBsYXRlIDxjbGFzcyBTdWJjbGFzcz4KQEAgLTEwNCw3ICsx MDQsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIGlmIChhKQogICAgICAgICAgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKQogICAgICAgICAgICAgICAgIGEtPnNldChpLCBh cnJheVtpXSk7Ci0gICAgICAgIHJldHVybiBhOworICAgICAgICByZXR1cm4gYS5yZWxlYXNlKCk7 CiAgICAgfQogCiAgICAgdGVtcGxhdGUgPGNsYXNzIFN1YmNsYXNzPgpAQCAtMTE0LDcgKzExNCw3 IEBAIHByb3RlY3RlZDoKICAgICAgICAgaWYgKCF2ZXJpZnlTdWJSYW5nZTxUPihidWYsIGJ5dGVP ZmZzZXQsIGxlbmd0aCkpCiAgICAgICAgICAgICByZXR1cm4gMDsKIAotICAgICAgICByZXR1cm4g YWRvcHRSZWYobmV3IFN1YmNsYXNzKGJ1ZiwgYnl0ZU9mZnNldCwgbGVuZ3RoKSk7CisgICAgICAg IHJldHVybiBhZG9wdFJlZihuZXcgU3ViY2xhc3MoYnVmLnJlbGVhc2UoKSwgYnl0ZU9mZnNldCwg bGVuZ3RoKSk7CiAgICAgfQogCiAgICAgdGVtcGxhdGUgPGNsYXNzIFN1YmNsYXNzPgpAQCAtMTIz LDcgKzEyMyw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgUmVmUHRyPEFycmF5QnVmZmVyPiBidWZm ZXIgPSBBcnJheUJ1ZmZlcjo6Y3JlYXRlVW5pbml0aWFsaXplZChsZW5ndGgsIHNpemVvZihUKSk7 CiAgICAgICAgIGlmICghYnVmZmVyLmdldCgpKQogICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAg ICAgIHJldHVybiBjcmVhdGU8U3ViY2xhc3M+KGJ1ZmZlciwgMCwgbGVuZ3RoKTsKKyAgICAgICAg cmV0dXJuIGNyZWF0ZTxTdWJjbGFzcz4oYnVmZmVyLnJlbGVhc2UoKSwgMCwgbGVuZ3RoKTsKICAg ICB9CiAKICAgICB0ZW1wbGF0ZSA8Y2xhc3MgU3ViY2xhc3M+CmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvdG9vbHMvRnVuY3Rpb25PdmVycmlkZXMuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3Rvb2xzL0Z1bmN0aW9uT3ZlcnJpZGVzLmNwcAppbmRleCAyMzUzMWJiLi4yMDM0 ZDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvRnVuY3Rpb25PdmVy cmlkZXMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9GdW5jdGlvbk92ZXJy aWRlcy5jcHAKQEAgLTEyNyw3ICsxMjcsNyBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplT3ZlcnJp ZGVJbmZvKGNvbnN0IFNvdXJjZUNvZGUmIG9yaWdDb2RlLCBjb25zdCBTdHJpbmcmIG5ldwogICAg IGluZm8udHlwZVByb2ZpbGluZ0VuZE9mZnNldCA9IG5ld1Byb3ZpZGVyU3RyLmxlbmd0aCgpIC0g MTsKIAogICAgIGluZm8uc291cmNlQ29kZSA9Ci0gICAgICAgIFNvdXJjZUNvZGUobmV3UHJvdmlk ZXIsIGluZm8udHlwZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0LCBpbmZvLnR5cGVQcm9maWxpbmdFbmRP ZmZzZXQgKyAxLCAxLCAxKTsKKyAgICAgICAgU291cmNlQ29kZShuZXdQcm92aWRlci5yZWxlYXNl KCksIGluZm8udHlwZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0LCBpbmZvLnR5cGVQcm9maWxpbmdFbmRP ZmZzZXQgKyAxLCAxLCAxKTsKIH0KICAgICAKIGJvb2wgRnVuY3Rpb25PdmVycmlkZXM6OmluaXRp YWxpemVPdmVycmlkZUZvcihjb25zdCBTb3VyY2VDb2RlJiBvcmlnQ29kZSwgRnVuY3Rpb25PdmVy cmlkZXM6Ok92ZXJyaWRlSW5mbyYgcmVzdWx0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvSVNPVlRUQ3VlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0lTT1ZUVEN1ZS5jcHAKaW5kZXggOGE5NmQ4Yi4uZjIzMTk0OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSVNPVlRUQ3VlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JU09WVFRDdWUuY3BwCkBAIC0zMCw2ICsz MCw4IEBACiAjaW5jbHVkZSA8cnVudGltZS9BcnJheUJ1ZmZlci5oPgogI2luY2x1ZGUgPHJ1bnRp bWUvRGF0YVZpZXcuaD4KICNpbmNsdWRlIDxydW50aW1lL0ludDhBcnJheS5oPgorI2luY2x1ZGUg PHJ1bnRpbWUvSlNDSW5saW5lcy5oPgorI2luY2x1ZGUgPHJ1bnRpbWUvVHlwZWRBcnJheUlubGlu ZXMuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvdGV4 dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgo=