142825 2015-03-18 08:15:14 -0700 Refactor ImageLoader's setting of CachedImage 2015-03-23 02:15:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yoav webkit-unassigned cdumez commit-queue esprehn+autocc gyuyoung.kim japhet oldest_to_newest 1078190 0 yoav 2015-03-18 08:15:14 -0700 Refactor ImageLoader's setting of CachedImage 1078201 1 248932 yoav 2015-03-18 08:39:27 -0700 Created attachment 248932 Patch 1078222 2 248932 cdumez 2015-03-18 09:17:07 -0700 Comment on attachment 248932 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248932&action=review r=me > Source/WebCore/ChangeLog:11 > + CachedImages and were not used as originalyl inteneded. That resulted in some dead code, "originally intended" 1078227 3 248932 cdumez 2015-03-18 09:26:48 -0700 Comment on attachment 248932 Patch Please fix the typos. 1078233 4 248941 yoav 2015-03-18 09:52:49 -0700 Created attachment 248941 Patch 1078234 5 yoav 2015-03-18 09:55:23 -0700 Fixed the typo. Apologies for CQing it. I missed the comment due to conference WiFi slowness :/ 1078238 6 248941 cdumez 2015-03-18 10:19:13 -0700 Comment on attachment 248941 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248941&action=review > Source/WebCore/ChangeLog:11 > + CachedImages and were not used as originally inteneded. That resulted in some dead code, "intended". You fixed one out of 2 typos. 1078495 7 249025 yoav 2015-03-19 01:29:39 -0700 Created attachment 249025 Patch 1078496 8 249025 yoav 2015-03-19 01:30:23 -0700 Comment on attachment 249025 Patch Sorry about that. Fixed the second one as well. 1078533 9 249025 darin 2015-03-19 08:08:00 -0700 Comment on attachment 249025 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249025&action=review > Source/WebCore/loader/ImageLoader.cpp:139 > + if (oldImage) { Can this instead be an early return? Is it important to call resetAnimation when m_image is null? 1078651 10 249025 yoav 2015-03-19 15:33:10 -0700 Comment on attachment 249025 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249025&action=review >> Source/WebCore/loader/ImageLoader.cpp:139 >> + if (oldImage) { > > Can this instead be an early return? Is it important to call resetAnimation when m_image is null? I'm not sure, TBH. Since resetAnimation is called on renderImageResource, which arrives from the element's renderer (so not necessarily null, and not related to m_image), it seems likely that we do need to reset any animations when setting the CachedImage to be null. 1079241 11 249025 yoav 2015-03-23 01:28:31 -0700 Comment on attachment 249025 Patch Committing, but let me know if you think this can be further improved and I'll do that in a followup patch. 1079244 12 249025 commit-queue 2015-03-23 02:15:00 -0700 Comment on attachment 249025 Patch Clearing flags on attachment: 249025 Committed r181849: <http://trac.webkit.org/changeset/181849> 1079245 13 commit-queue 2015-03-23 02:15:05 -0700 All reviewed patches have been landed. Closing bug. 248932 2015-03-18 08:39:27 -0700 2015-03-18 09:35:32 -0700 Patch bug-142825-20150318153725.patch text/plain 5570 yoav U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg5OTJiZmM2MDkyMjU1 NThmYzVhMDliODM5YjZiNDAwNjJlODkwZC4uYjdjMDRlZWJhOTBjMTkzZDM1Yjc3YzY1YzRjNWY1 Yjk5NGUxOTA0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTAzLTE4ICBZb2F2 IFdlaXNzICA8eW9hdkB5b2F2LndzPgorCisgICAgICAgIFJlZmFjdG9yIEltYWdlTG9hZGVyJ3Mg c2V0dGluZyBvZiBDYWNoZWRJbWFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQyODI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBzaW5jZSB0aGVyZSdzIG5vIGZ1bmN0aW9uYWwg Y2hhbmdlLgorCisgICAgICAgIHNldEltYWdlIGFuZCBzZXRJbWFnZVdpdGhvdXRDb25zaWRlcmlu Z1BlbmRpbmdMb2FkRXZlbnQgd2VyZSBub3QgY2FsbGVkIHdpdGggbmV3CisgICAgICAgIENhY2hl ZEltYWdlcyBhbmQgd2VyZSBub3QgdXNlZCBhcyBvcmlnaW5hbHlsIGludGVuZWRlZC4gVGhhdCBy ZXN1bHRlZCBpbiBzb21lIGRlYWQgY29kZSwKKyAgICAgICAgYW5kIGNvbmZ1c2lvbiB3aGVuIGdv aW5nIG92ZXIgdGhlIGNvZGUuCisgICAgICAgIFRoaXMgcGF0Y2ggcmVuYW1lcyB0aGVzZSBtZXRo b2RzIGludG8gZXF1aXZhbGVudCBjbGVhckltYWdlKiBtZXRob2RzLCBhbmQgZGVsZXRlcyByZXN1 bHRpbmcgZGVhZCBjb2RlLgorCisgICAgICAgICogaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MT2JqZWN0RWxlbWVudDo6cmVuZGVyRmFsbGJhY2tDb250 ZW50KTogQ2hhbmdlZCBzZXRJbWFnZSBjYWxsIHRvIGNsZWFySW1hZ2UuCisgICAgICAgICogbG9h ZGVyL0ltYWdlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjpjbGVh ckltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjpjbGVhckltYWdlV2l0aG91 dENvbnNpZGVyaW5nUGVuZGluZ0xvYWRFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxv YWRlcjo6bm90aWZ5RmluaXNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OmVs ZW1lbnREaWRNb3ZlVG9OZXdEb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRl cjo6c2V0SW1hZ2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnNl dEltYWdlV2l0aG91dENvbnNpZGVyaW5nUGVuZGluZ0xvYWRFdmVudCk6IERlbGV0ZWQuCisgICAg ICAgICogbG9hZGVyL0ltYWdlTG9hZGVyLmg6CisKIDIwMTUtMDMtMTggIFphbGFuIEJ1anRhcyAg PHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGUgbGluZSBsYXlvdXQ6IFNwbGl0IGZy YWdtZW50cyBvbiByZW5kZXJlciBib3VuZGFyeSBvbiB0aGUgZmx5LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAppbmRleCBlY2U0NDE3OGM3ZDAxN2Y4ODU2YjQ5MTMx NWZjNDNmNTZkYWU5OGFmLi41MjM4NGIxOGVkNDQyN2IxNWMxNDFiMDMwZjdiZmFkZGY1M2I1OTRh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcApAQCAtMzgyLDcg KzM4Miw3IEBAIHZvaWQgSFRNTE9iamVjdEVsZW1lbnQ6OnJlbmRlckZhbGxiYWNrQ29udGVudCgp CiAgICAgICAgIG1fc2VydmljZVR5cGUgPSBsb2FkZXItPmltYWdlKCktPnJlc3BvbnNlKCkubWlt ZVR5cGUoKTsKICAgICAgICAgaWYgKCFpc0ltYWdlVHlwZSgpKSB7CiAgICAgICAgICAgICAvLyBJ ZiB3ZSBkb24ndCB0aGluayB3ZSBoYXZlIGFuIGltYWdlIHR5cGUgYW55bW9yZSwgdGhlbiBjbGVh ciB0aGUgaW1hZ2UgZnJvbSB0aGUgbG9hZGVyLgotICAgICAgICAgICAgbG9hZGVyLT5zZXRJbWFn ZShudWxscHRyKTsKKyAgICAgICAgICAgIGxvYWRlci0+Y2xlYXJJbWFnZSgpOwogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ltYWdlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRl ci5jcHAKaW5kZXggZDljMWJkMzBhOGY4MGNmNzBjNWE3OGIyZTRiNzFjYWE2OGI2YTU4Ny4uYzcz NTMzYjA1N2I1MzZiYTJhMDM5MDk0N2EzYmRiNTFmZmEyNjUxNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvSW1hZ2VMb2FkZXIuY3BwCkBAIC0xMjMsMjEgKzEyMywyMSBAQCBJbWFnZUxvYWRlcjo6fklt YWdlTG9hZGVyKCkKICAgICAgICAgZWxlbWVudCgpLmRlcmVmKCk7CiB9CiAKLXZvaWQgSW1hZ2VM b2FkZXI6OnNldEltYWdlKENhY2hlZEltYWdlKiBuZXdJbWFnZSkKK3ZvaWQgSW1hZ2VMb2FkZXI6 OmNsZWFySW1hZ2UoKQogewotICAgIHNldEltYWdlV2l0aG91dENvbnNpZGVyaW5nUGVuZGluZ0xv YWRFdmVudChuZXdJbWFnZSk7CisgICAgY2xlYXJJbWFnZVdpdGhvdXRDb25zaWRlcmluZ1BlbmRp bmdMb2FkRXZlbnQoKTsKIAogICAgIC8vIE9ubHkgY29uc2lkZXIgdXBkYXRpbmcgdGhlIHByb3Rl Y3Rpb24gcmVmLWNvdW50IG9mIHRoZSBFbGVtZW50IGltbWVkaWF0ZWx5IGJlZm9yZSByZXR1cm5p bmcKICAgICAvLyBmcm9tIHRoaXMgZnVuY3Rpb24gYXMgZG9pbmcgc28gbWlnaHQgcmVzdWx0IGlu IHRoZSBkZXN0cnVjdGlvbiBvZiB0aGlzIEltYWdlTG9hZGVyLgogICAgIHVwZGF0ZWRIYXNQZW5k aW5nRXZlbnQoKTsKIH0KIAotdm9pZCBJbWFnZUxvYWRlcjo6c2V0SW1hZ2VXaXRob3V0Q29uc2lk ZXJpbmdQZW5kaW5nTG9hZEV2ZW50KENhY2hlZEltYWdlKiBuZXdJbWFnZSkKK3ZvaWQgSW1hZ2VM b2FkZXI6OmNsZWFySW1hZ2VXaXRob3V0Q29uc2lkZXJpbmdQZW5kaW5nTG9hZEV2ZW50KCkKIHsK ICAgICBBU1NFUlQobV9mYWlsZWRMb2FkVVJMLmlzRW1wdHkoKSk7CiAgICAgQ2FjaGVkSW1hZ2Uq IG9sZEltYWdlID0gbV9pbWFnZS5nZXQoKTsKLSAgICBpZiAobmV3SW1hZ2UgIT0gb2xkSW1hZ2Up IHsKLSAgICAgICAgbV9pbWFnZSA9IG5ld0ltYWdlOworICAgIGlmIChvbGRJbWFnZSkgeworICAg ICAgICBtX2ltYWdlID0gbnVsbHB0cjsKICAgICAgICAgaWYgKG1faGFzUGVuZGluZ0JlZm9yZUxv YWRFdmVudCkgewogICAgICAgICAgICAgYmVmb3JlTG9hZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZl bnQoKnRoaXMpOwogICAgICAgICAgICAgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50ID0gZmFs c2U7CkBAIC0xNTEsOCArMTUxLDYgQEAgdm9pZCBJbWFnZUxvYWRlcjo6c2V0SW1hZ2VXaXRob3V0 Q29uc2lkZXJpbmdQZW5kaW5nTG9hZEV2ZW50KENhY2hlZEltYWdlKiBuZXdJbWEKICAgICAgICAg ICAgIG1faGFzUGVuZGluZ0Vycm9yRXZlbnQgPSBmYWxzZTsKICAgICAgICAgfQogICAgICAgICBt X2ltYWdlQ29tcGxldGUgPSB0cnVlOwotICAgICAgICBpZiAobmV3SW1hZ2UpCi0gICAgICAgICAg ICBuZXdJbWFnZS0+YWRkQ2xpZW50KHRoaXMpOwogICAgICAgICBpZiAob2xkSW1hZ2UpCiAgICAg ICAgICAgICBvbGRJbWFnZS0+cmVtb3ZlQ2xpZW50KHRoaXMpOwogICAgIH0KQEAgLTI4OCw3ICsy ODYsNyBAQCB2b2lkIEltYWdlTG9hZGVyOjpub3RpZnlGaW5pc2hlZChDYWNoZWRSZXNvdXJjZSog cmVzb3VyY2UpCiAgICAgICAgICYmICFlbGVtZW50KCkuZG9jdW1lbnQoKS5zZWN1cml0eU9yaWdp bigpLT5jYW5SZXF1ZXN0KGltYWdlKCktPnJlc3BvbnNlKCkudXJsKCkpCiAgICAgICAgICYmICFy ZXNvdXJjZS0+cGFzc2VzQWNjZXNzQ29udHJvbENoZWNrKGVsZW1lbnQoKS5kb2N1bWVudCgpLnNl Y3VyaXR5T3JpZ2luKCkpKSB7CiAKLSAgICAgICAgc2V0SW1hZ2VXaXRob3V0Q29uc2lkZXJpbmdQ ZW5kaW5nTG9hZEV2ZW50KDApOworICAgICAgICBjbGVhckltYWdlV2l0aG91dENvbnNpZGVyaW5n UGVuZGluZ0xvYWRFdmVudCgpOwogCiAgICAgICAgIG1faGFzUGVuZGluZ0Vycm9yRXZlbnQgPSB0 cnVlOwogICAgICAgICBlcnJvckV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVudFNvb24oKnRoaXMp OwpAQCAtNDY2LDcgKzQ2NCw3IEBAIHZvaWQgSW1hZ2VMb2FkZXI6OmRpc3BhdGNoUGVuZGluZ0Vy cm9yRXZlbnRzKCkKIHZvaWQgSW1hZ2VMb2FkZXI6OmVsZW1lbnREaWRNb3ZlVG9OZXdEb2N1bWVu dCgpCiB7CiAgICAgY2xlYXJGYWlsZWRMb2FkVVJMKCk7Ci0gICAgc2V0SW1hZ2UoMCk7CisgICAg Y2xlYXJJbWFnZSgpOwogfQogCiBpbmxpbmUgdm9pZCBJbWFnZUxvYWRlcjo6Y2xlYXJGYWlsZWRM b2FkVVJMKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5o IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgKaW5kZXggY2ZiNDhjM2U4OGY0 NTJkNDAyZjE5YjcwZTYxZWRiZDlkYjU4ZmMwYi4uODQ0OWYxMTViZDI5ODNhYmEwMTdkMWE1ODQx NzY1ZWNiZmQ4N2RiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9h ZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgKQEAgLTU4LDcg KzU4LDcgQEAgcHVibGljOgogICAgIGJvb2wgaW1hZ2VDb21wbGV0ZSgpIGNvbnN0IHsgcmV0dXJu IG1faW1hZ2VDb21wbGV0ZTsgfQogCiAgICAgQ2FjaGVkSW1hZ2UqIGltYWdlKCkgY29uc3QgeyBy ZXR1cm4gbV9pbWFnZS5nZXQoKTsgfQotICAgIHZvaWQgc2V0SW1hZ2UoQ2FjaGVkSW1hZ2UqKTsg Ly8gQ2FuY2VscyBwZW5kaW5nIGJlZm9yZWxvYWQgYW5kIGxvYWQgZXZlbnRzLCBhbmQgZG9lc24n dCBkaXNwYXRjaCBuZXcgb25lcy4KKyAgICB2b2lkIGNsZWFySW1hZ2UoKTsgLy8gQ2FuY2VscyBw ZW5kaW5nIGJlZm9yZWxvYWQgYW5kIGxvYWQgZXZlbnRzLCBhbmQgZG9lc24ndCBkaXNwYXRjaCBu ZXcgb25lcy4KIAogICAgIHZvaWQgc2V0TG9hZE1hbnVhbGx5KGJvb2wgbG9hZE1hbnVhbGx5KSB7 IG1fbG9hZE1hbnVhbGx5ID0gbG9hZE1hbnVhbGx5OyB9CiAKQEAgLTg4LDcgKzg4LDcgQEAgcHJp dmF0ZToKICAgICBSZW5kZXJJbWFnZVJlc291cmNlKiByZW5kZXJJbWFnZVJlc291cmNlKCk7CiAg ICAgdm9pZCB1cGRhdGVSZW5kZXJlcigpOwogCi0gICAgdm9pZCBzZXRJbWFnZVdpdGhvdXRDb25z aWRlcmluZ1BlbmRpbmdMb2FkRXZlbnQoQ2FjaGVkSW1hZ2UqKTsKKyAgICB2b2lkIGNsZWFySW1h Z2VXaXRob3V0Q29uc2lkZXJpbmdQZW5kaW5nTG9hZEV2ZW50KCk7CiAgICAgdm9pZCBjbGVhckZh aWxlZExvYWRVUkwoKTsKIAogICAgIHZvaWQgdGltZXJGaXJlZCgpOwo= 248941 2015-03-18 09:52:49 -0700 2015-03-19 01:29:33 -0700 Patch bug-142825-20150318165202.patch text/plain 5567 yoav U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg5OTJiZmM2MDkyMjU1 NThmYzVhMDliODM5YjZiNDAwNjJlODkwZC4uYzE2ODBmNjMxMzJiZTU0M2EyNTQ3MjU0ZGRkNDVi NDI1NjEyZDM4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTAzLTE4ICBZb2F2 IFdlaXNzICA8eW9hdkB5b2F2LndzPgorCisgICAgICAgIFJlZmFjdG9yIEltYWdlTG9hZGVyJ3Mg c2V0dGluZyBvZiBDYWNoZWRJbWFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQyODI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXou CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBzaW5jZSB0aGVyZSdzIG5vIGZ1bmN0aW9uYWwgY2hh bmdlLgorCisgICAgICAgIHNldEltYWdlIGFuZCBzZXRJbWFnZVdpdGhvdXRDb25zaWRlcmluZ1Bl bmRpbmdMb2FkRXZlbnQgd2VyZSBub3QgY2FsbGVkIHdpdGggbmV3CisgICAgICAgIENhY2hlZElt YWdlcyBhbmQgd2VyZSBub3QgdXNlZCBhcyBvcmlnaW5hbGx5IGludGVuZWRlZC4gVGhhdCByZXN1 bHRlZCBpbiBzb21lIGRlYWQgY29kZSwKKyAgICAgICAgYW5kIGNvbmZ1c2lvbiB3aGVuIGdvaW5n IG92ZXIgdGhlIGNvZGUuCisgICAgICAgIFRoaXMgcGF0Y2ggcmVuYW1lcyB0aGVzZSBtZXRob2Rz IGludG8gZXF1aXZhbGVudCBjbGVhckltYWdlKiBtZXRob2RzLCBhbmQgZGVsZXRlcyByZXN1bHRp bmcgZGVhZCBjb2RlLgorCisgICAgICAgICogaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MT2JqZWN0RWxlbWVudDo6cmVuZGVyRmFsbGJhY2tDb250ZW50 KTogQ2hhbmdlZCBzZXRJbWFnZSBjYWxsIHRvIGNsZWFySW1hZ2UuCisgICAgICAgICogbG9hZGVy L0ltYWdlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjpjbGVhcklt YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjpjbGVhckltYWdlV2l0aG91dENv bnNpZGVyaW5nUGVuZGluZ0xvYWRFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRl cjo6bm90aWZ5RmluaXNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OmVsZW1l bnREaWRNb3ZlVG9OZXdEb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6 c2V0SW1hZ2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnNldElt YWdlV2l0aG91dENvbnNpZGVyaW5nUGVuZGluZ0xvYWRFdmVudCk6IERlbGV0ZWQuCisgICAgICAg ICogbG9hZGVyL0ltYWdlTG9hZGVyLmg6CisKIDIwMTUtMDMtMTggIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGUgbGluZSBsYXlvdXQ6IFNwbGl0IGZyYWdt ZW50cyBvbiByZW5kZXJlciBib3VuZGFyeSBvbiB0aGUgZmx5LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxPYmplY3RFbGVtZW50LmNwcAppbmRleCBlY2U0NDE3OGM3ZDAxN2Y4ODU2YjQ5MTMxNWZj NDNmNTZkYWU5OGFmLi41MjM4NGIxOGVkNDQyN2IxNWMxNDFiMDMwZjdiZmFkZGY1M2I1OTRhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcApAQCAtMzgyLDcgKzM4 Miw3IEBAIHZvaWQgSFRNTE9iamVjdEVsZW1lbnQ6OnJlbmRlckZhbGxiYWNrQ29udGVudCgpCiAg ICAgICAgIG1fc2VydmljZVR5cGUgPSBsb2FkZXItPmltYWdlKCktPnJlc3BvbnNlKCkubWltZVR5 cGUoKTsKICAgICAgICAgaWYgKCFpc0ltYWdlVHlwZSgpKSB7CiAgICAgICAgICAgICAvLyBJZiB3 ZSBkb24ndCB0aGluayB3ZSBoYXZlIGFuIGltYWdlIHR5cGUgYW55bW9yZSwgdGhlbiBjbGVhciB0 aGUgaW1hZ2UgZnJvbSB0aGUgbG9hZGVyLgotICAgICAgICAgICAgbG9hZGVyLT5zZXRJbWFnZShu dWxscHRyKTsKKyAgICAgICAgICAgIGxvYWRlci0+Y2xlYXJJbWFnZSgpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ltYWdlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5j cHAKaW5kZXggZDljMWJkMzBhOGY4MGNmNzBjNWE3OGIyZTRiNzFjYWE2OGI2YTU4Ny4uYzczNTMz YjA1N2I1MzZiYTJhMDM5MDk0N2EzYmRiNTFmZmEyNjUxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv SW1hZ2VMb2FkZXIuY3BwCkBAIC0xMjMsMjEgKzEyMywyMSBAQCBJbWFnZUxvYWRlcjo6fkltYWdl TG9hZGVyKCkKICAgICAgICAgZWxlbWVudCgpLmRlcmVmKCk7CiB9CiAKLXZvaWQgSW1hZ2VMb2Fk ZXI6OnNldEltYWdlKENhY2hlZEltYWdlKiBuZXdJbWFnZSkKK3ZvaWQgSW1hZ2VMb2FkZXI6OmNs ZWFySW1hZ2UoKQogewotICAgIHNldEltYWdlV2l0aG91dENvbnNpZGVyaW5nUGVuZGluZ0xvYWRF dmVudChuZXdJbWFnZSk7CisgICAgY2xlYXJJbWFnZVdpdGhvdXRDb25zaWRlcmluZ1BlbmRpbmdM b2FkRXZlbnQoKTsKIAogICAgIC8vIE9ubHkgY29uc2lkZXIgdXBkYXRpbmcgdGhlIHByb3RlY3Rp b24gcmVmLWNvdW50IG9mIHRoZSBFbGVtZW50IGltbWVkaWF0ZWx5IGJlZm9yZSByZXR1cm5pbmcK ICAgICAvLyBmcm9tIHRoaXMgZnVuY3Rpb24gYXMgZG9pbmcgc28gbWlnaHQgcmVzdWx0IGluIHRo ZSBkZXN0cnVjdGlvbiBvZiB0aGlzIEltYWdlTG9hZGVyLgogICAgIHVwZGF0ZWRIYXNQZW5kaW5n RXZlbnQoKTsKIH0KIAotdm9pZCBJbWFnZUxvYWRlcjo6c2V0SW1hZ2VXaXRob3V0Q29uc2lkZXJp bmdQZW5kaW5nTG9hZEV2ZW50KENhY2hlZEltYWdlKiBuZXdJbWFnZSkKK3ZvaWQgSW1hZ2VMb2Fk ZXI6OmNsZWFySW1hZ2VXaXRob3V0Q29uc2lkZXJpbmdQZW5kaW5nTG9hZEV2ZW50KCkKIHsKICAg ICBBU1NFUlQobV9mYWlsZWRMb2FkVVJMLmlzRW1wdHkoKSk7CiAgICAgQ2FjaGVkSW1hZ2UqIG9s ZEltYWdlID0gbV9pbWFnZS5nZXQoKTsKLSAgICBpZiAobmV3SW1hZ2UgIT0gb2xkSW1hZ2UpIHsK LSAgICAgICAgbV9pbWFnZSA9IG5ld0ltYWdlOworICAgIGlmIChvbGRJbWFnZSkgeworICAgICAg ICBtX2ltYWdlID0gbnVsbHB0cjsKICAgICAgICAgaWYgKG1faGFzUGVuZGluZ0JlZm9yZUxvYWRF dmVudCkgewogICAgICAgICAgICAgYmVmb3JlTG9hZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZlbnQo KnRoaXMpOwogICAgICAgICAgICAgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50ID0gZmFsc2U7 CkBAIC0xNTEsOCArMTUxLDYgQEAgdm9pZCBJbWFnZUxvYWRlcjo6c2V0SW1hZ2VXaXRob3V0Q29u c2lkZXJpbmdQZW5kaW5nTG9hZEV2ZW50KENhY2hlZEltYWdlKiBuZXdJbWEKICAgICAgICAgICAg IG1faGFzUGVuZGluZ0Vycm9yRXZlbnQgPSBmYWxzZTsKICAgICAgICAgfQogICAgICAgICBtX2lt YWdlQ29tcGxldGUgPSB0cnVlOwotICAgICAgICBpZiAobmV3SW1hZ2UpCi0gICAgICAgICAgICBu ZXdJbWFnZS0+YWRkQ2xpZW50KHRoaXMpOwogICAgICAgICBpZiAob2xkSW1hZ2UpCiAgICAgICAg ICAgICBvbGRJbWFnZS0+cmVtb3ZlQ2xpZW50KHRoaXMpOwogICAgIH0KQEAgLTI4OCw3ICsyODYs NyBAQCB2b2lkIEltYWdlTG9hZGVyOjpub3RpZnlGaW5pc2hlZChDYWNoZWRSZXNvdXJjZSogcmVz b3VyY2UpCiAgICAgICAgICYmICFlbGVtZW50KCkuZG9jdW1lbnQoKS5zZWN1cml0eU9yaWdpbigp LT5jYW5SZXF1ZXN0KGltYWdlKCktPnJlc3BvbnNlKCkudXJsKCkpCiAgICAgICAgICYmICFyZXNv dXJjZS0+cGFzc2VzQWNjZXNzQ29udHJvbENoZWNrKGVsZW1lbnQoKS5kb2N1bWVudCgpLnNlY3Vy aXR5T3JpZ2luKCkpKSB7CiAKLSAgICAgICAgc2V0SW1hZ2VXaXRob3V0Q29uc2lkZXJpbmdQZW5k aW5nTG9hZEV2ZW50KDApOworICAgICAgICBjbGVhckltYWdlV2l0aG91dENvbnNpZGVyaW5nUGVu ZGluZ0xvYWRFdmVudCgpOwogCiAgICAgICAgIG1faGFzUGVuZGluZ0Vycm9yRXZlbnQgPSB0cnVl OwogICAgICAgICBlcnJvckV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVudFNvb24oKnRoaXMpOwpA QCAtNDY2LDcgKzQ2NCw3IEBAIHZvaWQgSW1hZ2VMb2FkZXI6OmRpc3BhdGNoUGVuZGluZ0Vycm9y RXZlbnRzKCkKIHZvaWQgSW1hZ2VMb2FkZXI6OmVsZW1lbnREaWRNb3ZlVG9OZXdEb2N1bWVudCgp CiB7CiAgICAgY2xlYXJGYWlsZWRMb2FkVVJMKCk7Ci0gICAgc2V0SW1hZ2UoMCk7CisgICAgY2xl YXJJbWFnZSgpOwogfQogCiBpbmxpbmUgdm9pZCBJbWFnZUxvYWRlcjo6Y2xlYXJGYWlsZWRMb2Fk VVJMKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5oIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgKaW5kZXggY2ZiNDhjM2U4OGY0NTJk NDAyZjE5YjcwZTYxZWRiZDlkYjU4ZmMwYi4uODQ0OWYxMTViZDI5ODNhYmEwMTdkMWE1ODQxNzY1 ZWNiZmQ4N2RiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgKQEAgLTU4LDcgKzU4 LDcgQEAgcHVibGljOgogICAgIGJvb2wgaW1hZ2VDb21wbGV0ZSgpIGNvbnN0IHsgcmV0dXJuIG1f aW1hZ2VDb21wbGV0ZTsgfQogCiAgICAgQ2FjaGVkSW1hZ2UqIGltYWdlKCkgY29uc3QgeyByZXR1 cm4gbV9pbWFnZS5nZXQoKTsgfQotICAgIHZvaWQgc2V0SW1hZ2UoQ2FjaGVkSW1hZ2UqKTsgLy8g Q2FuY2VscyBwZW5kaW5nIGJlZm9yZWxvYWQgYW5kIGxvYWQgZXZlbnRzLCBhbmQgZG9lc24ndCBk aXNwYXRjaCBuZXcgb25lcy4KKyAgICB2b2lkIGNsZWFySW1hZ2UoKTsgLy8gQ2FuY2VscyBwZW5k aW5nIGJlZm9yZWxvYWQgYW5kIGxvYWQgZXZlbnRzLCBhbmQgZG9lc24ndCBkaXNwYXRjaCBuZXcg b25lcy4KIAogICAgIHZvaWQgc2V0TG9hZE1hbnVhbGx5KGJvb2wgbG9hZE1hbnVhbGx5KSB7IG1f bG9hZE1hbnVhbGx5ID0gbG9hZE1hbnVhbGx5OyB9CiAKQEAgLTg4LDcgKzg4LDcgQEAgcHJpdmF0 ZToKICAgICBSZW5kZXJJbWFnZVJlc291cmNlKiByZW5kZXJJbWFnZVJlc291cmNlKCk7CiAgICAg dm9pZCB1cGRhdGVSZW5kZXJlcigpOwogCi0gICAgdm9pZCBzZXRJbWFnZVdpdGhvdXRDb25zaWRl cmluZ1BlbmRpbmdMb2FkRXZlbnQoQ2FjaGVkSW1hZ2UqKTsKKyAgICB2b2lkIGNsZWFySW1hZ2VX aXRob3V0Q29uc2lkZXJpbmdQZW5kaW5nTG9hZEV2ZW50KCk7CiAgICAgdm9pZCBjbGVhckZhaWxl ZExvYWRVUkwoKTsKIAogICAgIHZvaWQgdGltZXJGaXJlZCgpOwo= 249025 2015-03-19 01:29:39 -0700 2015-03-23 02:15:00 -0700 Patch bug-142825-20150319082908.patch text/plain 5566 yoav U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg5OTJiZmM2MDkyMjU1 NThmYzVhMDliODM5YjZiNDAwNjJlODkwZC4uNzFhYWE0Y2Q4ODM4ODg2ZjJkNmFjMWViNWQwODE3 YmE1YjAzZGE4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTAzLTE4ICBZb2F2 IFdlaXNzICA8eW9hdkB5b2F2LndzPgorCisgICAgICAgIFJlZmFjdG9yIEltYWdlTG9hZGVyJ3Mg c2V0dGluZyBvZiBDYWNoZWRJbWFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQyODI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXou CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBzaW5jZSB0aGVyZSdzIG5vIGZ1bmN0aW9uYWwgY2hh bmdlLgorCisgICAgICAgIHNldEltYWdlIGFuZCBzZXRJbWFnZVdpdGhvdXRDb25zaWRlcmluZ1Bl bmRpbmdMb2FkRXZlbnQgd2VyZSBub3QgY2FsbGVkIHdpdGggbmV3CisgICAgICAgIENhY2hlZElt YWdlcyBhbmQgd2VyZSBub3QgdXNlZCBhcyBvcmlnaW5hbGx5IGludGVuZGVkLiBUaGF0IHJlc3Vs dGVkIGluIHNvbWUgZGVhZCBjb2RlLAorICAgICAgICBhbmQgY29uZnVzaW9uIHdoZW4gZ29pbmcg b3ZlciB0aGUgY29kZS4KKyAgICAgICAgVGhpcyBwYXRjaCByZW5hbWVzIHRoZXNlIG1ldGhvZHMg aW50byBlcXVpdmFsZW50IGNsZWFySW1hZ2UqIG1ldGhvZHMsIGFuZCBkZWxldGVzIHJlc3VsdGlu ZyBkZWFkIGNvZGUuCisKKyAgICAgICAgKiBodG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxPYmplY3RFbGVtZW50OjpyZW5kZXJGYWxsYmFja0NvbnRlbnQp OiBDaGFuZ2VkIHNldEltYWdlIGNhbGwgdG8gY2xlYXJJbWFnZS4KKyAgICAgICAgKiBsb2FkZXIv SW1hZ2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OmNsZWFySW1h Z2UpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OmNsZWFySW1hZ2VXaXRob3V0Q29u c2lkZXJpbmdQZW5kaW5nTG9hZEV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVy Ojpub3RpZnlGaW5pc2hlZCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6ZWxlbWVu dERpZE1vdmVUb05ld0RvY3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjpz ZXRJbWFnZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6c2V0SW1h Z2VXaXRob3V0Q29uc2lkZXJpbmdQZW5kaW5nTG9hZEV2ZW50KTogRGVsZXRlZC4KKyAgICAgICAg KiBsb2FkZXIvSW1hZ2VMb2FkZXIuaDoKKwogMjAxNS0wMy0xOCAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFNpbXBsZSBsaW5lIGxheW91dDogU3BsaXQgZnJhZ21l bnRzIG9uIHJlbmRlcmVyIGJvdW5kYXJ5IG9uIHRoZSBmbHkuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE9iamVjdEVsZW1lbnQuY3BwCmluZGV4IGVjZTQ0MTc4YzdkMDE3Zjg4NTZiNDkxMzE1ZmM0 M2Y1NmRhZTk4YWYuLjUyMzg0YjE4ZWQ0NDI3YjE1YzE0MWIwMzBmN2JmYWRkZjUzYjU5NGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9iamVjdEVsZW1lbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9iamVjdEVsZW1lbnQuY3BwCkBAIC0zODIsNyArMzgy LDcgQEAgdm9pZCBIVE1MT2JqZWN0RWxlbWVudDo6cmVuZGVyRmFsbGJhY2tDb250ZW50KCkKICAg ICAgICAgbV9zZXJ2aWNlVHlwZSA9IGxvYWRlci0+aW1hZ2UoKS0+cmVzcG9uc2UoKS5taW1lVHlw ZSgpOwogICAgICAgICBpZiAoIWlzSW1hZ2VUeXBlKCkpIHsKICAgICAgICAgICAgIC8vIElmIHdl IGRvbid0IHRoaW5rIHdlIGhhdmUgYW4gaW1hZ2UgdHlwZSBhbnltb3JlLCB0aGVuIGNsZWFyIHRo ZSBpbWFnZSBmcm9tIHRoZSBsb2FkZXIuCi0gICAgICAgICAgICBsb2FkZXItPnNldEltYWdlKG51 bGxwdHIpOworICAgICAgICAgICAgbG9hZGVyLT5jbGVhckltYWdlKCk7CiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvSW1hZ2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNw cAppbmRleCBkOWMxYmQzMGE4ZjgwY2Y3MGM1YTc4YjJlNGI3MWNhYTY4YjZhNTg3Li5jNzM1MzNi MDU3YjUzNmJhMmEwMzkwOTQ3YTNiZGI1MWZmYTI2NTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9J bWFnZUxvYWRlci5jcHAKQEAgLTEyMywyMSArMTIzLDIxIEBAIEltYWdlTG9hZGVyOjp+SW1hZ2VM b2FkZXIoKQogICAgICAgICBlbGVtZW50KCkuZGVyZWYoKTsKIH0KIAotdm9pZCBJbWFnZUxvYWRl cjo6c2V0SW1hZ2UoQ2FjaGVkSW1hZ2UqIG5ld0ltYWdlKQordm9pZCBJbWFnZUxvYWRlcjo6Y2xl YXJJbWFnZSgpCiB7Ci0gICAgc2V0SW1hZ2VXaXRob3V0Q29uc2lkZXJpbmdQZW5kaW5nTG9hZEV2 ZW50KG5ld0ltYWdlKTsKKyAgICBjbGVhckltYWdlV2l0aG91dENvbnNpZGVyaW5nUGVuZGluZ0xv YWRFdmVudCgpOwogCiAgICAgLy8gT25seSBjb25zaWRlciB1cGRhdGluZyB0aGUgcHJvdGVjdGlv biByZWYtY291bnQgb2YgdGhlIEVsZW1lbnQgaW1tZWRpYXRlbHkgYmVmb3JlIHJldHVybmluZwog ICAgIC8vIGZyb20gdGhpcyBmdW5jdGlvbiBhcyBkb2luZyBzbyBtaWdodCByZXN1bHQgaW4gdGhl IGRlc3RydWN0aW9uIG9mIHRoaXMgSW1hZ2VMb2FkZXIuCiAgICAgdXBkYXRlZEhhc1BlbmRpbmdF dmVudCgpOwogfQogCi12b2lkIEltYWdlTG9hZGVyOjpzZXRJbWFnZVdpdGhvdXRDb25zaWRlcmlu Z1BlbmRpbmdMb2FkRXZlbnQoQ2FjaGVkSW1hZ2UqIG5ld0ltYWdlKQordm9pZCBJbWFnZUxvYWRl cjo6Y2xlYXJJbWFnZVdpdGhvdXRDb25zaWRlcmluZ1BlbmRpbmdMb2FkRXZlbnQoKQogewogICAg IEFTU0VSVChtX2ZhaWxlZExvYWRVUkwuaXNFbXB0eSgpKTsKICAgICBDYWNoZWRJbWFnZSogb2xk SW1hZ2UgPSBtX2ltYWdlLmdldCgpOwotICAgIGlmIChuZXdJbWFnZSAhPSBvbGRJbWFnZSkgewot ICAgICAgICBtX2ltYWdlID0gbmV3SW1hZ2U7CisgICAgaWYgKG9sZEltYWdlKSB7CisgICAgICAg IG1faW1hZ2UgPSBudWxscHRyOwogICAgICAgICBpZiAobV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2 ZW50KSB7CiAgICAgICAgICAgICBiZWZvcmVMb2FkRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCgq dGhpcyk7CiAgICAgICAgICAgICBtX2hhc1BlbmRpbmdCZWZvcmVMb2FkRXZlbnQgPSBmYWxzZTsK QEAgLTE1MSw4ICsxNTEsNiBAQCB2b2lkIEltYWdlTG9hZGVyOjpzZXRJbWFnZVdpdGhvdXRDb25z aWRlcmluZ1BlbmRpbmdMb2FkRXZlbnQoQ2FjaGVkSW1hZ2UqIG5ld0ltYQogICAgICAgICAgICAg bV9oYXNQZW5kaW5nRXJyb3JFdmVudCA9IGZhbHNlOwogICAgICAgICB9CiAgICAgICAgIG1faW1h Z2VDb21wbGV0ZSA9IHRydWU7Ci0gICAgICAgIGlmIChuZXdJbWFnZSkKLSAgICAgICAgICAgIG5l d0ltYWdlLT5hZGRDbGllbnQodGhpcyk7CiAgICAgICAgIGlmIChvbGRJbWFnZSkKICAgICAgICAg ICAgIG9sZEltYWdlLT5yZW1vdmVDbGllbnQodGhpcyk7CiAgICAgfQpAQCAtMjg4LDcgKzI4Niw3 IEBAIHZvaWQgSW1hZ2VMb2FkZXI6Om5vdGlmeUZpbmlzaGVkKENhY2hlZFJlc291cmNlKiByZXNv dXJjZSkKICAgICAgICAgJiYgIWVsZW1lbnQoKS5kb2N1bWVudCgpLnNlY3VyaXR5T3JpZ2luKCkt PmNhblJlcXVlc3QoaW1hZ2UoKS0+cmVzcG9uc2UoKS51cmwoKSkKICAgICAgICAgJiYgIXJlc291 cmNlLT5wYXNzZXNBY2Nlc3NDb250cm9sQ2hlY2soZWxlbWVudCgpLmRvY3VtZW50KCkuc2VjdXJp dHlPcmlnaW4oKSkpIHsKIAotICAgICAgICBzZXRJbWFnZVdpdGhvdXRDb25zaWRlcmluZ1BlbmRp bmdMb2FkRXZlbnQoMCk7CisgICAgICAgIGNsZWFySW1hZ2VXaXRob3V0Q29uc2lkZXJpbmdQZW5k aW5nTG9hZEV2ZW50KCk7CiAKICAgICAgICAgbV9oYXNQZW5kaW5nRXJyb3JFdmVudCA9IHRydWU7 CiAgICAgICAgIGVycm9yRXZlbnRTZW5kZXIoKS5kaXNwYXRjaEV2ZW50U29vbigqdGhpcyk7CkBA IC00NjYsNyArNDY0LDcgQEAgdm9pZCBJbWFnZUxvYWRlcjo6ZGlzcGF0Y2hQZW5kaW5nRXJyb3JF dmVudHMoKQogdm9pZCBJbWFnZUxvYWRlcjo6ZWxlbWVudERpZE1vdmVUb05ld0RvY3VtZW50KCkK IHsKICAgICBjbGVhckZhaWxlZExvYWRVUkwoKTsKLSAgICBzZXRJbWFnZSgwKTsKKyAgICBjbGVh ckltYWdlKCk7CiB9CiAKIGlubGluZSB2b2lkIEltYWdlTG9hZGVyOjpjbGVhckZhaWxlZExvYWRV UkwoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmggYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaAppbmRleCBjZmI0OGMzZTg4ZjQ1MmQ0 MDJmMTliNzBlNjFlZGJkOWRiNThmYzBiLi44NDQ5ZjExNWJkMjk4M2FiYTAxN2QxYTU4NDE3NjVl Y2JmZDg3ZGJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaApAQCAtNTgsNyArNTgs NyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpbWFnZUNvbXBsZXRlKCkgY29uc3QgeyByZXR1cm4gbV9p bWFnZUNvbXBsZXRlOyB9CiAKICAgICBDYWNoZWRJbWFnZSogaW1hZ2UoKSBjb25zdCB7IHJldHVy biBtX2ltYWdlLmdldCgpOyB9Ci0gICAgdm9pZCBzZXRJbWFnZShDYWNoZWRJbWFnZSopOyAvLyBD YW5jZWxzIHBlbmRpbmcgYmVmb3JlbG9hZCBhbmQgbG9hZCBldmVudHMsIGFuZCBkb2Vzbid0IGRp c3BhdGNoIG5ldyBvbmVzLgorICAgIHZvaWQgY2xlYXJJbWFnZSgpOyAvLyBDYW5jZWxzIHBlbmRp bmcgYmVmb3JlbG9hZCBhbmQgbG9hZCBldmVudHMsIGFuZCBkb2Vzbid0IGRpc3BhdGNoIG5ldyBv bmVzLgogCiAgICAgdm9pZCBzZXRMb2FkTWFudWFsbHkoYm9vbCBsb2FkTWFudWFsbHkpIHsgbV9s b2FkTWFudWFsbHkgPSBsb2FkTWFudWFsbHk7IH0KIApAQCAtODgsNyArODgsNyBAQCBwcml2YXRl OgogICAgIFJlbmRlckltYWdlUmVzb3VyY2UqIHJlbmRlckltYWdlUmVzb3VyY2UoKTsKICAgICB2 b2lkIHVwZGF0ZVJlbmRlcmVyKCk7CiAKLSAgICB2b2lkIHNldEltYWdlV2l0aG91dENvbnNpZGVy aW5nUGVuZGluZ0xvYWRFdmVudChDYWNoZWRJbWFnZSopOworICAgIHZvaWQgY2xlYXJJbWFnZVdp dGhvdXRDb25zaWRlcmluZ1BlbmRpbmdMb2FkRXZlbnQoKTsKICAgICB2b2lkIGNsZWFyRmFpbGVk TG9hZFVSTCgpOwogCiAgICAgdm9pZCB0aW1lckZpcmVkKCk7Cg==