122417 2013-10-06 11:02:43 -0700 [GTK] Get rid of use of deleteAllValues in GtkDragAndDropHelper 2013-10-06 17:42:31 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin commit-queue gtk-ews rego+ews xan.lopez oldest_to_newest 936802 0 darin 2013-10-06 11:02:43 -0700 [GTK] Get rid of use of deleteAllValues in 936804 1 213517 darin 2013-10-06 11:06:00 -0700 Created attachment 213517 Patch 936809 2 213517 gtk-ews 2013-10-06 11:12:27 -0700 Comment on attachment 213517 Patch Attachment 213517 did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/3485022 936811 3 213518 darin 2013-10-06 11:17:17 -0700 Created attachment 213518 Patch 936824 4 213518 gtk-ews 2013-10-06 12:12:51 -0700 Comment on attachment 213518 Patch Attachment 213518 did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/3488032 936876 5 213535 darin 2013-10-06 16:15:26 -0700 Created attachment 213535 Patch 936892 6 213535 kling 2013-10-06 17:18:28 -0700 Comment on attachment 213535 Patch LGTM 936901 7 213535 commit-queue 2013-10-06 17:42:29 -0700 Comment on attachment 213535 Patch Clearing flags on attachment: 213535 Committed r157013: <http://trac.webkit.org/changeset/157013> 936902 8 commit-queue 2013-10-06 17:42:31 -0700 All reviewed patches have been landed. Closing bug. 213517 2013-10-06 11:06:00 -0700 2013-10-06 11:17:15 -0700 Patch bug-122417-20131006110600.patch text/plain 8802 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2OTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjc0NjhlNGYyMGNkMjc2 ZmJmMjMwMWJmNzRmZjMwYmJmZjhhYWEwNi4uOTFkMDAyNWFiNDVmNmZmN2QwZGZiZDZkYTY0N2Rm MDU4YmY2YWMxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEzLTEwLTA2ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBbR1RLXSBHZXQgcmlkIG9mIHVz ZSBvZiBkZWxldGVBbGxWYWx1ZXMgaW4gR3RrRHJhZ0FuZERyb3BIZWxwZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjQxNworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a0Ry YWdBbmREcm9wSGVscGVyLmNwcDogUmVtb3ZlZCB1bm5lZWRlZCB0eXBlZGVmcy4KKyAgICAgICAg KFdlYkNvcmU6Okd0a0RyYWdBbmREcm9wSGVscGVyOjp+R3RrRHJhZ0FuZERyb3BIZWxwZXIpOiBS ZW1vdmVkIGNhbGwgdG8KKyAgICAgICAgZGVsZXRlQWxsVmFsdWVzLgorICAgICAgICAoV2ViQ29y ZTo6R3RrRHJhZ0FuZERyb3BIZWxwZXI6OmhhbmRsZURyYWdFbmQpOiBVc2UgcmVtb3ZlIGRpcmVj dGx5IGluc3RlYWQKKyAgICAgICAgb2YgdXNpbmcgZmluZCB0aGVuIHJlbW92ZS4gSSBiZWxpZXZl IHRoaXMgZml4ZXMgYSBzdG9yYWdlIGxlYWsuCisgICAgICAgIChXZWJDb3JlOjpHdGtEcmFnQW5k RHJvcEhlbHBlcjo6aGFuZGxlR2V0RHJhZ0RhdGEpOiBVc2UgZ2V0IGluc3RlYWQgb2YgZmluZC4K KyAgICAgICAgKFdlYkNvcmU6Okd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnTGVhdmVM YXRlcik6IFJlbW92ZSB0aGUgZXhwbGljaXQKKyAgICAgICAgZGVsZXRlIHNpbmNlIHJlbW92ZSB3 aWxsIGF1dG9tYXRpY2FsbHkgZGVsZXRlLgorICAgICAgICAoV2ViQ29yZTo6R3RrRHJhZ0FuZERy b3BIZWxwZXI6OmhhbmRsZURyYWdMZWF2ZSk6IFVzZSBnZXQgaW5zdGVhZCBvZiBmaW5kLgorICAg ICAgICAoV2ViQ29yZTo6R3RrRHJhZ0FuZERyb3BIZWxwZXI6OmhhbmRsZURyYWdNb3Rpb24pOiBV c2UgYWRkIGluc3RlYWQgb2YgYQorICAgICAgICBjb21iaW5hdGlvbiBvZiBmaW5kIGFuZCBzZXQu IEFsc28gdXNlciBudWxscHRyIGluc3RlYWQgb2YgMC4KKyAgICAgICAgKFdlYkNvcmU6Okd0a0Ry YWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnRGF0YVJlY2VpdmVkKTogVXNlIGdldCBpbnN0ZWFk IG9mIGZpbmQuCisgICAgICAgIChXZWJDb3JlOjpHdGtEcmFnQW5kRHJvcEhlbHBlcjo6aGFuZGxl RHJhZ0Ryb3ApOiBVc2UgZ2V0IGluc3RlYWQgb2YgZmluZC4KKworICAgICAgICAqIHBsYXRmb3Jt L2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5oOiBVc2UgbnVsbHB0ciBpbnN0ZWFkIG9mIDAuIENo YW5nZSB2YWx1ZQorICAgICAgICB0eXBlIG9mIG1fZHJvcHBpbmdDb250ZXh0cyB0byBiZSBhIHN0 ZDo6dW5pcXVlX3B0ci4KKworMjAxMy0xMC0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5j b20+CisKICAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcDoKICAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJ1dHRvbjo6c2V0dXBJbm5lclN0eWxlKTogQWRkZWQgYSBjb21tZW50IHBv c3NpYmx5IHJlbGV2YW50CiAgICAgICAgIHRvIGN1cnJlbnQgZmFpbHVyZXMgc2VlbiBvbiBXaW5k b3dzIGJvdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFn QW5kRHJvcEhlbHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJhZ0Fu ZERyb3BIZWxwZXIuY3BwCmluZGV4IDE1N2E2MDdhMTg5YjU0Yjg2NGE1OThmZmI4NTg1M2E1OGQ3 YjM2YjYuLjhlMmRjOTk2NGY4YmU1OTJlOTkwMzc5NDExMGJkMDJmMWYxN2ZjYmEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9wSGVscGVyLmNw cApAQCAtNDYsMzAgKzQ2LDIxIEBAIHN0cnVjdCBEcm9wcGluZ0NvbnRleHQgewogICAgIERyYWdF eGl0ZWRDYWxsYmFjayBleGl0ZWRDYWxsYmFjazsKIH07CiAKLXR5cGVkZWYgSGFzaE1hcDxHZGtE cmFnQ29udGV4dCosIERyb3BwaW5nQ29udGV4dCo+IERyb3BwaW5nQ29udGV4dE1hcDsKLXR5cGVk ZWYgSGFzaE1hcDxHZGtEcmFnQ29udGV4dCosIFJlZlB0cjxEYXRhT2JqZWN0R3RrPiA+IERyYWdn aW5nRGF0YU9iamVjdHNNYXA7Ci0KIEd0a0RyYWdBbmREcm9wSGVscGVyOjp+R3RrRHJhZ0FuZERy b3BIZWxwZXIoKQogewotICAgIGRlbGV0ZUFsbFZhbHVlcyhtX2Ryb3BwaW5nQ29udGV4dHMpOwog fQogCiBib29sIEd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnRW5kKEdka0RyYWdDb250 ZXh0KiBkcmFnQ29udGV4dCkKIHsKLSAgICBEcmFnZ2luZ0RhdGFPYmplY3RzTWFwOjppdGVyYXRv ciBpdGVyYXRvciA9IG1fZHJhZ2dpbmdEYXRhT2JqZWN0cy5maW5kKGRyYWdDb250ZXh0KTsKLSAg ICBpZiAoaXRlcmF0b3IgPT0gbV9kcmFnZ2luZ0RhdGFPYmplY3RzLmVuZCgpKQotICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0KLSAgICBtX2RyYWdnaW5nRGF0YU9iamVjdHMucmVtb3ZlKGl0ZXJhdG9y KTsKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gbV9kcmFnZ2luZ0RhdGFPYmplY3RzLnJl bW92ZShkcmFnQ29udGV4dCk7CiB9CiAKIHZvaWQgR3RrRHJhZ0FuZERyb3BIZWxwZXI6OmhhbmRs ZUdldERyYWdEYXRhKEdka0RyYWdDb250ZXh0KiBjb250ZXh0LCBHdGtTZWxlY3Rpb25EYXRhKiBz ZWxlY3Rpb25EYXRhLCBndWludCBpbmZvKQogewotICAgIERyYWdnaW5nRGF0YU9iamVjdHNNYXA6 Oml0ZXJhdG9yIGl0ZXJhdG9yID0gbV9kcmFnZ2luZ0RhdGFPYmplY3RzLmZpbmQoY29udGV4dCk7 Ci0gICAgaWYgKGl0ZXJhdG9yID09IG1fZHJhZ2dpbmdEYXRhT2JqZWN0cy5lbmQoKSkKKyAgICBE cm9wcGluZ0NvbnRleHQqIGRyb3BwaW5nQ29udGV4dCA9IG1fZHJvcHBpbmdDb250ZXh0cy5nZXQo Y29udGV4dCk7CisgICAgaWYgKCFkcm9wcGluZ0NvbnRleHQpCiAgICAgICAgIHJldHVybjsKLSAg ICBQYXN0ZWJvYXJkSGVscGVyOjpkZWZhdWx0UGFzdGVib2FyZEhlbHBlcigpLT5maWxsU2VsZWN0 aW9uRGF0YShzZWxlY3Rpb25EYXRhLCBpbmZvLCBpdGVyYXRvci0+dmFsdWUuZ2V0KCkpOworICAg IFBhc3RlYm9hcmRIZWxwZXI6OmRlZmF1bHRQYXN0ZWJvYXJkSGVscGVyKCktPmZpbGxTZWxlY3Rp b25EYXRhKHNlbGVjdGlvbkRhdGEsIGluZm8sIGRyb3BwaW5nQ29udGV4dCk7CiB9CiAKIHN0cnVj dCBIYW5kbGVEcmFnTGF0ZXJEYXRhIHsKQEAgLTg2LDcgKzc3LDcgQEAgc3RhdGljIGdib29sZWFu IGhhbmRsZURyYWdMZWF2ZUxhdGVyQ2FsbGJhY2soSGFuZGxlRHJhZ0xhdGVyRGF0YSogZGF0YSkK IAogdm9pZCBHdGtEcmFnQW5kRHJvcEhlbHBlcjo6aGFuZGxlRHJhZ0xlYXZlTGF0ZXIoRHJvcHBp bmdDb250ZXh0KiBjb250ZXh0KQogewotICAgIERyb3BwaW5nQ29udGV4dE1hcDo6aXRlcmF0b3Ig aXRlcmF0b3IgPSBtX2Ryb3BwaW5nQ29udGV4dHMuZmluZChjb250ZXh0LT5nZGtDb250ZXh0KTsK KyAgICBhdXRvIGl0ZXJhdG9yID0gbV9kcm9wcGluZ0NvbnRleHRzLmZpbmQoY29udGV4dC0+Z2Rr Q29udGV4dCk7CiAgICAgaWYgKGl0ZXJhdG9yID09IG1fZHJvcHBpbmdDb250ZXh0cy5lbmQoKSkK ICAgICAgICAgcmV0dXJuOwogCkBAIC0xMDIsMjAgKzkzLDE5IEBAIHZvaWQgR3RrRHJhZ0FuZERy b3BIZWxwZXI6OmhhbmRsZURyYWdMZWF2ZUxhdGVyKERyb3BwaW5nQ29udGV4dCogY29udGV4dCkK ICAgICBjb250ZXh0LT5leGl0ZWRDYWxsYmFjayhtX3dpZGdldCwgJmRyYWdEYXRhLCBjb250ZXh0 LT5kcm9wSGFwcGVuZWQpOwogCiAgICAgbV9kcm9wcGluZ0NvbnRleHRzLnJlbW92ZShpdGVyYXRv cik7Ci0gICAgZGVsZXRlIGNvbnRleHQ7CiB9CiAKIHZvaWQgR3RrRHJhZ0FuZERyb3BIZWxwZXI6 OmhhbmRsZURyYWdMZWF2ZShHZGtEcmFnQ29udGV4dCogZ2RrQ29udGV4dCwgRHJhZ0V4aXRlZENh bGxiYWNrIGV4aXRlZENhbGxiYWNrKQogewotICAgIERyb3BwaW5nQ29udGV4dE1hcDo6aXRlcmF0 b3IgaXRlcmF0b3IgPSBtX2Ryb3BwaW5nQ29udGV4dHMuZmluZChnZGtDb250ZXh0KTsKLSAgICBp ZiAoaXRlcmF0b3IgPT0gbV9kcm9wcGluZ0NvbnRleHRzLmVuZCgpKQorICAgIERyb3BwaW5nQ29u dGV4dCogY29udGV4dCA9IG1fZHJvcHBpbmdDb250ZXh0cy5nZXQoZ2RrQ29udGV4dCk7CisgICAg aWYgKCFjb250ZXh0KQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBEdXJpbmcgYSBkcm9wIEdU Sysgd2lsbCBmaXJlIGEgZHJhZy1sZWF2ZSBzaWduYWwgcmlnaHQgYmVmb3JlIGZpcmluZwogICAg IC8vIHRoZSBkcmFnLWRyb3Agc2lnbmFsLiBXZSB3YW50IHRoZSBhY3Rpb25zIGZvciBkcmFnLWxl YXZlIHRvIGhhcHBlbiBhZnRlcgogICAgIC8vIHRob3NlIGZvciBkcmFnLWRyb3AsIHNvIHNjaGVk dWxlIHRoZW0gdG8gaGFwcGVuIGFzeW5jaHJvbm91c2x5IGhlcmUuCiAgICAgSGFuZGxlRHJhZ0xh dGVyRGF0YSogZGF0YSA9IG5ldyBIYW5kbGVEcmFnTGF0ZXJEYXRhOwotICAgIGRhdGEtPmNvbnRl eHQgPSBpdGVyYXRvci0+dmFsdWU7CisgICAgZGF0YS0+Y29udGV4dCA9IGNvbnRleHQ7CiAgICAg ZGF0YS0+Y29udGV4dC0+ZXhpdGVkQ2FsbGJhY2sgPSBleGl0ZWRDYWxsYmFjazsKICAgICBkYXRh LT5nbHVlID0gdGhpczsKICAgICBnX3RpbWVvdXRfYWRkKDAsIHJlaW50ZXJwcmV0X2Nhc3Q8R1Nv dXJjZUZ1bmM+KGhhbmRsZURyYWdMZWF2ZUxhdGVyQ2FsbGJhY2spLCBkYXRhKTsKQEAgLTEzMiwz OSArMTIyLDMzIEBAIHN0YXRpYyB2b2lkIHF1ZXJ5TmV3RHJvcENvbnRleHREYXRhKERyb3BwaW5n Q29udGV4dCogZHJvcENvbnRleHQsIEd0a1dpZGdldCogd2lkCiAKIERhdGFPYmplY3RHdGsqIEd0 a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnTW90aW9uKEdka0RyYWdDb250ZXh0KiBjb250 ZXh0LCBjb25zdCBJbnRQb2ludCYgcG9zaXRpb24sIHVuc2lnbmVkIHRpbWUpCiB7Ci0gICAgRHJv cHBpbmdDb250ZXh0KiBkcm9wcGluZ0NvbnRleHQgPSAwOwotICAgIERyb3BwaW5nQ29udGV4dE1h cDo6aXRlcmF0b3IgaXRlcmF0b3IgPSBtX2Ryb3BwaW5nQ29udGV4dHMuZmluZChjb250ZXh0KTsK LSAgICBpZiAoaXRlcmF0b3IgPT0gbV9kcm9wcGluZ0NvbnRleHRzLmVuZCgpKSB7Ci0gICAgICAg IGRyb3BwaW5nQ29udGV4dCA9IG5ldyBEcm9wcGluZ0NvbnRleHQoY29udGV4dCwgcG9zaXRpb24p OwotICAgICAgICBtX2Ryb3BwaW5nQ29udGV4dHMuc2V0KGNvbnRleHQsIGRyb3BwaW5nQ29udGV4 dCk7Ci0gICAgICAgIHF1ZXJ5TmV3RHJvcENvbnRleHREYXRhKGRyb3BwaW5nQ29udGV4dCwgbV93 aWRnZXQsIHRpbWUpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGRyb3BwaW5nQ29udGV4dCA9IGl0 ZXJhdG9yLT52YWx1ZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJvcHBpbmdDb250ZXh0PiYgZHJv cHBpbmdDb250ZXh0ID0gbV9kcm9wcGluZ0NvbnRleHRzLmFkZChjb250ZXh0LCBudWxscHRyKS5p dGVyYXRvci0+dmFsdWU7CisgICAgaWYgKCFkcm9wcGluZ0NvbnRleHQpIHsKKyAgICAgICAgZHJv cHBpbmdDb250ZXh0ID0gc3RkOjptYWtlX3VuaXF1ZTxEcm9wcGluZ0NvbnRleHQ+KGNvbnRleHQs IHBvc2l0aW9uKTsKKyAgICAgICAgcXVlcnlOZXdEcm9wQ29udGV4dERhdGEoZHJvcHBpbmdDb250 ZXh0LmdldCgpLCBtX3dpZGdldCwgdGltZSk7CisgICAgfSBlbHNlCiAgICAgICAgIGRyb3BwaW5n Q29udGV4dC0+bGFzdE1vdGlvblBvc2l0aW9uID0gcG9zaXRpb247Ci0gICAgfQogCiAgICAgLy8g RG9uJ3Qgc2VuZCBhbnkgZHJhZyBpbmZvcm1hdGlvbiB0byBXZWJDb3JlIHVudGlsIHdlJ3ZlIHJl dHJpZXZlZCBhbGwKICAgICAvLyB0aGUgZGF0YSBmb3IgdGhpcyBkcmFnIG9wZXJhdGlvbi4gT3Ro ZXJ3aXNlIHdlJ2QgaGF2ZSB0byBibG9jayB0byB3YWl0CiAgICAgLy8gZm9yIHRoZSBkcmFnJ3Mg ZGF0YS4KLSAgICBBU1NFUlQoZHJvcHBpbmdDb250ZXh0KTsKICAgICBpZiAoZHJvcHBpbmdDb250 ZXh0LT5wZW5kaW5nRGF0YVJlcXVlc3RzID4gMCkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAg IHJldHVybiBudWxscHRyOwogCiAgICAgcmV0dXJuIGRyb3BwaW5nQ29udGV4dC0+ZGF0YU9iamVj dC5nZXQoKTsKIH0KIAogRGF0YU9iamVjdEd0ayogR3RrRHJhZ0FuZERyb3BIZWxwZXI6OmhhbmRs ZURyYWdEYXRhUmVjZWl2ZWQoR2RrRHJhZ0NvbnRleHQqIGNvbnRleHQsIEd0a1NlbGVjdGlvbkRh dGEqIHNlbGVjdGlvbkRhdGEsIHVuc2lnbmVkIGluZm8sIEludFBvaW50JiBwb3NpdGlvbikKIHsK LSAgICBEcm9wcGluZ0NvbnRleHRNYXA6Oml0ZXJhdG9yIGl0ZXJhdG9yID0gbV9kcm9wcGluZ0Nv bnRleHRzLmZpbmQoY29udGV4dCk7Ci0gICAgaWYgKGl0ZXJhdG9yID09IG1fZHJvcHBpbmdDb250 ZXh0cy5lbmQoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgRHJvcHBpbmdDb250ZXh0KiBkcm9w cGluZ0NvbnRleHQgPSBtX2Ryb3BwaW5nQ29udGV4dHMuZ2V0KGNvbnRleHQpOworICAgIGlmICgh ZHJvcHBpbmdDb250ZXh0KQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIERyb3BwaW5n Q29udGV4dCogZHJvcHBpbmdDb250ZXh0ID0gaXRlcmF0b3ItPnZhbHVlOwogICAgIGRyb3BwaW5n Q29udGV4dC0+cGVuZGluZ0RhdGFSZXF1ZXN0cy0tOwogICAgIFBhc3RlYm9hcmRIZWxwZXI6OmRl ZmF1bHRQYXN0ZWJvYXJkSGVscGVyKCktPmZpbGxEYXRhT2JqZWN0RnJvbURyb3BEYXRhKHNlbGVj dGlvbkRhdGEsIGluZm8sIGRyb3BwaW5nQ29udGV4dC0+ZGF0YU9iamVjdC5nZXQoKSk7CiAKICAg ICBpZiAoZHJvcHBpbmdDb250ZXh0LT5wZW5kaW5nRGF0YVJlcXVlc3RzKQotICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICAvLyBUaGUgY29vcmRpbmF0ZXMg cGFzc2VkIHRvIGRyYWctZGF0YS1yZWNlaXZlZCBzaWduYWwgYXJlIHNvbWV0aW1lcwogICAgIC8v IGluYWNjdXJhdGUgaW4gRFJULCBzbyB1c2UgdGhlIGNvb3JkaW5hdGVzIG9mIHRoZSBsYXN0IG1v dGlvbiBldmVudC4KQEAgLTE3NiwxMSArMTYwLDEwIEBAIERhdGFPYmplY3RHdGsqIEd0a0RyYWdB bmREcm9wSGVscGVyOjpoYW5kbGVEcmFnRGF0YVJlY2VpdmVkKEdka0RyYWdDb250ZXh0KiBjb250 CiAKIERhdGFPYmplY3RHdGsqIEd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnRHJvcChH ZGtEcmFnQ29udGV4dCogY29udGV4dCkKIHsKLSAgICBEcm9wcGluZ0NvbnRleHRNYXA6Oml0ZXJh dG9yIGl0ZXJhdG9yID0gbV9kcm9wcGluZ0NvbnRleHRzLmZpbmQoY29udGV4dCk7Ci0gICAgaWYg KGl0ZXJhdG9yID09IG1fZHJvcHBpbmdDb250ZXh0cy5lbmQoKSkKLSAgICAgICAgcmV0dXJuIDA7 CisgICAgRHJvcHBpbmdDb250ZXh0KiBkcm9wcGluZ0NvbnRleHQgPSBtX2Ryb3BwaW5nQ29udGV4 dHMuZ2V0KGNvbnRleHQpOworICAgIGlmICghZHJvcHBpbmdDb250ZXh0KQorICAgICAgICByZXR1 cm4gbnVsbHB0cjsKIAotICAgIERyb3BwaW5nQ29udGV4dCogZHJvcHBpbmdDb250ZXh0ID0gaXRl cmF0b3ItPnZhbHVlOwogICAgIGRyb3BwaW5nQ29udGV4dC0+ZHJvcEhhcHBlbmVkID0gdHJ1ZTsK IAogICAgIHJldHVybiBkcm9wcGluZ0NvbnRleHQtPmRhdGFPYmplY3QuZ2V0KCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5oCmluZGV4 IDIyOTdkNjMzNjQ1OTk4Mzk0ZTQ2Yjc2YzM0Y2E1ZDhkZThmNzY5NTkuLjUzMTIyNTIyMDBmYzE2 M2FmOTNiMTllYWZjMDUzM2ExOTZiNDcxYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5oCkBAIC0zNyw3ICszNyw3IEBAIGNsYXNz IEd0a0RyYWdBbmREcm9wSGVscGVyIHsKIAogcHVibGljOgogICAgIEd0a0RyYWdBbmREcm9wSGVs cGVyKCkKLSAgICAgICAgOiBtX3dpZGdldCgwKQorICAgICAgICA6IG1fd2lkZ2V0KG51bGxwdHIp CiAgICAgewogICAgIH0KICAgICB+R3RrRHJhZ0FuZERyb3BIZWxwZXIoKTsKQEAgLTU0LDggKzU0 LDggQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIEd0a1dpZGdldCogbV93aWRnZXQ7Ci0gICAg SGFzaE1hcDxHZGtEcmFnQ29udGV4dCosIERyb3BwaW5nQ29udGV4dCo+IG1fZHJvcHBpbmdDb250 ZXh0czsKLSAgICBIYXNoTWFwPEdka0RyYWdDb250ZXh0KiwgUmVmUHRyPERhdGFPYmplY3RHdGs+ ID4gbV9kcmFnZ2luZ0RhdGFPYmplY3RzOworICAgIEhhc2hNYXA8R2RrRHJhZ0NvbnRleHQqLCBz dGQ6OnVuaXF1ZV9wdHI8RHJvcHBpbmdDb250ZXh0Pj4gbV9kcm9wcGluZ0NvbnRleHRzOworICAg IEhhc2hNYXA8R2RrRHJhZ0NvbnRleHQqLCBSZWZQdHI8RGF0YU9iamVjdEd0az4+IG1fZHJhZ2dp bmdEYXRhT2JqZWN0czsKIH07CiAKIH0K 213518 2013-10-06 11:17:17 -0700 2013-10-06 16:15:22 -0700 Patch bug-122417-20131006111717.patch text/plain 9113 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2OTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjc0NjhlNGYyMGNkMjc2 ZmJmMjMwMWJmNzRmZjMwYmJmZjhhYWEwNi4uOTFkMDAyNWFiNDVmNmZmN2QwZGZiZDZkYTY0N2Rm MDU4YmY2YWMxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEzLTEwLTA2ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBbR1RLXSBHZXQgcmlkIG9mIHVz ZSBvZiBkZWxldGVBbGxWYWx1ZXMgaW4gR3RrRHJhZ0FuZERyb3BIZWxwZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjQxNworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a0Ry YWdBbmREcm9wSGVscGVyLmNwcDogUmVtb3ZlZCB1bm5lZWRlZCB0eXBlZGVmcy4KKyAgICAgICAg KFdlYkNvcmU6Okd0a0RyYWdBbmREcm9wSGVscGVyOjp+R3RrRHJhZ0FuZERyb3BIZWxwZXIpOiBS ZW1vdmVkIGNhbGwgdG8KKyAgICAgICAgZGVsZXRlQWxsVmFsdWVzLgorICAgICAgICAoV2ViQ29y ZTo6R3RrRHJhZ0FuZERyb3BIZWxwZXI6OmhhbmRsZURyYWdFbmQpOiBVc2UgcmVtb3ZlIGRpcmVj dGx5IGluc3RlYWQKKyAgICAgICAgb2YgdXNpbmcgZmluZCB0aGVuIHJlbW92ZS4gSSBiZWxpZXZl IHRoaXMgZml4ZXMgYSBzdG9yYWdlIGxlYWsuCisgICAgICAgIChXZWJDb3JlOjpHdGtEcmFnQW5k RHJvcEhlbHBlcjo6aGFuZGxlR2V0RHJhZ0RhdGEpOiBVc2UgZ2V0IGluc3RlYWQgb2YgZmluZC4K KyAgICAgICAgKFdlYkNvcmU6Okd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnTGVhdmVM YXRlcik6IFJlbW92ZSB0aGUgZXhwbGljaXQKKyAgICAgICAgZGVsZXRlIHNpbmNlIHJlbW92ZSB3 aWxsIGF1dG9tYXRpY2FsbHkgZGVsZXRlLgorICAgICAgICAoV2ViQ29yZTo6R3RrRHJhZ0FuZERy b3BIZWxwZXI6OmhhbmRsZURyYWdMZWF2ZSk6IFVzZSBnZXQgaW5zdGVhZCBvZiBmaW5kLgorICAg ICAgICAoV2ViQ29yZTo6R3RrRHJhZ0FuZERyb3BIZWxwZXI6OmhhbmRsZURyYWdNb3Rpb24pOiBV c2UgYWRkIGluc3RlYWQgb2YgYQorICAgICAgICBjb21iaW5hdGlvbiBvZiBmaW5kIGFuZCBzZXQu IEFsc28gdXNlciBudWxscHRyIGluc3RlYWQgb2YgMC4KKyAgICAgICAgKFdlYkNvcmU6Okd0a0Ry YWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnRGF0YVJlY2VpdmVkKTogVXNlIGdldCBpbnN0ZWFk IG9mIGZpbmQuCisgICAgICAgIChXZWJDb3JlOjpHdGtEcmFnQW5kRHJvcEhlbHBlcjo6aGFuZGxl RHJhZ0Ryb3ApOiBVc2UgZ2V0IGluc3RlYWQgb2YgZmluZC4KKworICAgICAgICAqIHBsYXRmb3Jt L2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5oOiBVc2UgbnVsbHB0ciBpbnN0ZWFkIG9mIDAuIENo YW5nZSB2YWx1ZQorICAgICAgICB0eXBlIG9mIG1fZHJvcHBpbmdDb250ZXh0cyB0byBiZSBhIHN0 ZDo6dW5pcXVlX3B0ci4KKworMjAxMy0xMC0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5j b20+CisKICAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcDoKICAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJ1dHRvbjo6c2V0dXBJbm5lclN0eWxlKTogQWRkZWQgYSBjb21tZW50IHBv c3NpYmx5IHJlbGV2YW50CiAgICAgICAgIHRvIGN1cnJlbnQgZmFpbHVyZXMgc2VlbiBvbiBXaW5k b3dzIGJvdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFn QW5kRHJvcEhlbHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJhZ0Fu ZERyb3BIZWxwZXIuY3BwCmluZGV4IDE1N2E2MDdhMTg5YjU0Yjg2NGE1OThmZmI4NTg1M2E1OGQ3 YjM2YjYuLjc1NjJlM2E3NDYzMzFkMDY1OGY2YTQ2YjUxMzI2ODc1MjZlZTg4ZjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9wSGVscGVyLmNw cApAQCAtNDYsMzAgKzQ2LDI2IEBAIHN0cnVjdCBEcm9wcGluZ0NvbnRleHQgewogICAgIERyYWdF eGl0ZWRDYWxsYmFjayBleGl0ZWRDYWxsYmFjazsKIH07CiAKLXR5cGVkZWYgSGFzaE1hcDxHZGtE cmFnQ29udGV4dCosIERyb3BwaW5nQ29udGV4dCo+IERyb3BwaW5nQ29udGV4dE1hcDsKLXR5cGVk ZWYgSGFzaE1hcDxHZGtEcmFnQ29udGV4dCosIFJlZlB0cjxEYXRhT2JqZWN0R3RrPiA+IERyYWdn aW5nRGF0YU9iamVjdHNNYXA7CitHdGtEcmFnQW5kRHJvcEhlbHBlcigpCisgICAgOiBtX3dpZGdl dChudWxscHRyKQoreworfQogCiBHdGtEcmFnQW5kRHJvcEhlbHBlcjo6fkd0a0RyYWdBbmREcm9w SGVscGVyKCkKIHsKLSAgICBkZWxldGVBbGxWYWx1ZXMobV9kcm9wcGluZ0NvbnRleHRzKTsKIH0K IAogYm9vbCBHdGtEcmFnQW5kRHJvcEhlbHBlcjo6aGFuZGxlRHJhZ0VuZChHZGtEcmFnQ29udGV4 dCogZHJhZ0NvbnRleHQpCiB7Ci0gICAgRHJhZ2dpbmdEYXRhT2JqZWN0c01hcDo6aXRlcmF0b3Ig aXRlcmF0b3IgPSBtX2RyYWdnaW5nRGF0YU9iamVjdHMuZmluZChkcmFnQ29udGV4dCk7Ci0gICAg aWYgKGl0ZXJhdG9yID09IG1fZHJhZ2dpbmdEYXRhT2JqZWN0cy5lbmQoKSkKLSAgICAgICAgcmV0 dXJuIGZhbHNlOwotCi0gICAgbV9kcmFnZ2luZ0RhdGFPYmplY3RzLnJlbW92ZShpdGVyYXRvcik7 Ci0gICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIG1fZHJhZ2dpbmdEYXRhT2JqZWN0cy5yZW1v dmUoZHJhZ0NvbnRleHQpOwogfQogCiB2b2lkIEd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVH ZXREcmFnRGF0YShHZGtEcmFnQ29udGV4dCogY29udGV4dCwgR3RrU2VsZWN0aW9uRGF0YSogc2Vs ZWN0aW9uRGF0YSwgZ3VpbnQgaW5mbykKIHsKLSAgICBEcmFnZ2luZ0RhdGFPYmplY3RzTWFwOjpp dGVyYXRvciBpdGVyYXRvciA9IG1fZHJhZ2dpbmdEYXRhT2JqZWN0cy5maW5kKGNvbnRleHQpOwot ICAgIGlmIChpdGVyYXRvciA9PSBtX2RyYWdnaW5nRGF0YU9iamVjdHMuZW5kKCkpCisgICAgRHJv cHBpbmdDb250ZXh0KiBkcm9wcGluZ0NvbnRleHQgPSBtX2Ryb3BwaW5nQ29udGV4dHMuZ2V0KGNv bnRleHQpOworICAgIGlmICghZHJvcHBpbmdDb250ZXh0KQogICAgICAgICByZXR1cm47Ci0gICAg UGFzdGVib2FyZEhlbHBlcjo6ZGVmYXVsdFBhc3RlYm9hcmRIZWxwZXIoKS0+ZmlsbFNlbGVjdGlv bkRhdGEoc2VsZWN0aW9uRGF0YSwgaW5mbywgaXRlcmF0b3ItPnZhbHVlLmdldCgpKTsKKyAgICBQ YXN0ZWJvYXJkSGVscGVyOjpkZWZhdWx0UGFzdGVib2FyZEhlbHBlcigpLT5maWxsU2VsZWN0aW9u RGF0YShzZWxlY3Rpb25EYXRhLCBpbmZvLCBkcm9wcGluZ0NvbnRleHQpOwogfQogCiBzdHJ1Y3Qg SGFuZGxlRHJhZ0xhdGVyRGF0YSB7CkBAIC04Niw3ICs4Miw3IEBAIHN0YXRpYyBnYm9vbGVhbiBo YW5kbGVEcmFnTGVhdmVMYXRlckNhbGxiYWNrKEhhbmRsZURyYWdMYXRlckRhdGEqIGRhdGEpCiAK IHZvaWQgR3RrRHJhZ0FuZERyb3BIZWxwZXI6OmhhbmRsZURyYWdMZWF2ZUxhdGVyKERyb3BwaW5n Q29udGV4dCogY29udGV4dCkKIHsKLSAgICBEcm9wcGluZ0NvbnRleHRNYXA6Oml0ZXJhdG9yIGl0 ZXJhdG9yID0gbV9kcm9wcGluZ0NvbnRleHRzLmZpbmQoY29udGV4dC0+Z2RrQ29udGV4dCk7Cisg ICAgYXV0byBpdGVyYXRvciA9IG1fZHJvcHBpbmdDb250ZXh0cy5maW5kKGNvbnRleHQtPmdka0Nv bnRleHQpOwogICAgIGlmIChpdGVyYXRvciA9PSBtX2Ryb3BwaW5nQ29udGV4dHMuZW5kKCkpCiAg ICAgICAgIHJldHVybjsKIApAQCAtMTAyLDIwICs5OCwxOSBAQCB2b2lkIEd0a0RyYWdBbmREcm9w SGVscGVyOjpoYW5kbGVEcmFnTGVhdmVMYXRlcihEcm9wcGluZ0NvbnRleHQqIGNvbnRleHQpCiAg ICAgY29udGV4dC0+ZXhpdGVkQ2FsbGJhY2sobV93aWRnZXQsICZkcmFnRGF0YSwgY29udGV4dC0+ ZHJvcEhhcHBlbmVkKTsKIAogICAgIG1fZHJvcHBpbmdDb250ZXh0cy5yZW1vdmUoaXRlcmF0b3Ip OwotICAgIGRlbGV0ZSBjb250ZXh0OwogfQogCiB2b2lkIEd0a0RyYWdBbmREcm9wSGVscGVyOjpo YW5kbGVEcmFnTGVhdmUoR2RrRHJhZ0NvbnRleHQqIGdka0NvbnRleHQsIERyYWdFeGl0ZWRDYWxs YmFjayBleGl0ZWRDYWxsYmFjaykKIHsKLSAgICBEcm9wcGluZ0NvbnRleHRNYXA6Oml0ZXJhdG9y IGl0ZXJhdG9yID0gbV9kcm9wcGluZ0NvbnRleHRzLmZpbmQoZ2RrQ29udGV4dCk7Ci0gICAgaWYg KGl0ZXJhdG9yID09IG1fZHJvcHBpbmdDb250ZXh0cy5lbmQoKSkKKyAgICBEcm9wcGluZ0NvbnRl eHQqIGNvbnRleHQgPSBtX2Ryb3BwaW5nQ29udGV4dHMuZ2V0KGdka0NvbnRleHQpOworICAgIGlm ICghY29udGV4dCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gRHVyaW5nIGEgZHJvcCBHVEsr IHdpbGwgZmlyZSBhIGRyYWctbGVhdmUgc2lnbmFsIHJpZ2h0IGJlZm9yZSBmaXJpbmcKICAgICAv LyB0aGUgZHJhZy1kcm9wIHNpZ25hbC4gV2Ugd2FudCB0aGUgYWN0aW9ucyBmb3IgZHJhZy1sZWF2 ZSB0byBoYXBwZW4gYWZ0ZXIKICAgICAvLyB0aG9zZSBmb3IgZHJhZy1kcm9wLCBzbyBzY2hlZHVs ZSB0aGVtIHRvIGhhcHBlbiBhc3luY2hyb25vdXNseSBoZXJlLgogICAgIEhhbmRsZURyYWdMYXRl ckRhdGEqIGRhdGEgPSBuZXcgSGFuZGxlRHJhZ0xhdGVyRGF0YTsKLSAgICBkYXRhLT5jb250ZXh0 ID0gaXRlcmF0b3ItPnZhbHVlOworICAgIGRhdGEtPmNvbnRleHQgPSBjb250ZXh0OwogICAgIGRh dGEtPmNvbnRleHQtPmV4aXRlZENhbGxiYWNrID0gZXhpdGVkQ2FsbGJhY2s7CiAgICAgZGF0YS0+ Z2x1ZSA9IHRoaXM7CiAgICAgZ190aW1lb3V0X2FkZCgwLCByZWludGVycHJldF9jYXN0PEdTb3Vy Y2VGdW5jPihoYW5kbGVEcmFnTGVhdmVMYXRlckNhbGxiYWNrKSwgZGF0YSk7CkBAIC0xMzIsMzkg KzEyNywzMyBAQCBzdGF0aWMgdm9pZCBxdWVyeU5ld0Ryb3BDb250ZXh0RGF0YShEcm9wcGluZ0Nv bnRleHQqIGRyb3BDb250ZXh0LCBHdGtXaWRnZXQqIHdpZAogCiBEYXRhT2JqZWN0R3RrKiBHdGtE cmFnQW5kRHJvcEhlbHBlcjo6aGFuZGxlRHJhZ01vdGlvbihHZGtEcmFnQ29udGV4dCogY29udGV4 dCwgY29uc3QgSW50UG9pbnQmIHBvc2l0aW9uLCB1bnNpZ25lZCB0aW1lKQogewotICAgIERyb3Bw aW5nQ29udGV4dCogZHJvcHBpbmdDb250ZXh0ID0gMDsKLSAgICBEcm9wcGluZ0NvbnRleHRNYXA6 Oml0ZXJhdG9yIGl0ZXJhdG9yID0gbV9kcm9wcGluZ0NvbnRleHRzLmZpbmQoY29udGV4dCk7Ci0g ICAgaWYgKGl0ZXJhdG9yID09IG1fZHJvcHBpbmdDb250ZXh0cy5lbmQoKSkgewotICAgICAgICBk cm9wcGluZ0NvbnRleHQgPSBuZXcgRHJvcHBpbmdDb250ZXh0KGNvbnRleHQsIHBvc2l0aW9uKTsK LSAgICAgICAgbV9kcm9wcGluZ0NvbnRleHRzLnNldChjb250ZXh0LCBkcm9wcGluZ0NvbnRleHQp OwotICAgICAgICBxdWVyeU5ld0Ryb3BDb250ZXh0RGF0YShkcm9wcGluZ0NvbnRleHQsIG1fd2lk Z2V0LCB0aW1lKTsKLSAgICB9IGVsc2UgewotICAgICAgICBkcm9wcGluZ0NvbnRleHQgPSBpdGVy YXRvci0+dmFsdWU7CisgICAgc3RkOjp1bmlxdWVfcHRyPERyb3BwaW5nQ29udGV4dD4mIGRyb3Bw aW5nQ29udGV4dCA9IG1fZHJvcHBpbmdDb250ZXh0cy5hZGQoY29udGV4dCwgbnVsbHB0cikuaXRl cmF0b3ItPnZhbHVlOworICAgIGlmICghZHJvcHBpbmdDb250ZXh0KSB7CisgICAgICAgIGRyb3Bw aW5nQ29udGV4dCA9IHN0ZDo6bWFrZV91bmlxdWU8RHJvcHBpbmdDb250ZXh0Pihjb250ZXh0LCBw b3NpdGlvbik7CisgICAgICAgIHF1ZXJ5TmV3RHJvcENvbnRleHREYXRhKGRyb3BwaW5nQ29udGV4 dC5nZXQoKSwgbV93aWRnZXQsIHRpbWUpOworICAgIH0gZWxzZQogICAgICAgICBkcm9wcGluZ0Nv bnRleHQtPmxhc3RNb3Rpb25Qb3NpdGlvbiA9IHBvc2l0aW9uOwotICAgIH0KIAogICAgIC8vIERv bid0IHNlbmQgYW55IGRyYWcgaW5mb3JtYXRpb24gdG8gV2ViQ29yZSB1bnRpbCB3ZSd2ZSByZXRy aWV2ZWQgYWxsCiAgICAgLy8gdGhlIGRhdGEgZm9yIHRoaXMgZHJhZyBvcGVyYXRpb24uIE90aGVy d2lzZSB3ZSdkIGhhdmUgdG8gYmxvY2sgdG8gd2FpdAogICAgIC8vIGZvciB0aGUgZHJhZydzIGRh dGEuCi0gICAgQVNTRVJUKGRyb3BwaW5nQ29udGV4dCk7CiAgICAgaWYgKGRyb3BwaW5nQ29udGV4 dC0+cGVuZGluZ0RhdGFSZXF1ZXN0cyA+IDApCi0gICAgICAgIHJldHVybiAwOworICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKIAogICAgIHJldHVybiBkcm9wcGluZ0NvbnRleHQtPmRhdGFPYmplY3Qu Z2V0KCk7CiB9CiAKIERhdGFPYmplY3RHdGsqIEd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVE cmFnRGF0YVJlY2VpdmVkKEdka0RyYWdDb250ZXh0KiBjb250ZXh0LCBHdGtTZWxlY3Rpb25EYXRh KiBzZWxlY3Rpb25EYXRhLCB1bnNpZ25lZCBpbmZvLCBJbnRQb2ludCYgcG9zaXRpb24pCiB7Ci0g ICAgRHJvcHBpbmdDb250ZXh0TWFwOjppdGVyYXRvciBpdGVyYXRvciA9IG1fZHJvcHBpbmdDb250 ZXh0cy5maW5kKGNvbnRleHQpOwotICAgIGlmIChpdGVyYXRvciA9PSBtX2Ryb3BwaW5nQ29udGV4 dHMuZW5kKCkpCi0gICAgICAgIHJldHVybiAwOworICAgIERyb3BwaW5nQ29udGV4dCogZHJvcHBp bmdDb250ZXh0ID0gbV9kcm9wcGluZ0NvbnRleHRzLmdldChjb250ZXh0KTsKKyAgICBpZiAoIWRy b3BwaW5nQ29udGV4dCkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBEcm9wcGluZ0Nv bnRleHQqIGRyb3BwaW5nQ29udGV4dCA9IGl0ZXJhdG9yLT52YWx1ZTsKICAgICBkcm9wcGluZ0Nv bnRleHQtPnBlbmRpbmdEYXRhUmVxdWVzdHMtLTsKICAgICBQYXN0ZWJvYXJkSGVscGVyOjpkZWZh dWx0UGFzdGVib2FyZEhlbHBlcigpLT5maWxsRGF0YU9iamVjdEZyb21Ecm9wRGF0YShzZWxlY3Rp b25EYXRhLCBpbmZvLCBkcm9wcGluZ0NvbnRleHQtPmRhdGFPYmplY3QuZ2V0KCkpOwogCiAgICAg aWYgKGRyb3BwaW5nQ29udGV4dC0+cGVuZGluZ0RhdGFSZXF1ZXN0cykKLSAgICAgICAgcmV0dXJu IDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgLy8gVGhlIGNvb3JkaW5hdGVzIHBh c3NlZCB0byBkcmFnLWRhdGEtcmVjZWl2ZWQgc2lnbmFsIGFyZSBzb21ldGltZXMKICAgICAvLyBp bmFjY3VyYXRlIGluIERSVCwgc28gdXNlIHRoZSBjb29yZGluYXRlcyBvZiB0aGUgbGFzdCBtb3Rp b24gZXZlbnQuCkBAIC0xNzYsMTEgKzE2NSwxMCBAQCBEYXRhT2JqZWN0R3RrKiBHdGtEcmFnQW5k RHJvcEhlbHBlcjo6aGFuZGxlRHJhZ0RhdGFSZWNlaXZlZChHZGtEcmFnQ29udGV4dCogY29udAog CiBEYXRhT2JqZWN0R3RrKiBHdGtEcmFnQW5kRHJvcEhlbHBlcjo6aGFuZGxlRHJhZ0Ryb3AoR2Rr RHJhZ0NvbnRleHQqIGNvbnRleHQpCiB7Ci0gICAgRHJvcHBpbmdDb250ZXh0TWFwOjppdGVyYXRv ciBpdGVyYXRvciA9IG1fZHJvcHBpbmdDb250ZXh0cy5maW5kKGNvbnRleHQpOwotICAgIGlmIChp dGVyYXRvciA9PSBtX2Ryb3BwaW5nQ29udGV4dHMuZW5kKCkpCi0gICAgICAgIHJldHVybiAwOwor ICAgIERyb3BwaW5nQ29udGV4dCogZHJvcHBpbmdDb250ZXh0ID0gbV9kcm9wcGluZ0NvbnRleHRz LmdldChjb250ZXh0KTsKKyAgICBpZiAoIWRyb3BwaW5nQ29udGV4dCkKKyAgICAgICAgcmV0dXJu IG51bGxwdHI7CiAKLSAgICBEcm9wcGluZ0NvbnRleHQqIGRyb3BwaW5nQ29udGV4dCA9IGl0ZXJh dG9yLT52YWx1ZTsKICAgICBkcm9wcGluZ0NvbnRleHQtPmRyb3BIYXBwZW5lZCA9IHRydWU7CiAK ICAgICByZXR1cm4gZHJvcHBpbmdDb250ZXh0LT5kYXRhT2JqZWN0LmdldCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9wSGVscGVyLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuaAppbmRleCAy Mjk3ZDYzMzY0NTk5ODM5NGU0NmI3NmMzNGNhNWQ4ZGU4Zjc2OTU5Li5lODlhYzQ5ZjlkMmQ5ZDlj Zjc1ODgyYzNiOTUyMWMwNDQwMDkxNzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuaApAQCAtMjIsNyArMjIsNiBAQAogI2luY2x1 ZGUgIkRhdGFPYmplY3RHdGsuaCIKICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1 ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgotI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0zNiwxMCArMzUsNyBAQCBjbGFzcyBHdGtEcmFnQW5k RHJvcEhlbHBlciB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAKIHB1YmxpYzoKLSAg ICBHdGtEcmFnQW5kRHJvcEhlbHBlcigpCi0gICAgICAgIDogbV93aWRnZXQoMCkKLSAgICB7Ci0g ICAgfQorICAgIEd0a0RyYWdBbmREcm9wSGVscGVyKCk7CiAgICAgfkd0a0RyYWdBbmREcm9wSGVs cGVyKCk7CiAKICAgICB2b2lkIHNldFdpZGdldChHdGtXaWRnZXQqIHdpZGdldCkgeyBtX3dpZGdl dCA9IHdpZGdldDsgfQpAQCAtNTQsOCArNTAsOCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAg R3RrV2lkZ2V0KiBtX3dpZGdldDsKLSAgICBIYXNoTWFwPEdka0RyYWdDb250ZXh0KiwgRHJvcHBp bmdDb250ZXh0Kj4gbV9kcm9wcGluZ0NvbnRleHRzOwotICAgIEhhc2hNYXA8R2RrRHJhZ0NvbnRl eHQqLCBSZWZQdHI8RGF0YU9iamVjdEd0az4gPiBtX2RyYWdnaW5nRGF0YU9iamVjdHM7CisgICAg SGFzaE1hcDxHZGtEcmFnQ29udGV4dCosIHN0ZDo6dW5pcXVlX3B0cjxEcm9wcGluZ0NvbnRleHQ+ PiBtX2Ryb3BwaW5nQ29udGV4dHM7CisgICAgSGFzaE1hcDxHZGtEcmFnQ29udGV4dCosIFJlZlB0 cjxEYXRhT2JqZWN0R3RrPj4gbV9kcmFnZ2luZ0RhdGFPYmplY3RzOwogfTsKIAogfQo= 213535 2013-10-06 16:15:26 -0700 2013-10-06 17:42:29 -0700 Patch bug-122417-20131006161525.patch text/plain 9215 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDdkZmUwYmM3YjAzZjNl NmVkNjhjMjA2MzUxZDY4ZTVhNzUyZGJjMi4uMmRjMmRlMjhhZjkyMzMzZjNmMTlkZmNmNzkzYTU1 OWZkNzdmODk3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTEwLTA2ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBbR1RLXSBHZXQgcmlkIG9mIHVz ZSBvZiBkZWxldGVBbGxWYWx1ZXMgaW4gR3RrRHJhZ0FuZERyb3BIZWxwZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjQxNworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a0Ry YWdBbmREcm9wSGVscGVyLmNwcDogUmVtb3ZlZCB1bm5lZWRlZCB0eXBlZGVmcy4KKyAgICAgICAg KFdlYkNvcmU6Okd0a0RyYWdBbmREcm9wSGVscGVyOjp+R3RrRHJhZ0FuZERyb3BIZWxwZXIpOiBS ZW1vdmVkIGNhbGwgdG8KKyAgICAgICAgZGVsZXRlQWxsVmFsdWVzLgorICAgICAgICAoV2ViQ29y ZTo6R3RrRHJhZ0FuZERyb3BIZWxwZXI6OmhhbmRsZURyYWdFbmQpOiBVc2UgcmVtb3ZlIGRpcmVj dGx5IGluc3RlYWQKKyAgICAgICAgb2YgdXNpbmcgZmluZCB0aGVuIHJlbW92ZS4gSSBiZWxpZXZl IHRoaXMgZml4ZXMgYSBzdG9yYWdlIGxlYWsuCisgICAgICAgIChXZWJDb3JlOjpHdGtEcmFnQW5k RHJvcEhlbHBlcjo6aGFuZGxlR2V0RHJhZ0RhdGEpOiBVc2UgZ2V0IGluc3RlYWQgb2YgZmluZC4K KyAgICAgICAgKFdlYkNvcmU6Okd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnTGVhdmVM YXRlcik6IFJlbW92ZSB0aGUgZXhwbGljaXQKKyAgICAgICAgZGVsZXRlIHNpbmNlIHJlbW92ZSB3 aWxsIGF1dG9tYXRpY2FsbHkgZGVsZXRlLgorICAgICAgICAoV2ViQ29yZTo6R3RrRHJhZ0FuZERy b3BIZWxwZXI6OmhhbmRsZURyYWdMZWF2ZSk6IFVzZSBnZXQgaW5zdGVhZCBvZiBmaW5kLgorICAg ICAgICAoV2ViQ29yZTo6R3RrRHJhZ0FuZERyb3BIZWxwZXI6OmhhbmRsZURyYWdNb3Rpb24pOiBV c2UgYWRkIGluc3RlYWQgb2YgYQorICAgICAgICBjb21iaW5hdGlvbiBvZiBmaW5kIGFuZCBzZXQu IEFsc28gdXNlciBudWxscHRyIGluc3RlYWQgb2YgMC4KKyAgICAgICAgKFdlYkNvcmU6Okd0a0Ry YWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnRGF0YVJlY2VpdmVkKTogVXNlIGdldCBpbnN0ZWFk IG9mIGZpbmQuCisgICAgICAgIChXZWJDb3JlOjpHdGtEcmFnQW5kRHJvcEhlbHBlcjo6aGFuZGxl RHJhZ0Ryb3ApOiBVc2UgZ2V0IGluc3RlYWQgb2YgZmluZC4KKworICAgICAgICAqIHBsYXRmb3Jt L2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5oOiBVc2UgbnVsbHB0ciBpbnN0ZWFkIG9mIDAuIENo YW5nZSB2YWx1ZQorICAgICAgICB0eXBlIG9mIG1fZHJvcHBpbmdDb250ZXh0cyB0byBiZSBhIHN0 ZDo6dW5pcXVlX3B0ci4KKwogMjAxMy0xMC0wNiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBs ZS5jb20+CiAKICAgICAgICAgTW92ZSBwYWludCgpIHRvIFJlbmRlckVsZW1lbnQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuY3BwCmlu ZGV4IDE1N2E2MDdhMTg5YjU0Yjg2NGE1OThmZmI4NTg1M2E1OGQ3YjM2YjYuLjhiOWRlNmE1ODEz NjM2NTZmNzAyZDBiZDVkN2U4YjUwMGNiNGEyMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9wSGVscGVyLmNwcApAQCAtMzksMzcgKzM5LDMz IEBAIHN0cnVjdCBEcm9wcGluZ0NvbnRleHQgewogICAgIH0KIAogICAgIEdka0RyYWdDb250ZXh0 KiBnZGtDb250ZXh0OwotICAgIFJlZlB0cjxXZWJDb3JlOjpEYXRhT2JqZWN0R3RrPiBkYXRhT2Jq ZWN0OworICAgIFJlZlB0cjxEYXRhT2JqZWN0R3RrPiBkYXRhT2JqZWN0OwogICAgIFdlYkNvcmU6 OkludFBvaW50IGxhc3RNb3Rpb25Qb3NpdGlvbjsKICAgICBpbnQgcGVuZGluZ0RhdGFSZXF1ZXN0 czsKICAgICBib29sIGRyb3BIYXBwZW5lZDsKICAgICBEcmFnRXhpdGVkQ2FsbGJhY2sgZXhpdGVk Q2FsbGJhY2s7CiB9OwogCi10eXBlZGVmIEhhc2hNYXA8R2RrRHJhZ0NvbnRleHQqLCBEcm9wcGlu Z0NvbnRleHQqPiBEcm9wcGluZ0NvbnRleHRNYXA7Ci10eXBlZGVmIEhhc2hNYXA8R2RrRHJhZ0Nv bnRleHQqLCBSZWZQdHI8RGF0YU9iamVjdEd0az4gPiBEcmFnZ2luZ0RhdGFPYmplY3RzTWFwOwor R3RrRHJhZ0FuZERyb3BIZWxwZXI6Okd0a0RyYWdBbmREcm9wSGVscGVyKCkKKyAgICA6IG1fd2lk Z2V0KG51bGxwdHIpCit7Cit9CiAKIEd0a0RyYWdBbmREcm9wSGVscGVyOjp+R3RrRHJhZ0FuZERy b3BIZWxwZXIoKQogewotICAgIGRlbGV0ZUFsbFZhbHVlcyhtX2Ryb3BwaW5nQ29udGV4dHMpOwog fQogCiBib29sIEd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnRW5kKEdka0RyYWdDb250 ZXh0KiBkcmFnQ29udGV4dCkKIHsKLSAgICBEcmFnZ2luZ0RhdGFPYmplY3RzTWFwOjppdGVyYXRv ciBpdGVyYXRvciA9IG1fZHJhZ2dpbmdEYXRhT2JqZWN0cy5maW5kKGRyYWdDb250ZXh0KTsKLSAg ICBpZiAoaXRlcmF0b3IgPT0gbV9kcmFnZ2luZ0RhdGFPYmplY3RzLmVuZCgpKQotICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0KLSAgICBtX2RyYWdnaW5nRGF0YU9iamVjdHMucmVtb3ZlKGl0ZXJhdG9y KTsKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gbV9kcmFnZ2luZ0RhdGFPYmplY3RzLnJl bW92ZShkcmFnQ29udGV4dCk7CiB9CiAKIHZvaWQgR3RrRHJhZ0FuZERyb3BIZWxwZXI6OmhhbmRs ZUdldERyYWdEYXRhKEdka0RyYWdDb250ZXh0KiBjb250ZXh0LCBHdGtTZWxlY3Rpb25EYXRhKiBz ZWxlY3Rpb25EYXRhLCBndWludCBpbmZvKQogewotICAgIERyYWdnaW5nRGF0YU9iamVjdHNNYXA6 Oml0ZXJhdG9yIGl0ZXJhdG9yID0gbV9kcmFnZ2luZ0RhdGFPYmplY3RzLmZpbmQoY29udGV4dCk7 Ci0gICAgaWYgKGl0ZXJhdG9yID09IG1fZHJhZ2dpbmdEYXRhT2JqZWN0cy5lbmQoKSkKKyAgICBE YXRhT2JqZWN0R3RrKiBkYXRhT2JqZWN0ID0gbV9kcmFnZ2luZ0RhdGFPYmplY3RzLmdldChjb250 ZXh0KTsKKyAgICBpZiAoIWRhdGFPYmplY3QpCiAgICAgICAgIHJldHVybjsKLSAgICBQYXN0ZWJv YXJkSGVscGVyOjpkZWZhdWx0UGFzdGVib2FyZEhlbHBlcigpLT5maWxsU2VsZWN0aW9uRGF0YShz ZWxlY3Rpb25EYXRhLCBpbmZvLCBpdGVyYXRvci0+dmFsdWUuZ2V0KCkpOworICAgIFBhc3RlYm9h cmRIZWxwZXI6OmRlZmF1bHRQYXN0ZWJvYXJkSGVscGVyKCktPmZpbGxTZWxlY3Rpb25EYXRhKHNl bGVjdGlvbkRhdGEsIGluZm8sIGRhdGFPYmplY3QpOwogfQogCiBzdHJ1Y3QgSGFuZGxlRHJhZ0xh dGVyRGF0YSB7CkBAIC04Niw3ICs4Miw3IEBAIHN0YXRpYyBnYm9vbGVhbiBoYW5kbGVEcmFnTGVh dmVMYXRlckNhbGxiYWNrKEhhbmRsZURyYWdMYXRlckRhdGEqIGRhdGEpCiAKIHZvaWQgR3RrRHJh Z0FuZERyb3BIZWxwZXI6OmhhbmRsZURyYWdMZWF2ZUxhdGVyKERyb3BwaW5nQ29udGV4dCogY29u dGV4dCkKIHsKLSAgICBEcm9wcGluZ0NvbnRleHRNYXA6Oml0ZXJhdG9yIGl0ZXJhdG9yID0gbV9k cm9wcGluZ0NvbnRleHRzLmZpbmQoY29udGV4dC0+Z2RrQ29udGV4dCk7CisgICAgYXV0byBpdGVy YXRvciA9IG1fZHJvcHBpbmdDb250ZXh0cy5maW5kKGNvbnRleHQtPmdka0NvbnRleHQpOwogICAg IGlmIChpdGVyYXRvciA9PSBtX2Ryb3BwaW5nQ29udGV4dHMuZW5kKCkpCiAgICAgICAgIHJldHVy bjsKIApAQCAtMTAyLDIwICs5OCwxOSBAQCB2b2lkIEd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5k bGVEcmFnTGVhdmVMYXRlcihEcm9wcGluZ0NvbnRleHQqIGNvbnRleHQpCiAgICAgY29udGV4dC0+ ZXhpdGVkQ2FsbGJhY2sobV93aWRnZXQsICZkcmFnRGF0YSwgY29udGV4dC0+ZHJvcEhhcHBlbmVk KTsKIAogICAgIG1fZHJvcHBpbmdDb250ZXh0cy5yZW1vdmUoaXRlcmF0b3IpOwotICAgIGRlbGV0 ZSBjb250ZXh0OwogfQogCiB2b2lkIEd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnTGVh dmUoR2RrRHJhZ0NvbnRleHQqIGdka0NvbnRleHQsIERyYWdFeGl0ZWRDYWxsYmFjayBleGl0ZWRD YWxsYmFjaykKIHsKLSAgICBEcm9wcGluZ0NvbnRleHRNYXA6Oml0ZXJhdG9yIGl0ZXJhdG9yID0g bV9kcm9wcGluZ0NvbnRleHRzLmZpbmQoZ2RrQ29udGV4dCk7Ci0gICAgaWYgKGl0ZXJhdG9yID09 IG1fZHJvcHBpbmdDb250ZXh0cy5lbmQoKSkKKyAgICBEcm9wcGluZ0NvbnRleHQqIGNvbnRleHQg PSBtX2Ryb3BwaW5nQ29udGV4dHMuZ2V0KGdka0NvbnRleHQpOworICAgIGlmICghY29udGV4dCkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gRHVyaW5nIGEgZHJvcCBHVEsrIHdpbGwgZmlyZSBh IGRyYWctbGVhdmUgc2lnbmFsIHJpZ2h0IGJlZm9yZSBmaXJpbmcKICAgICAvLyB0aGUgZHJhZy1k cm9wIHNpZ25hbC4gV2Ugd2FudCB0aGUgYWN0aW9ucyBmb3IgZHJhZy1sZWF2ZSB0byBoYXBwZW4g YWZ0ZXIKICAgICAvLyB0aG9zZSBmb3IgZHJhZy1kcm9wLCBzbyBzY2hlZHVsZSB0aGVtIHRvIGhh cHBlbiBhc3luY2hyb25vdXNseSBoZXJlLgogICAgIEhhbmRsZURyYWdMYXRlckRhdGEqIGRhdGEg PSBuZXcgSGFuZGxlRHJhZ0xhdGVyRGF0YTsKLSAgICBkYXRhLT5jb250ZXh0ID0gaXRlcmF0b3It PnZhbHVlOworICAgIGRhdGEtPmNvbnRleHQgPSBjb250ZXh0OwogICAgIGRhdGEtPmNvbnRleHQt PmV4aXRlZENhbGxiYWNrID0gZXhpdGVkQ2FsbGJhY2s7CiAgICAgZGF0YS0+Z2x1ZSA9IHRoaXM7 CiAgICAgZ190aW1lb3V0X2FkZCgwLCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPihoYW5k bGVEcmFnTGVhdmVMYXRlckNhbGxiYWNrKSwgZGF0YSk7CkBAIC0xMzIsMzkgKzEyNywzMyBAQCBz dGF0aWMgdm9pZCBxdWVyeU5ld0Ryb3BDb250ZXh0RGF0YShEcm9wcGluZ0NvbnRleHQqIGRyb3BD b250ZXh0LCBHdGtXaWRnZXQqIHdpZAogCiBEYXRhT2JqZWN0R3RrKiBHdGtEcmFnQW5kRHJvcEhl bHBlcjo6aGFuZGxlRHJhZ01vdGlvbihHZGtEcmFnQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50 UG9pbnQmIHBvc2l0aW9uLCB1bnNpZ25lZCB0aW1lKQogewotICAgIERyb3BwaW5nQ29udGV4dCog ZHJvcHBpbmdDb250ZXh0ID0gMDsKLSAgICBEcm9wcGluZ0NvbnRleHRNYXA6Oml0ZXJhdG9yIGl0 ZXJhdG9yID0gbV9kcm9wcGluZ0NvbnRleHRzLmZpbmQoY29udGV4dCk7Ci0gICAgaWYgKGl0ZXJh dG9yID09IG1fZHJvcHBpbmdDb250ZXh0cy5lbmQoKSkgewotICAgICAgICBkcm9wcGluZ0NvbnRl eHQgPSBuZXcgRHJvcHBpbmdDb250ZXh0KGNvbnRleHQsIHBvc2l0aW9uKTsKLSAgICAgICAgbV9k cm9wcGluZ0NvbnRleHRzLnNldChjb250ZXh0LCBkcm9wcGluZ0NvbnRleHQpOwotICAgICAgICBx dWVyeU5ld0Ryb3BDb250ZXh0RGF0YShkcm9wcGluZ0NvbnRleHQsIG1fd2lkZ2V0LCB0aW1lKTsK LSAgICB9IGVsc2UgewotICAgICAgICBkcm9wcGluZ0NvbnRleHQgPSBpdGVyYXRvci0+dmFsdWU7 CisgICAgc3RkOjp1bmlxdWVfcHRyPERyb3BwaW5nQ29udGV4dD4mIGRyb3BwaW5nQ29udGV4dCA9 IG1fZHJvcHBpbmdDb250ZXh0cy5hZGQoY29udGV4dCwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVl OworICAgIGlmICghZHJvcHBpbmdDb250ZXh0KSB7CisgICAgICAgIGRyb3BwaW5nQ29udGV4dCA9 IHN0ZDo6bWFrZV91bmlxdWU8RHJvcHBpbmdDb250ZXh0Pihjb250ZXh0LCBwb3NpdGlvbik7Cisg ICAgICAgIHF1ZXJ5TmV3RHJvcENvbnRleHREYXRhKGRyb3BwaW5nQ29udGV4dC5nZXQoKSwgbV93 aWRnZXQsIHRpbWUpOworICAgIH0gZWxzZQogICAgICAgICBkcm9wcGluZ0NvbnRleHQtPmxhc3RN b3Rpb25Qb3NpdGlvbiA9IHBvc2l0aW9uOwotICAgIH0KIAogICAgIC8vIERvbid0IHNlbmQgYW55 IGRyYWcgaW5mb3JtYXRpb24gdG8gV2ViQ29yZSB1bnRpbCB3ZSd2ZSByZXRyaWV2ZWQgYWxsCiAg ICAgLy8gdGhlIGRhdGEgZm9yIHRoaXMgZHJhZyBvcGVyYXRpb24uIE90aGVyd2lzZSB3ZSdkIGhh dmUgdG8gYmxvY2sgdG8gd2FpdAogICAgIC8vIGZvciB0aGUgZHJhZydzIGRhdGEuCi0gICAgQVNT RVJUKGRyb3BwaW5nQ29udGV4dCk7CiAgICAgaWYgKGRyb3BwaW5nQ29udGV4dC0+cGVuZGluZ0Rh dGFSZXF1ZXN0cyA+IDApCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0 cjsKIAogICAgIHJldHVybiBkcm9wcGluZ0NvbnRleHQtPmRhdGFPYmplY3QuZ2V0KCk7CiB9CiAK IERhdGFPYmplY3RHdGsqIEd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnRGF0YVJlY2Vp dmVkKEdka0RyYWdDb250ZXh0KiBjb250ZXh0LCBHdGtTZWxlY3Rpb25EYXRhKiBzZWxlY3Rpb25E YXRhLCB1bnNpZ25lZCBpbmZvLCBJbnRQb2ludCYgcG9zaXRpb24pCiB7Ci0gICAgRHJvcHBpbmdD b250ZXh0TWFwOjppdGVyYXRvciBpdGVyYXRvciA9IG1fZHJvcHBpbmdDb250ZXh0cy5maW5kKGNv bnRleHQpOwotICAgIGlmIChpdGVyYXRvciA9PSBtX2Ryb3BwaW5nQ29udGV4dHMuZW5kKCkpCi0g ICAgICAgIHJldHVybiAwOworICAgIERyb3BwaW5nQ29udGV4dCogZHJvcHBpbmdDb250ZXh0ID0g bV9kcm9wcGluZ0NvbnRleHRzLmdldChjb250ZXh0KTsKKyAgICBpZiAoIWRyb3BwaW5nQ29udGV4 dCkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBEcm9wcGluZ0NvbnRleHQqIGRyb3Bw aW5nQ29udGV4dCA9IGl0ZXJhdG9yLT52YWx1ZTsKICAgICBkcm9wcGluZ0NvbnRleHQtPnBlbmRp bmdEYXRhUmVxdWVzdHMtLTsKICAgICBQYXN0ZWJvYXJkSGVscGVyOjpkZWZhdWx0UGFzdGVib2Fy ZEhlbHBlcigpLT5maWxsRGF0YU9iamVjdEZyb21Ecm9wRGF0YShzZWxlY3Rpb25EYXRhLCBpbmZv LCBkcm9wcGluZ0NvbnRleHQtPmRhdGFPYmplY3QuZ2V0KCkpOwogCiAgICAgaWYgKGRyb3BwaW5n Q29udGV4dC0+cGVuZGluZ0RhdGFSZXF1ZXN0cykKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAg IHJldHVybiBudWxscHRyOwogCiAgICAgLy8gVGhlIGNvb3JkaW5hdGVzIHBhc3NlZCB0byBkcmFn LWRhdGEtcmVjZWl2ZWQgc2lnbmFsIGFyZSBzb21ldGltZXMKICAgICAvLyBpbmFjY3VyYXRlIGlu IERSVCwgc28gdXNlIHRoZSBjb29yZGluYXRlcyBvZiB0aGUgbGFzdCBtb3Rpb24gZXZlbnQuCkBA IC0xNzYsMTEgKzE2NSwxMCBAQCBEYXRhT2JqZWN0R3RrKiBHdGtEcmFnQW5kRHJvcEhlbHBlcjo6 aGFuZGxlRHJhZ0RhdGFSZWNlaXZlZChHZGtEcmFnQ29udGV4dCogY29udAogCiBEYXRhT2JqZWN0 R3RrKiBHdGtEcmFnQW5kRHJvcEhlbHBlcjo6aGFuZGxlRHJhZ0Ryb3AoR2RrRHJhZ0NvbnRleHQq IGNvbnRleHQpCiB7Ci0gICAgRHJvcHBpbmdDb250ZXh0TWFwOjppdGVyYXRvciBpdGVyYXRvciA9 IG1fZHJvcHBpbmdDb250ZXh0cy5maW5kKGNvbnRleHQpOwotICAgIGlmIChpdGVyYXRvciA9PSBt X2Ryb3BwaW5nQ29udGV4dHMuZW5kKCkpCi0gICAgICAgIHJldHVybiAwOworICAgIERyb3BwaW5n Q29udGV4dCogZHJvcHBpbmdDb250ZXh0ID0gbV9kcm9wcGluZ0NvbnRleHRzLmdldChjb250ZXh0 KTsKKyAgICBpZiAoIWRyb3BwaW5nQ29udGV4dCkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAK LSAgICBEcm9wcGluZ0NvbnRleHQqIGRyb3BwaW5nQ29udGV4dCA9IGl0ZXJhdG9yLT52YWx1ZTsK ICAgICBkcm9wcGluZ0NvbnRleHQtPmRyb3BIYXBwZW5lZCA9IHRydWU7CiAKICAgICByZXR1cm4g ZHJvcHBpbmdDb250ZXh0LT5kYXRhT2JqZWN0LmdldCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9wSGVscGVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuaAppbmRleCAyMjk3ZDYzMzY0NTk5 ODM5NGU0NmI3NmMzNGNhNWQ4ZGU4Zjc2OTU5Li5lODlhYzQ5ZjlkMmQ5ZDljZjc1ODgyYzNiOTUy MWMwNDQwMDkxNzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3Rr RHJhZ0FuZERyb3BIZWxwZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3Rr RHJhZ0FuZERyb3BIZWxwZXIuaApAQCAtMjIsNyArMjIsNiBAQAogI2luY2x1ZGUgIkRhdGFPYmpl Y3RHdGsuaCIKICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9Ob25j b3B5YWJsZS5oPgotI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCkBAIC0zNiwxMCArMzUsNyBAQCBjbGFzcyBHdGtEcmFnQW5kRHJvcEhlbHBlciB7 CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAKIHB1YmxpYzoKLSAgICBHdGtEcmFnQW5k RHJvcEhlbHBlcigpCi0gICAgICAgIDogbV93aWRnZXQoMCkKLSAgICB7Ci0gICAgfQorICAgIEd0 a0RyYWdBbmREcm9wSGVscGVyKCk7CiAgICAgfkd0a0RyYWdBbmREcm9wSGVscGVyKCk7CiAKICAg ICB2b2lkIHNldFdpZGdldChHdGtXaWRnZXQqIHdpZGdldCkgeyBtX3dpZGdldCA9IHdpZGdldDsg fQpAQCAtNTQsOCArNTAsOCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgR3RrV2lkZ2V0KiBt X3dpZGdldDsKLSAgICBIYXNoTWFwPEdka0RyYWdDb250ZXh0KiwgRHJvcHBpbmdDb250ZXh0Kj4g bV9kcm9wcGluZ0NvbnRleHRzOwotICAgIEhhc2hNYXA8R2RrRHJhZ0NvbnRleHQqLCBSZWZQdHI8 RGF0YU9iamVjdEd0az4gPiBtX2RyYWdnaW5nRGF0YU9iamVjdHM7CisgICAgSGFzaE1hcDxHZGtE cmFnQ29udGV4dCosIHN0ZDo6dW5pcXVlX3B0cjxEcm9wcGluZ0NvbnRleHQ+PiBtX2Ryb3BwaW5n Q29udGV4dHM7CisgICAgSGFzaE1hcDxHZGtEcmFnQ29udGV4dCosIFJlZlB0cjxEYXRhT2JqZWN0 R3RrPj4gbV9kcmFnZ2luZ0RhdGFPYmplY3RzOwogfTsKIAogfQo=