140511 2015-01-15 13:56:38 -0800 Reduce LayoutRect::infiniteRect() usage. 2015-01-15 16:11:34 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1061628 0 zalan 2015-01-15 13:56:38 -0800 LayoutRect/FloatRect' infinite rect representation is highly error prone. The current representation of infiniteness can only cover half of the actual range (point=(nearlyMin()/2, nearlyMin()/2) (size=(nearlyMax(), nearlyMax())). With such limitation, a FloatPoint(nearlyMax() - 1, nearlyMax() - 1) does not intersect(contain) with the infinite FloatRect. 1061631 1 244712 zalan 2015-01-15 14:12:40 -0800 Created attachment 244712 Patch 1061636 2 244712 simon.fraser 2015-01-15 14:17:42 -0800 Comment on attachment 244712 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=244712&action=review > Source/WebCore/rendering/RenderLayerBacking.cpp:777 > + ASSERT(parentClipRect.isInfinite()); !parentClipRect.isInfinite() 1061646 3 244715 zalan 2015-01-15 14:38:00 -0800 Created attachment 244715 Patch 1061658 4 244717 zalan 2015-01-15 15:22:25 -0800 Created attachment 244717 Patch 1061682 5 244717 commit-queue 2015-01-15 16:11:27 -0800 Comment on attachment 244717 Patch Clearing flags on attachment: 244717 Committed r178541: <http://trac.webkit.org/changeset/178541> 1061683 6 commit-queue 2015-01-15 16:11:34 -0800 All reviewed patches have been landed. Closing bug. 244712 2015-01-15 14:12:40 -0800 2015-01-15 14:37:57 -0800 Patch bug-140511-20150115141245.patch text/plain 10061 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDczMWZiOGQ4YWFlZDNj NzhlMGViNWVlNTc2NDYxODhkNTY2NDFjNy4uYmU4ZGQ1NzE4MjAwMmU0Y2ZiOWYyMDQ5ZmY0Mzg0 OWQ5NTAyZGY4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE1LTAxLTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVkdWNlIExheW91dFJlY3Q6 OmluZmluaXRlUmVjdCgpIHVzYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQwNTExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiB0byBnZXQgcmlkIG9mIExheW91 dFJlY3QvRmxvYXRSZWN0OjppbmZpbml0ZVJlY3QoKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4g ZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0xheW91dFJlY3Qu aDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFJlY3Q6OmlzSW5maW5pdGUpOgorICAgICAgICAq IHJlbmRlcmluZy9DbGlwUmVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6Q2xpcFJlY3Q6OnJlc2V0 KToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0Ojppc0VtcHR5KToKKyAgICAgICAgKFdlYkNv cmU6OkNsaXBSZWN0Ojppc0luZmluaXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0Ojpz ZXRSZWN0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUGFpbnRJbmZvLmg6CisgICAg ICAgIChXZWJDb3JlOjpQYWludEluZm86OmFwcGx5VHJhbnNmb3JtKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNh bGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdHM6OnJlc2V0KToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFj a2luZzo6dXBkYXRlR2VvbWV0cnkpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpj bGlwcGVkQnlBbmNlc3Rvcik6CisKIDIwMTUtMDEtMTUgIEFudHRpIEtvaXZpc3RvICA8YW50dGlA YXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBGb250IHRvIEZvbnRDYXNjYWRlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRSZWN0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRSZWN0LmgKaW5kZXggYmQ2ZjVkMTE1 YzVmZmZkMDZhYTI3ZmJiMzM4MTU2N2ZmMDQ5ZjQxNS4uZTNhNTE0OWM3NTMwOTM4MjUzNDIyMmNl N2NhOTgxY2MxNTBlMWQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvTGF5b3V0UmVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0xheW91dFJlY3QuaApAQCAtMTUzLDYgKzE1Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNjYWxl KGZsb2F0IHhTY2FsZSwgZmxvYXQgeVNjYWxlKTsKIAogICAgIExheW91dFJlY3QgdHJhbnNwb3Nl ZFJlY3QoKSBjb25zdCB7IHJldHVybiBMYXlvdXRSZWN0KG1fbG9jYXRpb24udHJhbnNwb3NlZFBv aW50KCksIG1fc2l6ZS50cmFuc3Bvc2VkU2l6ZSgpKTsgfQorICAgIGJvb2wgaXNJbmZpbml0ZSgp IGNvbnN0IHsgcmV0dXJuICp0aGlzID09IExheW91dFJlY3Q6OmluZmluaXRlUmVjdCgpOyB9CiAK ICAgICBzdGF0aWMgTGF5b3V0UmVjdCBpbmZpbml0ZVJlY3QoKQogICAgIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9DbGlwUmVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0NsaXBSZWN0LmgKaW5kZXggODU2NzI5YTI5Y2IxNzRjNmQ2N2I3ZWU1MjQ2MDkzZTE5 ZDM5YzEzNy4uZjlmZTUzYmJjYzkwOTcyM2RmNzNhMjYxMGVkYWRiZWFjYzkwYmI3ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NsaXBSZWN0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0NsaXBSZWN0LmgKQEAgLTQyLDggKzQyLDkgQEAgcHVibGljOgogICAg IH0KICAgICAKICAgICBjb25zdCBMYXlvdXRSZWN0JiByZWN0KCkgY29uc3QgeyByZXR1cm4gbV9y ZWN0OyB9Ci0gICAgdm9pZCBzZXRSZWN0KGNvbnN0IExheW91dFJlY3QmIHJlY3QpIHsgbV9yZWN0 ID0gcmVjdDsgfQotICAgIAorCisgICAgdm9pZCByZXNldCgpIHsgbV9yZWN0ID0gTGF5b3V0UmVj dDo6aW5maW5pdGVSZWN0KCk7IH0KKwogICAgIGJvb2wgYWZmZWN0ZWRCeVJhZGl1cygpIGNvbnN0 IHsgcmV0dXJuIG1fYWZmZWN0ZWRCeVJhZGl1czsgfQogICAgIHZvaWQgc2V0QWZmZWN0ZWRCeVJh ZGl1cyhib29sIGFmZmVjdGVkQnlSYWRpdXMpIHsgbV9hZmZlY3RlZEJ5UmFkaXVzID0gYWZmZWN0 ZWRCeVJhZGl1czsgfQogICAgIApAQCAtNTcsMTAgKzU4LDEyIEBAIHB1YmxpYzoKICAgICB2b2lk IG1vdmUoY29uc3QgTGF5b3V0U2l6ZSYgc2l6ZSkgeyBtX3JlY3QubW92ZShzaXplKTsgfQogICAg IHZvaWQgbW92ZUJ5KGNvbnN0IExheW91dFBvaW50JiBwb2ludCkgeyBtX3JlY3QubW92ZUJ5KHBv aW50KTsgfQogICAgIAotICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdC5p c0VtcHR5KCk7IH0KICAgICBib29sIGludGVyc2VjdHMoY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkg Y29uc3QgeyByZXR1cm4gbV9yZWN0LmludGVyc2VjdHMocmVjdCk7IH0KICAgICBib29sIGludGVy c2VjdHMoY29uc3QgSGl0VGVzdExvY2F0aW9uJikgY29uc3Q7Ci0gICAgCisKKyAgICBib29sIGlz RW1wdHkoKSBjb25zdCB7IHJldHVybiBtX3JlY3QuaXNFbXB0eSgpOyB9CisgICAgYm9vbCBpc0lu ZmluaXRlKCkgY29uc3QgeyByZXR1cm4gbV9yZWN0LmlzSW5maW5pdGUoKTsgfQorCiAgICAgdm9p ZCBpbmZsYXRlWChMYXlvdXRVbml0IGR4KSB7IG1fcmVjdC5pbmZsYXRlWChkeCk7IH0KICAgICB2 b2lkIGluZmxhdGVZKExheW91dFVuaXQgZHkpIHsgbV9yZWN0LmluZmxhdGVZKGR5KTsgfQogICAg IHZvaWQgaW5mbGF0ZShMYXlvdXRVbml0IGQpIHsgaW5mbGF0ZVgoZCk7IGluZmxhdGVZKGQpOyB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUGFpbnRJbmZvLmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUGFpbnRJbmZvLmgKaW5kZXggOTRhMDYwOWE1OGI4OWQ3ODY2 ZTlmNjlkZDYyNjlhMzdmZmMxMzRkMC4uMTViMWYyNDEyODI3NDRkYzViZDZkYjVjMmY5Y2RmMTc4 ODViODk4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1BhaW50SW5mby5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9QYWludEluZm8uaApAQCAtOTUsNyArOTUs NyBAQCBzdHJ1Y3QgUGFpbnRJbmZvIHsKIAogICAgICAgICBjb250ZXh0LT5jb25jYXRDVE0obG9j YWxUb0FuY2VzdG9yVHJhbnNmb3JtKTsKIAotICAgICAgICBpZiAocmVjdCA9PSBMYXlvdXRSZWN0 OjppbmZpbml0ZVJlY3QoKSkKKyAgICAgICAgaWYgKHJlY3QuaXNJbmZpbml0ZSgpKQogICAgICAg ICAgICAgcmV0dXJuOwogCiAgICAgICAgIEZsb2F0UmVjdCB0cmFuZm9ybWVkUmVjdChsb2NhbFRv QW5jZXN0b3JUcmFuc2Zvcm0uaW52ZXJzZSgpLm1hcFJlY3QocmVjdCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggY2M0YWQyZDAzN2U3ZTU1MTA0OGFkYTBi NTllM2M0MDkyM2YzMzkzMy4uZjY2MTVhOGRhNzA3Y2U4Mzg1MTkyMGY3MjdkNTc2NTMxNjUwZTE1 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC01MjkyLDcg KzUyOTIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMoY29uc3QgQ2xp cFJlY3RzQ29udGV4dCYgY2xpcFJlY3RzQ29udGV4dCwgQwogewogICAgIGlmICghcGFyZW50KCkp IHsKICAgICAgICAgLy8gVGhlIHJvb3QgbGF5ZXIncyBjbGlwIHJlY3QgaXMgYWx3YXlzIGluZmlu aXRlLgotICAgICAgICBjbGlwUmVjdHMucmVzZXQoTGF5b3V0UmVjdDo6aW5maW5pdGVSZWN0KCkp OworICAgICAgICBjbGlwUmVjdHMucmVzZXQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAg ICAKQEAgLTUzMTYsNyArNTMxNiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBS ZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXh0LCBDCiAgICAgICAg ICAgICBwYXJlbnRMYXllci0+Y2FsY3VsYXRlQ2xpcFJlY3RzKHBhcmVudENvbnRleHQsIGNsaXBS ZWN0cyk7CiAgICAgICAgIH0KICAgICB9IGVsc2UKLSAgICAgICAgY2xpcFJlY3RzLnJlc2V0KExh eW91dFJlY3Q6OmluZmluaXRlUmVjdCgpKTsKKyAgICAgICAgY2xpcFJlY3RzLnJlc2V0KCk7CiAK ICAgICAvLyBBIGZpeGVkIG9iamVjdCBpcyBlc3NlbnRpYWxseSB0aGUgcm9vdCBvZiBpdHMgY29u dGFpbmluZyBibG9jayBoaWVyYXJjaHksIHNvIHdoZW4KICAgICAvLyB3ZSBlbmNvdW50ZXIgc3Vj aCBhbiBvYmplY3QsIHdlIHJlc2V0IG91ciBjbGlwIHJlY3RzIHRvIHRoZSBmaXhlZENsaXBSZWN0 LgpAQCAtNTQwNSw3ICs1NDA1LDcgQEAgQ2xpcFJlY3QgUmVuZGVyTGF5ZXI6OmJhY2tncm91bmRD bGlwUmVjdChjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXgKICAgICBSZW5k ZXJWaWV3JiB2aWV3ID0gcmVuZGVyZXIoKS52aWV3KCk7CiAKICAgICAvLyBOb3RlOiBpbmZpbml0 ZSBjbGlwUmVjdHMgc2hvdWxkIG5vdCBiZSBzY3JvbGxlZCBoZXJlLCBvdGhlcndpc2UgdGhleSB3 aWxsIGFjY2lkZW50YWxseSBubyBsb25nZXIgYmUgY29uc2lkZXJlZCBpbmZpbml0ZS4KLSAgICBp ZiAocGFyZW50UmVjdHMuZml4ZWQoKSAmJiAmY2xpcFJlY3RzQ29udGV4dC5yb290TGF5ZXItPnJl bmRlcmVyKCkgPT0gJnZpZXcgJiYgYmFja2dyb3VuZENsaXBSZWN0ICE9IExheW91dFJlY3Q6Omlu ZmluaXRlUmVjdCgpKQorICAgIGlmIChwYXJlbnRSZWN0cy5maXhlZCgpICYmICZjbGlwUmVjdHND b250ZXh0LnJvb3RMYXllci0+cmVuZGVyZXIoKSA9PSAmdmlldyAmJiAhYmFja2dyb3VuZENsaXBS ZWN0LmlzSW5maW5pdGUoKSkKICAgICAgICAgYmFja2dyb3VuZENsaXBSZWN0Lm1vdmUodmlldy5m cmFtZVZpZXcoKS5zY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKCkpOwogCiAgICAgcmV0dXJu IGJhY2tncm91bmRDbGlwUmVjdDsKQEAgLTU1NTYsMTAgKzU1NTYsMTAgQEAgTGF5b3V0UmVjdCBS ZW5kZXJMYXllcjo6bG9jYWxDbGlwUmVjdChib29sJiBjbGlwRXhjZWVkc0JvdW5kcykgY29uc3QK ICAgICBDbGlwUmVjdHNDb250ZXh0IGNsaXBSZWN0c0NvbnRleHQoY2xpcHBpbmdSb290TGF5ZXIs IFBhaW50aW5nQ2xpcFJlY3RzKTsKICAgICBjYWxjdWxhdGVSZWN0cyhjbGlwUmVjdHNDb250ZXh0 LCBMYXlvdXRSZWN0OjppbmZpbml0ZVJlY3QoKSwgbGF5ZXJCb3VuZHMsIGJhY2tncm91bmRSZWN0 LCBmb3JlZ3JvdW5kUmVjdCwgb3V0bGluZVJlY3QsIG9mZnNldEZyb21Sb290KTsKIAotICAgIExh eW91dFJlY3QgY2xpcFJlY3QgPSBiYWNrZ3JvdW5kUmVjdC5yZWN0KCk7Ci0gICAgaWYgKGNsaXBS ZWN0ID09IExheW91dFJlY3Q6OmluZmluaXRlUmVjdCgpKQotICAgICAgICByZXR1cm4gY2xpcFJl Y3Q7CisgICAgaWYgKGJhY2tncm91bmRSZWN0LmlzSW5maW5pdGUoKSkKKyAgICAgICAgcmV0dXJu IGJhY2tncm91bmRSZWN0LnJlY3QoKTsKIAorICAgIExheW91dFJlY3QgY2xpcFJlY3QgPSBiYWNr Z3JvdW5kUmVjdC5yZWN0KCk7CiAgICAgaWYgKHJlbmRlcmVyKCkuaGFzQ2xpcCgpKSB7CiAgICAg ICAgIC8vIENTUyBjbGlwIG1heSBiZSBsYXJnZXIgdGhhbiBvdXIgYm9yZGVyIGJveC4KICAgICAg ICAgTGF5b3V0UmVjdCBjc3NDbGlwUmVjdCA9IGRvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIo KSkuY2xpcFJlY3QodG9MYXlvdXRQb2ludChvZmZzZXRGcm9tUm9vdCksIGN1cnJlbnRSZW5kZXJO YW1lZEZsb3dGcmFnbWVudCgpKTsKQEAgLTU3NjcsNyArNTc2Nyw3IEBAIExheW91dFJlY3QgUmVu ZGVyTGF5ZXI6OmNhbGN1bGF0ZUxheWVyQm91bmRzKGNvbnN0IFJlbmRlckxheWVyKiBhbmNlc3Rv ckxheWVyLCBjCiAgICAgaWYgKGZsYWdzICYgVXNlTG9jYWxDbGlwUmVjdElmUG9zc2libGUpIHsK ICAgICAgICAgYm9vbCBjbGlwRXhjZWVkc0JvdW5kcyA9IGZhbHNlOwogICAgICAgICBMYXlvdXRS ZWN0IGxvY2FsQ2xpcFJlY3QgPSB0aGlzLT5sb2NhbENsaXBSZWN0KGNsaXBFeGNlZWRzQm91bmRz KTsKLSAgICAgICAgaWYgKGxvY2FsQ2xpcFJlY3QgIT0gTGF5b3V0UmVjdDo6aW5maW5pdGVSZWN0 KCkgJiYgIWNsaXBFeGNlZWRzQm91bmRzKSB7CisgICAgICAgIGlmICghbG9jYWxDbGlwUmVjdC5p c0luZmluaXRlKCkgJiYgIWNsaXBFeGNlZWRzQm91bmRzKSB7CiAgICAgICAgICAgICBpZiAoKGZs YWdzICYgSW5jbHVkZVNlbGZUcmFuc2Zvcm0pICYmIHBhaW50c1dpdGhUcmFuc2Zvcm0oUGFpbnRC ZWhhdmlvck5vcm1hbCkpCiAgICAgICAgICAgICAgICAgbG9jYWxDbGlwUmVjdCA9IHRyYW5zZm9y bSgpLT5tYXBSZWN0KGxvY2FsQ2xpcFJlY3QpOwogCkBAIC02ODAzLDcgKzY4MDMsNyBAQCB2b2lk IFJlbmRlckxheWVyOjpwYWludEZsb3dUaHJlYWRJZlJlZ2lvbkZvckZyYWdtZW50cyhjb25zdCBM YXllckZyYWdtZW50cyYgZnJhZwogICAgICAgICBpZiAoZmxvd0ZyYWdtZW50LT5zaG91bGRDbGlw Rmxvd1RocmVhZENvbnRlbnQoKSkKICAgICAgICAgICAgIGNsaXBSZWN0LmludGVyc2VjdChyZWdp b25DbGlwUmVjdCk7CiAKLSAgICAgICAgYm9vbCBzaG91bGRDbGlwID0gKGNsaXBSZWN0ICE9IExh eW91dFJlY3Q6OmluZmluaXRlUmVjdCgpKTsKKyAgICAgICAgYm9vbCBzaG91bGRDbGlwID0gIWNs aXBSZWN0LmlzSW5maW5pdGUoKTsKICAgICAgICAgLy8gT3B0aW1pemUgY2xpcHBpbmcgZm9yIHRo ZSBzaW5nbGUgZnJhZ21lbnQgY2FzZS4KICAgICAgICAgaWYgKHNob3VsZENsaXApCiAgICAgICAg ICAgICBjbGlwVG9SZWN0KHBhaW50aW5nSW5mbywgY29udGV4dCwgY2xpcFJlY3QpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCA0MDVjMGVlNGQzOTgxNDhkMjY2MmI0 MWQ4ZjkwZmY5NTk4ODg4OWI4Li5iMDBiNmRjYzFlZjExNDlmN2I2YTk0MDhhY2E4NmQ1Nzg3ZGIy MmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtMTAyLDExICsx MDIsMTEgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAKLSAgICB2b2lkIHJlc2V0KGNvbnN0IExh eW91dFJlY3QmIHIpCisgICAgdm9pZCByZXNldCgpCiAgICAgewotICAgICAgICBtX292ZXJmbG93 Q2xpcFJlY3QgPSByOwotICAgICAgICBtX2ZpeGVkQ2xpcFJlY3QgPSByOwotICAgICAgICBtX3Bv c0NsaXBSZWN0ID0gcjsKKyAgICAgICAgbV9vdmVyZmxvd0NsaXBSZWN0LnJlc2V0KCk7CisgICAg ICAgIG1fZml4ZWRDbGlwUmVjdC5yZXNldCgpOworICAgICAgICBtX3Bvc0NsaXBSZWN0LnJlc2V0 KCk7CiAgICAgICAgIG1fZml4ZWQgPSBmYWxzZTsKICAgICB9CiAgICAgCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDAwZmQxN2RhZmM1 MWZhOGVlMmExZjMyNzM4ODYxMTUxYzFjYjEyZWIuLjAwNTRiNTQ4NjA0ZTdkNmVkYzhjMGYwMWJk YzljZWJmNmNhZmI0NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckJhY2tpbmcuY3BwCkBAIC03NzQsNyArNzc0LDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tp bmc6OnVwZGF0ZUdlb21ldHJ5KCkKICAgICAgICAgU2hvdWxkUmVzcGVjdE92ZXJmbG93Q2xpcCBz aG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwID0gY29tcEFuY2VzdG9yLT5pc29sYXRlc0NvbXBvc2l0 ZWRCbGVuZGluZygpID8gUmVzcGVjdE92ZXJmbG93Q2xpcCA6IElnbm9yZU92ZXJmbG93Q2xpcDsK ICAgICAgICAgUmVuZGVyTGF5ZXI6OkNsaXBSZWN0c0NvbnRleHQgY2xpcFJlY3RzQ29udGV4dChj b21wQW5jZXN0b3IsIFRlbXBvcmFyeUNsaXBSZWN0cywgSWdub3JlT3ZlcmxheVNjcm9sbGJhclNp emUsIHNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXApOwogICAgICAgICBMYXlvdXRSZWN0IHBhcmVu dENsaXBSZWN0ID0gbV9vd25pbmdMYXllci5iYWNrZ3JvdW5kQ2xpcFJlY3QoY2xpcFJlY3RzQ29u dGV4dCkucmVjdCgpOyAvLyBGSVhNRTogSW5jb3JyZWN0IGZvciBDU1MgcmVnaW9ucy4KLSAgICAg ICAgQVNTRVJUKHBhcmVudENsaXBSZWN0ICE9IExheW91dFJlY3Q6OmluZmluaXRlUmVjdCgpKTsK KyAgICAgICAgQVNTRVJUKHBhcmVudENsaXBSZWN0LmlzSW5maW5pdGUoKSk7CiAgICAgICAgIG1f YW5jZXN0b3JDbGlwcGluZ0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KHBhcmVudENsaXBS ZWN0LmxvY2F0aW9uKCkgLSBncmFwaGljc0xheWVyUGFyZW50TG9jYXRpb24pKTsKICAgICAgICAg bV9hbmNlc3RvckNsaXBwaW5nTGF5ZXItPnNldFNpemUocGFyZW50Q2xpcFJlY3Quc2l6ZSgpKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcAppbmRleCBlOTFjNjhjZWYxMGVlMWFmMjNkODI0NTVlNDUxZjM0MWI2YWI2YmViLi5jYmNh YjBhYWUzODE1YjEzZmE4MTk3M2M1ZDA3NmQ3ZmFmZjkxYzI3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMjQxNyw3ICsy NDE3LDcgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNsaXBwZWRCeUFuY2VzdG9yKFJl bmRlckxheWVyJiBsYXllcikgY29uc3QKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9 CiAKLSAgICByZXR1cm4gbGF5ZXIuYmFja2dyb3VuZENsaXBSZWN0KFJlbmRlckxheWVyOjpDbGlw UmVjdHNDb250ZXh0KGNvbXB1dGVDbGlwUm9vdCwgVGVtcG9yYXJ5Q2xpcFJlY3RzKSkucmVjdCgp ICE9IExheW91dFJlY3Q6OmluZmluaXRlUmVjdCgpOyAvLyBGSVhNRTogSW5jb3JyZWN0IGZvciBD U1MgcmVnaW9ucy4KKyAgICByZXR1cm4gIWxheWVyLmJhY2tncm91bmRDbGlwUmVjdChSZW5kZXJM YXllcjo6Q2xpcFJlY3RzQ29udGV4dChjb21wdXRlQ2xpcFJvb3QsIFRlbXBvcmFyeUNsaXBSZWN0 cykpLmlzSW5maW5pdGUoKTsgLy8gRklYTUU6IEluY29ycmVjdCBmb3IgQ1NTIHJlZ2lvbnMuCiB9 CiAKIC8vIFJldHVybiB0cnVlIGlmIHRoZSBnaXZlbiBsYXllciBpcyBhIHN0YWNraW5nIGNvbnRl eHQgYW5kIGhhcyBjb21wb3NpdGluZyBjaGlsZAo= 244715 2015-01-15 14:38:00 -0800 2015-01-15 15:22:21 -0800 Patch bug-140511-20150115143805.patch text/plain 9688 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDczMWZiOGQ4YWFlZDNj NzhlMGViNWVlNTc2NDYxODhkNTY2NDFjNy4uMGIxZDhjMjIzZGI0MzM1MDc4MDI3N2JiM2E1MTNi Y2JiNjJhZmI2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE1LTAxLTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVkdWNlIExheW91dFJlY3Q6 OmluZmluaXRlUmVjdCgpIHVzYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQwNTExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2Vy LgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gdG8gZ2V0IHJpZCBvZiBMYXlvdXRS ZWN0L0Zsb2F0UmVjdDo6aW5maW5pdGVSZWN0KCkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1 bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRSZWN0Lmg6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRSZWN0Ojppc0luZmluaXRlKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvQ2xpcFJlY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0OjpyZXNldCk6 CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdDo6aXNFbXB0eSk6CisgICAgICAgIChXZWJDb3Jl OjpDbGlwUmVjdDo6aXNJbmZpbml0ZSk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdDo6c2V0 UmVjdCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1BhaW50SW5mby5oOgorICAgICAg ICAoV2ViQ29yZTo6UGFpbnRJbmZvOjphcHBseVRyYW5zZm9ybSk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxj dWxhdGVDbGlwUmVjdHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAg ICAgICAoV2ViQ29yZTo6Q2xpcFJlY3RzOjpyZXNldCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tp bmc6OnVwZGF0ZUdlb21ldHJ5KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2xp cHBlZEJ5QW5jZXN0b3IpOgorCiAyMDE1LTAxLTE1ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFw cGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgRm9udCB0byBGb250Q2FzY2FkZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UmVjdC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UmVjdC5oCmluZGV4IGJkNmY1ZDExNWM1 ZmZmZDA2YWEyN2ZiYjMzODE1NjdmZjA0OWY0MTUuLmUzYTUxNDljNzUzMDkzODI1MzQyMjJjZTdj YTk4MWNjMTUwZTFkMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0xheW91dFJlY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9M YXlvdXRSZWN0LmgKQEAgLTE1Myw2ICsxNTMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzY2FsZShm bG9hdCB4U2NhbGUsIGZsb2F0IHlTY2FsZSk7CiAKICAgICBMYXlvdXRSZWN0IHRyYW5zcG9zZWRS ZWN0KCkgY29uc3QgeyByZXR1cm4gTGF5b3V0UmVjdChtX2xvY2F0aW9uLnRyYW5zcG9zZWRQb2lu dCgpLCBtX3NpemUudHJhbnNwb3NlZFNpemUoKSk7IH0KKyAgICBib29sIGlzSW5maW5pdGUoKSBj b25zdCB7IHJldHVybiAqdGhpcyA9PSBMYXlvdXRSZWN0OjppbmZpbml0ZVJlY3QoKTsgfQogCiAg ICAgc3RhdGljIExheW91dFJlY3QgaW5maW5pdGVSZWN0KCkKICAgICB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ2xpcFJlY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9DbGlwUmVjdC5oCmluZGV4IDg1NjcyOWEyOWNiMTc0YzZkNjdiN2VlNTI0NjA5M2UxOWQz OWMxMzcuLmY5ZmU1M2JiY2M5MDk3MjNkZjczYTI2MTBlZGFkYmVhY2M5MGJiN2YgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9DbGlwUmVjdC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9DbGlwUmVjdC5oCkBAIC00Miw4ICs0Miw5IEBAIHB1YmxpYzoKICAgICB9 CiAgICAgCiAgICAgY29uc3QgTGF5b3V0UmVjdCYgcmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVj dDsgfQotICAgIHZvaWQgc2V0UmVjdChjb25zdCBMYXlvdXRSZWN0JiByZWN0KSB7IG1fcmVjdCA9 IHJlY3Q7IH0KLSAgICAKKworICAgIHZvaWQgcmVzZXQoKSB7IG1fcmVjdCA9IExheW91dFJlY3Q6 OmluZmluaXRlUmVjdCgpOyB9CisKICAgICBib29sIGFmZmVjdGVkQnlSYWRpdXMoKSBjb25zdCB7 IHJldHVybiBtX2FmZmVjdGVkQnlSYWRpdXM7IH0KICAgICB2b2lkIHNldEFmZmVjdGVkQnlSYWRp dXMoYm9vbCBhZmZlY3RlZEJ5UmFkaXVzKSB7IG1fYWZmZWN0ZWRCeVJhZGl1cyA9IGFmZmVjdGVk QnlSYWRpdXM7IH0KICAgICAKQEAgLTU3LDEwICs1OCwxMiBAQCBwdWJsaWM6CiAgICAgdm9pZCBt b3ZlKGNvbnN0IExheW91dFNpemUmIHNpemUpIHsgbV9yZWN0Lm1vdmUoc2l6ZSk7IH0KICAgICB2 b2lkIG1vdmVCeShjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQpIHsgbV9yZWN0Lm1vdmVCeShwb2lu dCk7IH0KICAgICAKLSAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX3JlY3QuaXNF bXB0eSgpOyB9CiAgICAgYm9vbCBpbnRlcnNlY3RzKGNvbnN0IExheW91dFJlY3QmIHJlY3QpIGNv bnN0IHsgcmV0dXJuIG1fcmVjdC5pbnRlcnNlY3RzKHJlY3QpOyB9CiAgICAgYm9vbCBpbnRlcnNl Y3RzKGNvbnN0IEhpdFRlc3RMb2NhdGlvbiYpIGNvbnN0OwotICAgIAorCisgICAgYm9vbCBpc0Vt cHR5KCkgY29uc3QgeyByZXR1cm4gbV9yZWN0LmlzRW1wdHkoKTsgfQorICAgIGJvb2wgaXNJbmZp bml0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdC5pc0luZmluaXRlKCk7IH0KKwogICAgIHZvaWQg aW5mbGF0ZVgoTGF5b3V0VW5pdCBkeCkgeyBtX3JlY3QuaW5mbGF0ZVgoZHgpOyB9CiAgICAgdm9p ZCBpbmZsYXRlWShMYXlvdXRVbml0IGR5KSB7IG1fcmVjdC5pbmZsYXRlWShkeSk7IH0KICAgICB2 b2lkIGluZmxhdGUoTGF5b3V0VW5pdCBkKSB7IGluZmxhdGVYKGQpOyBpbmZsYXRlWShkKTsgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1BhaW50SW5mby5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1BhaW50SW5mby5oCmluZGV4IDk0YTA2MDlhNThiODlkNzg2NmU5 ZjY5ZGQ2MjY5YTM3ZmZjMTM0ZDAuLjE1YjFmMjQxMjgyNzQ0ZGM1YmQ2ZGI1YzJmOWNkZjE3ODg1 Yjg5ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9QYWludEluZm8uaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUGFpbnRJbmZvLmgKQEAgLTk1LDcgKzk1LDcg QEAgc3RydWN0IFBhaW50SW5mbyB7CiAKICAgICAgICAgY29udGV4dC0+Y29uY2F0Q1RNKGxvY2Fs VG9BbmNlc3RvclRyYW5zZm9ybSk7CiAKLSAgICAgICAgaWYgKHJlY3QgPT0gTGF5b3V0UmVjdDo6 aW5maW5pdGVSZWN0KCkpCisgICAgICAgIGlmIChyZWN0LmlzSW5maW5pdGUoKSkKICAgICAgICAg ICAgIHJldHVybjsKIAogICAgICAgICBGbG9hdFJlY3QgdHJhbmZvcm1lZFJlY3QobG9jYWxUb0Fu Y2VzdG9yVHJhbnNmb3JtLmludmVyc2UoKS5tYXBSZWN0KHJlY3QpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGNjNGFkMmQwMzdlN2U1NTEwNDhhZGEwYjU5 ZTNjNDA5MjNmMzM5MzMuLjBkNzJkZTZjNTk2YmVmZjhmYWY0OTNmNGVhYjFkYzMxNjgyMmI3Zjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtNTI5Miw3ICs1 MjkyLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3RzKGNvbnN0IENsaXBS ZWN0c0NvbnRleHQmIGNsaXBSZWN0c0NvbnRleHQsIEMKIHsKICAgICBpZiAoIXBhcmVudCgpKSB7 CiAgICAgICAgIC8vIFRoZSByb290IGxheWVyJ3MgY2xpcCByZWN0IGlzIGFsd2F5cyBpbmZpbml0 ZS4KLSAgICAgICAgY2xpcFJlY3RzLnJlc2V0KExheW91dFJlY3Q6OmluZmluaXRlUmVjdCgpKTsK KyAgICAgICAgY2xpcFJlY3RzLnJlc2V0KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAg CkBAIC01MzE2LDcgKzUzMTYsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVj dHMoY29uc3QgQ2xpcFJlY3RzQ29udGV4dCYgY2xpcFJlY3RzQ29udGV4dCwgQwogICAgICAgICAg ICAgcGFyZW50TGF5ZXItPmNhbGN1bGF0ZUNsaXBSZWN0cyhwYXJlbnRDb250ZXh0LCBjbGlwUmVj dHMpOwogICAgICAgICB9CiAgICAgfSBlbHNlCi0gICAgICAgIGNsaXBSZWN0cy5yZXNldChMYXlv dXRSZWN0OjppbmZpbml0ZVJlY3QoKSk7CisgICAgICAgIGNsaXBSZWN0cy5yZXNldCgpOwogCiAg ICAgLy8gQSBmaXhlZCBvYmplY3QgaXMgZXNzZW50aWFsbHkgdGhlIHJvb3Qgb2YgaXRzIGNvbnRh aW5pbmcgYmxvY2sgaGllcmFyY2h5LCBzbyB3aGVuCiAgICAgLy8gd2UgZW5jb3VudGVyIHN1Y2gg YW4gb2JqZWN0LCB3ZSByZXNldCBvdXIgY2xpcCByZWN0cyB0byB0aGUgZml4ZWRDbGlwUmVjdC4K QEAgLTU0MDUsNyArNTQwNSw3IEBAIENsaXBSZWN0IFJlbmRlckxheWVyOjpiYWNrZ3JvdW5kQ2xp cFJlY3QoY29uc3QgQ2xpcFJlY3RzQ29udGV4dCYgY2xpcFJlY3RzQ29udGV4CiAgICAgUmVuZGVy VmlldyYgdmlldyA9IHJlbmRlcmVyKCkudmlldygpOwogCiAgICAgLy8gTm90ZTogaW5maW5pdGUg Y2xpcFJlY3RzIHNob3VsZCBub3QgYmUgc2Nyb2xsZWQgaGVyZSwgb3RoZXJ3aXNlIHRoZXkgd2ls bCBhY2NpZGVudGFsbHkgbm8gbG9uZ2VyIGJlIGNvbnNpZGVyZWQgaW5maW5pdGUuCi0gICAgaWYg KHBhcmVudFJlY3RzLmZpeGVkKCkgJiYgJmNsaXBSZWN0c0NvbnRleHQucm9vdExheWVyLT5yZW5k ZXJlcigpID09ICZ2aWV3ICYmIGJhY2tncm91bmRDbGlwUmVjdCAhPSBMYXlvdXRSZWN0OjppbmZp bml0ZVJlY3QoKSkKKyAgICBpZiAocGFyZW50UmVjdHMuZml4ZWQoKSAmJiAmY2xpcFJlY3RzQ29u dGV4dC5yb290TGF5ZXItPnJlbmRlcmVyKCkgPT0gJnZpZXcgJiYgIWJhY2tncm91bmRDbGlwUmVj dC5pc0luZmluaXRlKCkpCiAgICAgICAgIGJhY2tncm91bmRDbGlwUmVjdC5tb3ZlKHZpZXcuZnJh bWVWaWV3KCkuc2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQb3NpdGlvbigpKTsKIAogICAgIHJldHVybiBi YWNrZ3JvdW5kQ2xpcFJlY3Q7CkBAIC01NTU3LDcgKzU1NTcsNyBAQCBMYXlvdXRSZWN0IFJlbmRl ckxheWVyOjpsb2NhbENsaXBSZWN0KGJvb2wmIGNsaXBFeGNlZWRzQm91bmRzKSBjb25zdAogICAg IGNhbGN1bGF0ZVJlY3RzKGNsaXBSZWN0c0NvbnRleHQsIExheW91dFJlY3Q6OmluZmluaXRlUmVj dCgpLCBsYXllckJvdW5kcywgYmFja2dyb3VuZFJlY3QsIGZvcmVncm91bmRSZWN0LCBvdXRsaW5l UmVjdCwgb2Zmc2V0RnJvbVJvb3QpOwogCiAgICAgTGF5b3V0UmVjdCBjbGlwUmVjdCA9IGJhY2tn cm91bmRSZWN0LnJlY3QoKTsKLSAgICBpZiAoY2xpcFJlY3QgPT0gTGF5b3V0UmVjdDo6aW5maW5p dGVSZWN0KCkpCisgICAgaWYgKGNsaXBSZWN0LmlzSW5maW5pdGUoKSkKICAgICAgICAgcmV0dXJu IGNsaXBSZWN0OwogCiAgICAgaWYgKHJlbmRlcmVyKCkuaGFzQ2xpcCgpKSB7CkBAIC01NzY3LDcg KzU3NjcsNyBAQCBMYXlvdXRSZWN0IFJlbmRlckxheWVyOjpjYWxjdWxhdGVMYXllckJvdW5kcyhj b25zdCBSZW5kZXJMYXllciogYW5jZXN0b3JMYXllciwgYwogICAgIGlmIChmbGFncyAmIFVzZUxv Y2FsQ2xpcFJlY3RJZlBvc3NpYmxlKSB7CiAgICAgICAgIGJvb2wgY2xpcEV4Y2VlZHNCb3VuZHMg PSBmYWxzZTsKICAgICAgICAgTGF5b3V0UmVjdCBsb2NhbENsaXBSZWN0ID0gdGhpcy0+bG9jYWxD bGlwUmVjdChjbGlwRXhjZWVkc0JvdW5kcyk7Ci0gICAgICAgIGlmIChsb2NhbENsaXBSZWN0ICE9 IExheW91dFJlY3Q6OmluZmluaXRlUmVjdCgpICYmICFjbGlwRXhjZWVkc0JvdW5kcykgeworICAg ICAgICBpZiAoIWxvY2FsQ2xpcFJlY3QuaXNJbmZpbml0ZSgpICYmICFjbGlwRXhjZWVkc0JvdW5k cykgewogICAgICAgICAgICAgaWYgKChmbGFncyAmIEluY2x1ZGVTZWxmVHJhbnNmb3JtKSAmJiBw YWludHNXaXRoVHJhbnNmb3JtKFBhaW50QmVoYXZpb3JOb3JtYWwpKQogICAgICAgICAgICAgICAg IGxvY2FsQ2xpcFJlY3QgPSB0cmFuc2Zvcm0oKS0+bWFwUmVjdChsb2NhbENsaXBSZWN0KTsKIApA QCAtNjgwMyw3ICs2ODAzLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRGbG93VGhyZWFkSWZS ZWdpb25Gb3JGcmFnbWVudHMoY29uc3QgTGF5ZXJGcmFnbWVudHMmIGZyYWcKICAgICAgICAgaWYg KGZsb3dGcmFnbWVudC0+c2hvdWxkQ2xpcEZsb3dUaHJlYWRDb250ZW50KCkpCiAgICAgICAgICAg ICBjbGlwUmVjdC5pbnRlcnNlY3QocmVnaW9uQ2xpcFJlY3QpOwogCi0gICAgICAgIGJvb2wgc2hv dWxkQ2xpcCA9IChjbGlwUmVjdCAhPSBMYXlvdXRSZWN0OjppbmZpbml0ZVJlY3QoKSk7CisgICAg ICAgIGJvb2wgc2hvdWxkQ2xpcCA9ICFjbGlwUmVjdC5pc0luZmluaXRlKCk7CiAgICAgICAgIC8v IE9wdGltaXplIGNsaXBwaW5nIGZvciB0aGUgc2luZ2xlIGZyYWdtZW50IGNhc2UuCiAgICAgICAg IGlmIChzaG91bGRDbGlwKQogICAgICAgICAgICAgY2xpcFRvUmVjdChwYWludGluZ0luZm8sIGNv bnRleHQsIGNsaXBSZWN0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5k ZXggNDA1YzBlZTRkMzk4MTQ4ZDI2NjJiNDFkOGY5MGZmOTU5ODg4ODliOC4uYjAwYjZkY2MxZWYx MTQ5ZjdiNmE5NDA4YWNhODZkNTc4N2RiMjJjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmgKQEAgLTEwMiwxMSArMTAyLDExIEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQog Ci0gICAgdm9pZCByZXNldChjb25zdCBMYXlvdXRSZWN0JiByKQorICAgIHZvaWQgcmVzZXQoKQog ICAgIHsKLSAgICAgICAgbV9vdmVyZmxvd0NsaXBSZWN0ID0gcjsKLSAgICAgICAgbV9maXhlZENs aXBSZWN0ID0gcjsKLSAgICAgICAgbV9wb3NDbGlwUmVjdCA9IHI7CisgICAgICAgIG1fb3ZlcmZs b3dDbGlwUmVjdC5yZXNldCgpOworICAgICAgICBtX2ZpeGVkQ2xpcFJlY3QucmVzZXQoKTsKKyAg ICAgICAgbV9wb3NDbGlwUmVjdC5yZXNldCgpOwogICAgICAgICBtX2ZpeGVkID0gZmFsc2U7CiAg ICAgfQogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcAppbmRleCAwMGZkMTdkYWZjNTFmYThlZTJhMWYzMjczODg2MTE1MWMxY2IxMmViLi41 OTMzYTcxNGMxYTkxZGVlZGJjYjM0YjM0NjI4OGJmNDgzMzZmZDI5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtNzc0LDcgKzc3NCw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHZW9tZXRyeSgpCiAgICAgICAgIFNo b3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgc2hvdWxkUmVzcGVjdE92ZXJmbG93Q2xpcCA9IGNvbXBB bmNlc3Rvci0+aXNvbGF0ZXNDb21wb3NpdGVkQmxlbmRpbmcoKSA/IFJlc3BlY3RPdmVyZmxvd0Ns aXAgOiBJZ25vcmVPdmVyZmxvd0NsaXA7CiAgICAgICAgIFJlbmRlckxheWVyOjpDbGlwUmVjdHND b250ZXh0IGNsaXBSZWN0c0NvbnRleHQoY29tcEFuY2VzdG9yLCBUZW1wb3JhcnlDbGlwUmVjdHMs IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplLCBzaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwKTsK ICAgICAgICAgTGF5b3V0UmVjdCBwYXJlbnRDbGlwUmVjdCA9IG1fb3duaW5nTGF5ZXIuYmFja2dy b3VuZENsaXBSZWN0KGNsaXBSZWN0c0NvbnRleHQpLnJlY3QoKTsgLy8gRklYTUU6IEluY29ycmVj dCBmb3IgQ1NTIHJlZ2lvbnMuCi0gICAgICAgIEFTU0VSVChwYXJlbnRDbGlwUmVjdCAhPSBMYXlv dXRSZWN0OjppbmZpbml0ZVJlY3QoKSk7CisgICAgICAgIEFTU0VSVCghcGFyZW50Q2xpcFJlY3Qu aXNJbmZpbml0ZSgpKTsKICAgICAgICAgbV9hbmNlc3RvckNsaXBwaW5nTGF5ZXItPnNldFBvc2l0 aW9uKEZsb2F0UG9pbnQocGFyZW50Q2xpcFJlY3QubG9jYXRpb24oKSAtIGdyYXBoaWNzTGF5ZXJQ YXJlbnRMb2NhdGlvbikpOwogICAgICAgICBtX2FuY2VzdG9yQ2xpcHBpbmdMYXllci0+c2V0U2l6 ZShwYXJlbnRDbGlwUmVjdC5zaXplKCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IGU5MWM2OGNlZjEwZWUxYWYyM2Q4 MjQ1NWU0NTFmMzQxYjZhYjZiZWIuLmNiY2FiMGFhZTM4MTViMTNmYTgxOTczYzVkMDc2ZDdmYWZm OTFjMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuY3BwCkBAIC0yNDE3LDcgKzI0MTcsNyBAQCBib29sIFJlbmRlckxheWVyQ29tcG9z aXRvcjo6Y2xpcHBlZEJ5QW5jZXN0b3IoUmVuZGVyTGF5ZXImIGxheWVyKSBjb25zdAogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIHJldHVybiBsYXllci5iYWNrZ3JvdW5k Q2xpcFJlY3QoUmVuZGVyTGF5ZXI6OkNsaXBSZWN0c0NvbnRleHQoY29tcHV0ZUNsaXBSb290LCBU ZW1wb3JhcnlDbGlwUmVjdHMpKS5yZWN0KCkgIT0gTGF5b3V0UmVjdDo6aW5maW5pdGVSZWN0KCk7 IC8vIEZJWE1FOiBJbmNvcnJlY3QgZm9yIENTUyByZWdpb25zLgorICAgIHJldHVybiAhbGF5ZXIu YmFja2dyb3VuZENsaXBSZWN0KFJlbmRlckxheWVyOjpDbGlwUmVjdHNDb250ZXh0KGNvbXB1dGVD bGlwUm9vdCwgVGVtcG9yYXJ5Q2xpcFJlY3RzKSkuaXNJbmZpbml0ZSgpOyAvLyBGSVhNRTogSW5j b3JyZWN0IGZvciBDU1MgcmVnaW9ucy4KIH0KIAogLy8gUmV0dXJuIHRydWUgaWYgdGhlIGdpdmVu IGxheWVyIGlzIGEgc3RhY2tpbmcgY29udGV4dCBhbmQgaGFzIGNvbXBvc2l0aW5nIGNoaWxkCg== 244717 2015-01-15 15:22:25 -0800 2015-01-15 16:11:27 -0800 Patch bug-140511-20150115152231.patch text/plain 9535 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFkNTk2NTA1ODBmZGUw Y2JiOTFmOTk5OTViNjc4NDBmOWIwMDU0Ni4uMWMxODgzYmUxMjA4YTJlYTM1YTgyY2FjYjgzM2Iz MzY5YmMwYjhjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE1LTAxLTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVkdWNlIExheW91dFJlY3Q6 OmluZmluaXRlUmVjdCgpIHVzYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQwNTExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2Vy LgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gdG8gZ2V0IHJpZCBvZiBMYXlvdXRS ZWN0L0Zsb2F0UmVjdDo6aW5maW5pdGVSZWN0KCkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1 bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRSZWN0Lmg6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRSZWN0Ojppc0luZmluaXRlKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvQ2xpcFJlY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0OjpyZXNldCk6 CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdDo6aXNFbXB0eSk6CisgICAgICAgIChXZWJDb3Jl OjpDbGlwUmVjdDo6aXNJbmZpbml0ZSk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdDo6c2V0 UmVjdCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1BhaW50SW5mby5oOgorICAgICAg ICAoV2ViQ29yZTo6UGFpbnRJbmZvOjphcHBseVRyYW5zZm9ybSk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxj dWxhdGVDbGlwUmVjdHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAg ICAgICAoV2ViQ29yZTo6Q2xpcFJlY3RzOjpyZXNldCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tp bmc6OnVwZGF0ZUdlb21ldHJ5KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2xp cHBlZEJ5QW5jZXN0b3IpOgorCisyMDE1LTAxLTE1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CisKICAgICAgICAgTGF5ZXJGcmFnbWVudCBzaG91bGQgYmUgYWJsZSB0byBpbnRlcnNl Y3Qgd2l0aCBDbGlwUmVjdC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0MDQ5OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9MYXlvdXRSZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9M YXlvdXRSZWN0LmgKaW5kZXggYmQ2ZjVkMTE1YzVmZmZkMDZhYTI3ZmJiMzM4MTU2N2ZmMDQ5ZjQx NS4uZTNhNTE0OWM3NTMwOTM4MjUzNDIyMmNlN2NhOTgxY2MxNTBlMWQyMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UmVjdC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFJlY3QuaApAQCAtMTUzLDYgKzE1Myw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNjYWxlKGZsb2F0IHhTY2FsZSwgZmxvYXQgeVNjYWxlKTsK IAogICAgIExheW91dFJlY3QgdHJhbnNwb3NlZFJlY3QoKSBjb25zdCB7IHJldHVybiBMYXlvdXRS ZWN0KG1fbG9jYXRpb24udHJhbnNwb3NlZFBvaW50KCksIG1fc2l6ZS50cmFuc3Bvc2VkU2l6ZSgp KTsgfQorICAgIGJvb2wgaXNJbmZpbml0ZSgpIGNvbnN0IHsgcmV0dXJuICp0aGlzID09IExheW91 dFJlY3Q6OmluZmluaXRlUmVjdCgpOyB9CiAKICAgICBzdGF0aWMgTGF5b3V0UmVjdCBpbmZpbml0 ZVJlY3QoKQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9DbGlw UmVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NsaXBSZWN0LmgKaW5kZXggODU2NzI5 YTI5Y2IxNzRjNmQ2N2I3ZWU1MjQ2MDkzZTE5ZDM5YzEzNy4uZjlmZTUzYmJjYzkwOTcyM2RmNzNh MjYxMGVkYWRiZWFjYzkwYmI3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0NsaXBSZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NsaXBSZWN0LmgKQEAg LTQyLDggKzQyLDkgQEAgcHVibGljOgogICAgIH0KICAgICAKICAgICBjb25zdCBMYXlvdXRSZWN0 JiByZWN0KCkgY29uc3QgeyByZXR1cm4gbV9yZWN0OyB9Ci0gICAgdm9pZCBzZXRSZWN0KGNvbnN0 IExheW91dFJlY3QmIHJlY3QpIHsgbV9yZWN0ID0gcmVjdDsgfQotICAgIAorCisgICAgdm9pZCBy ZXNldCgpIHsgbV9yZWN0ID0gTGF5b3V0UmVjdDo6aW5maW5pdGVSZWN0KCk7IH0KKwogICAgIGJv b2wgYWZmZWN0ZWRCeVJhZGl1cygpIGNvbnN0IHsgcmV0dXJuIG1fYWZmZWN0ZWRCeVJhZGl1czsg fQogICAgIHZvaWQgc2V0QWZmZWN0ZWRCeVJhZGl1cyhib29sIGFmZmVjdGVkQnlSYWRpdXMpIHsg bV9hZmZlY3RlZEJ5UmFkaXVzID0gYWZmZWN0ZWRCeVJhZGl1czsgfQogICAgIApAQCAtNTcsMTAg KzU4LDEyIEBAIHB1YmxpYzoKICAgICB2b2lkIG1vdmUoY29uc3QgTGF5b3V0U2l6ZSYgc2l6ZSkg eyBtX3JlY3QubW92ZShzaXplKTsgfQogICAgIHZvaWQgbW92ZUJ5KGNvbnN0IExheW91dFBvaW50 JiBwb2ludCkgeyBtX3JlY3QubW92ZUJ5KHBvaW50KTsgfQogICAgIAotICAgIGJvb2wgaXNFbXB0 eSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdC5pc0VtcHR5KCk7IH0KICAgICBib29sIGludGVyc2Vj dHMoY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkgY29uc3QgeyByZXR1cm4gbV9yZWN0LmludGVyc2Vj dHMocmVjdCk7IH0KICAgICBib29sIGludGVyc2VjdHMoY29uc3QgSGl0VGVzdExvY2F0aW9uJikg Y29uc3Q7Ci0gICAgCisKKyAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX3JlY3Qu aXNFbXB0eSgpOyB9CisgICAgYm9vbCBpc0luZmluaXRlKCkgY29uc3QgeyByZXR1cm4gbV9yZWN0 LmlzSW5maW5pdGUoKTsgfQorCiAgICAgdm9pZCBpbmZsYXRlWChMYXlvdXRVbml0IGR4KSB7IG1f cmVjdC5pbmZsYXRlWChkeCk7IH0KICAgICB2b2lkIGluZmxhdGVZKExheW91dFVuaXQgZHkpIHsg bV9yZWN0LmluZmxhdGVZKGR5KTsgfQogICAgIHZvaWQgaW5mbGF0ZShMYXlvdXRVbml0IGQpIHsg aW5mbGF0ZVgoZCk7IGluZmxhdGVZKGQpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUGFpbnRJbmZvLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUGFpbnRJbmZv LmgKaW5kZXggOTRhMDYwOWE1OGI4OWQ3ODY2ZTlmNjlkZDYyNjlhMzdmZmMxMzRkMC4uMTViMWYy NDEyODI3NDRkYzViZDZkYjVjMmY5Y2RmMTc4ODViODk4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1BhaW50SW5mby5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9QYWludEluZm8uaApAQCAtOTUsNyArOTUsNyBAQCBzdHJ1Y3QgUGFpbnRJbmZvIHsKIAogICAg ICAgICBjb250ZXh0LT5jb25jYXRDVE0obG9jYWxUb0FuY2VzdG9yVHJhbnNmb3JtKTsKIAotICAg ICAgICBpZiAocmVjdCA9PSBMYXlvdXRSZWN0OjppbmZpbml0ZVJlY3QoKSkKKyAgICAgICAgaWYg KHJlY3QuaXNJbmZpbml0ZSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIEZsb2F0 UmVjdCB0cmFuZm9ybWVkUmVjdChsb2NhbFRvQW5jZXN0b3JUcmFuc2Zvcm0uaW52ZXJzZSgpLm1h cFJlY3QocmVjdCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5k ZXggMzcyZmJjY2M2Mjg0ZTJjNjQ4OTA5Y2U1NTYxYzdjOGFiMzUwZjdhYy4uNTZlMTFiZmM3MjVk NTE1OWVjYzhlYjIzZDU0ZjllMjk5YTNlMzJkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwCkBAIC0xNDgsMTEgKzE0OCwxMSBAQCBwdWJsaWM6CiAKICAgICBDbGlw UmVjdHMoKSA9IGRlZmF1bHQ7CiAKLSAgICB2b2lkIHJlc2V0KGNvbnN0IExheW91dFJlY3QmIGNs aXBSZWN0KQorICAgIHZvaWQgcmVzZXQoKQogICAgIHsKLSAgICAgICAgbV9vdmVyZmxvd0NsaXBS ZWN0ID0gY2xpcFJlY3Q7Ci0gICAgICAgIG1fZml4ZWRDbGlwUmVjdCA9IGNsaXBSZWN0OwotICAg ICAgICBtX3Bvc0NsaXBSZWN0ID0gY2xpcFJlY3Q7CisgICAgICAgIG1fb3ZlcmZsb3dDbGlwUmVj dC5yZXNldCgpOworICAgICAgICBtX2ZpeGVkQ2xpcFJlY3QucmVzZXQoKTsKKyAgICAgICAgbV9w b3NDbGlwUmVjdC5yZXNldCgpOwogICAgICAgICBtX2ZpeGVkID0gZmFsc2U7CiAgICAgfQogCkBA IC01NDA2LDcgKzU0MDYsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMo Y29uc3QgQ2xpcFJlY3RzQ29udGV4dCYgY2xpcFJlY3RzQ29udGV4dCwgQwogewogICAgIGlmICgh cGFyZW50KCkpIHsKICAgICAgICAgLy8gVGhlIHJvb3QgbGF5ZXIncyBjbGlwIHJlY3QgaXMgYWx3 YXlzIGluZmluaXRlLgotICAgICAgICBjbGlwUmVjdHMucmVzZXQoTGF5b3V0UmVjdDo6aW5maW5p dGVSZWN0KCkpOworICAgICAgICBjbGlwUmVjdHMucmVzZXQoKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KICAgICAKQEAgLTU0MzAsNyArNTQzMCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNhbGN1 bGF0ZUNsaXBSZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXh0LCBD CiAgICAgICAgICAgICBwYXJlbnRMYXllci0+Y2FsY3VsYXRlQ2xpcFJlY3RzKHBhcmVudENvbnRl eHQsIGNsaXBSZWN0cyk7CiAgICAgICAgIH0KICAgICB9IGVsc2UKLSAgICAgICAgY2xpcFJlY3Rz LnJlc2V0KExheW91dFJlY3Q6OmluZmluaXRlUmVjdCgpKTsKKyAgICAgICAgY2xpcFJlY3RzLnJl c2V0KCk7CiAKICAgICAvLyBBIGZpeGVkIG9iamVjdCBpcyBlc3NlbnRpYWxseSB0aGUgcm9vdCBv ZiBpdHMgY29udGFpbmluZyBibG9jayBoaWVyYXJjaHksIHNvIHdoZW4KICAgICAvLyB3ZSBlbmNv dW50ZXIgc3VjaCBhbiBvYmplY3QsIHdlIHJlc2V0IG91ciBjbGlwIHJlY3RzIHRvIHRoZSBmaXhl ZENsaXBSZWN0LgpAQCAtNTUxOSw3ICs1NTE5LDcgQEAgQ2xpcFJlY3QgUmVuZGVyTGF5ZXI6OmJh Y2tncm91bmRDbGlwUmVjdChjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXgK ICAgICBSZW5kZXJWaWV3JiB2aWV3ID0gcmVuZGVyZXIoKS52aWV3KCk7CiAKICAgICAvLyBOb3Rl OiBpbmZpbml0ZSBjbGlwUmVjdHMgc2hvdWxkIG5vdCBiZSBzY3JvbGxlZCBoZXJlLCBvdGhlcndp c2UgdGhleSB3aWxsIGFjY2lkZW50YWxseSBubyBsb25nZXIgYmUgY29uc2lkZXJlZCBpbmZpbml0 ZS4KLSAgICBpZiAocGFyZW50UmVjdHMuZml4ZWQoKSAmJiAmY2xpcFJlY3RzQ29udGV4dC5yb290 TGF5ZXItPnJlbmRlcmVyKCkgPT0gJnZpZXcgJiYgYmFja2dyb3VuZENsaXBSZWN0ICE9IExheW91 dFJlY3Q6OmluZmluaXRlUmVjdCgpKQorICAgIGlmIChwYXJlbnRSZWN0cy5maXhlZCgpICYmICZj bGlwUmVjdHNDb250ZXh0LnJvb3RMYXllci0+cmVuZGVyZXIoKSA9PSAmdmlldyAmJiAhYmFja2dy b3VuZENsaXBSZWN0LmlzSW5maW5pdGUoKSkKICAgICAgICAgYmFja2dyb3VuZENsaXBSZWN0Lm1v dmUodmlldy5mcmFtZVZpZXcoKS5zY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKCkpOwogCiAg ICAgcmV0dXJuIGJhY2tncm91bmRDbGlwUmVjdDsKQEAgLTU2NzEsNyArNTY3MSw3IEBAIExheW91 dFJlY3QgUmVuZGVyTGF5ZXI6OmxvY2FsQ2xpcFJlY3QoYm9vbCYgY2xpcEV4Y2VlZHNCb3VuZHMp IGNvbnN0CiAgICAgY2FsY3VsYXRlUmVjdHMoY2xpcFJlY3RzQ29udGV4dCwgTGF5b3V0UmVjdDo6 aW5maW5pdGVSZWN0KCksIGxheWVyQm91bmRzLCBiYWNrZ3JvdW5kUmVjdCwgZm9yZWdyb3VuZFJl Y3QsIG91dGxpbmVSZWN0LCBvZmZzZXRGcm9tUm9vdCk7CiAKICAgICBMYXlvdXRSZWN0IGNsaXBS ZWN0ID0gYmFja2dyb3VuZFJlY3QucmVjdCgpOwotICAgIGlmIChjbGlwUmVjdCA9PSBMYXlvdXRS ZWN0OjppbmZpbml0ZVJlY3QoKSkKKyAgICBpZiAoY2xpcFJlY3QuaXNJbmZpbml0ZSgpKQogICAg ICAgICByZXR1cm4gY2xpcFJlY3Q7CiAKICAgICBpZiAocmVuZGVyZXIoKS5oYXNDbGlwKCkpIHsK QEAgLTU4ODEsNyArNTg4MSw3IEBAIExheW91dFJlY3QgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUxh eWVyQm91bmRzKGNvbnN0IFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyLCBjCiAgICAgaWYgKGZs YWdzICYgVXNlTG9jYWxDbGlwUmVjdElmUG9zc2libGUpIHsKICAgICAgICAgYm9vbCBjbGlwRXhj ZWVkc0JvdW5kcyA9IGZhbHNlOwogICAgICAgICBMYXlvdXRSZWN0IGxvY2FsQ2xpcFJlY3QgPSB0 aGlzLT5sb2NhbENsaXBSZWN0KGNsaXBFeGNlZWRzQm91bmRzKTsKLSAgICAgICAgaWYgKGxvY2Fs Q2xpcFJlY3QgIT0gTGF5b3V0UmVjdDo6aW5maW5pdGVSZWN0KCkgJiYgIWNsaXBFeGNlZWRzQm91 bmRzKSB7CisgICAgICAgIGlmICghbG9jYWxDbGlwUmVjdC5pc0luZmluaXRlKCkgJiYgIWNsaXBF eGNlZWRzQm91bmRzKSB7CiAgICAgICAgICAgICBpZiAoKGZsYWdzICYgSW5jbHVkZVNlbGZUcmFu c2Zvcm0pICYmIHBhaW50c1dpdGhUcmFuc2Zvcm0oUGFpbnRCZWhhdmlvck5vcm1hbCkpCiAgICAg ICAgICAgICAgICAgbG9jYWxDbGlwUmVjdCA9IHRyYW5zZm9ybSgpLT5tYXBSZWN0KGxvY2FsQ2xp cFJlY3QpOwogCkBAIC02OTE3LDcgKzY5MTcsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludEZs b3dUaHJlYWRJZlJlZ2lvbkZvckZyYWdtZW50cyhjb25zdCBMYXllckZyYWdtZW50cyYgZnJhZwog ICAgICAgICBpZiAoZmxvd0ZyYWdtZW50LT5zaG91bGRDbGlwRmxvd1RocmVhZENvbnRlbnQoKSkK ICAgICAgICAgICAgIGNsaXBSZWN0LmludGVyc2VjdChyZWdpb25DbGlwUmVjdCk7CiAKLSAgICAg ICAgYm9vbCBzaG91bGRDbGlwID0gKGNsaXBSZWN0ICE9IExheW91dFJlY3Q6OmluZmluaXRlUmVj dCgpKTsKKyAgICAgICAgYm9vbCBzaG91bGRDbGlwID0gIWNsaXBSZWN0LmlzSW5maW5pdGUoKTsK ICAgICAgICAgLy8gT3B0aW1pemUgY2xpcHBpbmcgZm9yIHRoZSBzaW5nbGUgZnJhZ21lbnQgY2Fz ZS4KICAgICAgICAgaWYgKHNob3VsZENsaXApCiAgICAgICAgICAgICBjbGlwVG9SZWN0KHBhaW50 aW5nSW5mbywgY29udGV4dCwgY2xpcFJlY3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCAwMGZkMTdkYWZjNTFmYThlZTJhMWYzMjcz ODg2MTE1MWMxY2IxMmViLi41OTMzYTcxNGMxYTkxZGVlZGJjYjM0YjM0NjI4OGJmNDgzMzZmZDI5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNw cApAQCAtNzc0LDcgKzc3NCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHZW9t ZXRyeSgpCiAgICAgICAgIFNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgc2hvdWxkUmVzcGVjdE92 ZXJmbG93Q2xpcCA9IGNvbXBBbmNlc3Rvci0+aXNvbGF0ZXNDb21wb3NpdGVkQmxlbmRpbmcoKSA/ IFJlc3BlY3RPdmVyZmxvd0NsaXAgOiBJZ25vcmVPdmVyZmxvd0NsaXA7CiAgICAgICAgIFJlbmRl ckxheWVyOjpDbGlwUmVjdHNDb250ZXh0IGNsaXBSZWN0c0NvbnRleHQoY29tcEFuY2VzdG9yLCBU ZW1wb3JhcnlDbGlwUmVjdHMsIElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplLCBzaG91bGRSZXNw ZWN0T3ZlcmZsb3dDbGlwKTsKICAgICAgICAgTGF5b3V0UmVjdCBwYXJlbnRDbGlwUmVjdCA9IG1f b3duaW5nTGF5ZXIuYmFja2dyb3VuZENsaXBSZWN0KGNsaXBSZWN0c0NvbnRleHQpLnJlY3QoKTsg Ly8gRklYTUU6IEluY29ycmVjdCBmb3IgQ1NTIHJlZ2lvbnMuCi0gICAgICAgIEFTU0VSVChwYXJl bnRDbGlwUmVjdCAhPSBMYXlvdXRSZWN0OjppbmZpbml0ZVJlY3QoKSk7CisgICAgICAgIEFTU0VS VCghcGFyZW50Q2xpcFJlY3QuaXNJbmZpbml0ZSgpKTsKICAgICAgICAgbV9hbmNlc3RvckNsaXBw aW5nTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQocGFyZW50Q2xpcFJlY3QubG9jYXRpb24o KSAtIGdyYXBoaWNzTGF5ZXJQYXJlbnRMb2NhdGlvbikpOwogICAgICAgICBtX2FuY2VzdG9yQ2xp cHBpbmdMYXllci0+c2V0U2l6ZShwYXJlbnRDbGlwUmVjdC5zaXplKCkpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IGU5 MWM2OGNlZjEwZWUxYWYyM2Q4MjQ1NWU0NTFmMzQxYjZhYjZiZWIuLmNiY2FiMGFhZTM4MTViMTNm YTgxOTczYzVkMDc2ZDdmYWZmOTFjMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0yNDE3LDcgKzI0MTcsNyBAQCBib29s IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2xpcHBlZEJ5QW5jZXN0b3IoUmVuZGVyTGF5ZXImIGxh eWVyKSBjb25zdAogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIHJldHVy biBsYXllci5iYWNrZ3JvdW5kQ2xpcFJlY3QoUmVuZGVyTGF5ZXI6OkNsaXBSZWN0c0NvbnRleHQo Y29tcHV0ZUNsaXBSb290LCBUZW1wb3JhcnlDbGlwUmVjdHMpKS5yZWN0KCkgIT0gTGF5b3V0UmVj dDo6aW5maW5pdGVSZWN0KCk7IC8vIEZJWE1FOiBJbmNvcnJlY3QgZm9yIENTUyByZWdpb25zLgor ICAgIHJldHVybiAhbGF5ZXIuYmFja2dyb3VuZENsaXBSZWN0KFJlbmRlckxheWVyOjpDbGlwUmVj dHNDb250ZXh0KGNvbXB1dGVDbGlwUm9vdCwgVGVtcG9yYXJ5Q2xpcFJlY3RzKSkuaXNJbmZpbml0 ZSgpOyAvLyBGSVhNRTogSW5jb3JyZWN0IGZvciBDU1MgcmVnaW9ucy4KIH0KIAogLy8gUmV0dXJu IHRydWUgaWYgdGhlIGdpdmVuIGxheWVyIGlzIGEgc3RhY2tpbmcgY29udGV4dCBhbmQgaGFzIGNv bXBvc2l0aW5nIGNoaWxkCg==