152661 2016-01-03 01:11:27 -0800 [TextureMapper] Move ClipStack into its own file 2016-02-03 00:44:05 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 152734 1 zan zan cgarcia commit-queue mrobinson ryanhaddad yoon oldest_to_newest 1152087 0 zan 2016-01-03 01:11:27 -0800 [TextureMapper] Move ClipStack into its own file 1152088 1 268133 zan 2016-01-03 01:20:00 -0800 Created attachment 268133 Patch 1152204 2 268133 mcatanzaro 2016-01-03 17:53:25 -0800 Comment on attachment 268133 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268133&action=review > Source/WebCore/platform/graphics/texmap/ClipStack.cpp:3 > + * Copyright (C) 2012 Igalia S.L. 2012, 2016 > Source/WebCore/platform/graphics/texmap/ClipStack.h:3 > + * Copyright (C) 2015 Igalia S.L. 2016 1152668 3 zan 2016-01-04 23:41:58 -0800 Committed r194577: <http://trac.webkit.org/changeset/194577> 1152720 4 ryanhaddad 2016-01-05 08:47:47 -0800 This change appears to have broken the Windows build: <https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/74956> 1152735 5 commit-queue 2016-01-05 09:20:17 -0800 Re-opened since this is blocked by bug 152734 1161601 6 zan 2016-02-03 00:44:05 -0800 A fix for the breakage was committed soon after being reported. Closing the bug. 268133 2016-01-03 01:20:00 -0800 2016-01-03 17:53:25 -0800 Patch bug-152661-20160103011912.patch text/plain 18331 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NDk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE0NDhiNTgyYzk3Mzlm ZTkzNWMzODY5MTM1NTQ1YjZmMzkyOTk5My4uMzY5NjBlNzA2ZDBjZjkzNjJmODFjZTBiNDVmNmQ2 NjI0YjVmY2U5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDY1IEBACisyMDE2LTAxLTAzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbVGV4dHVyZU1hcHBl cl0gTW92ZSBDbGlwU3RhY2sgaW50byBpdHMgb3duIGZpbGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjY2MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgVGV4dHVyZU1hcHBlckdMOjpDbGlwU3Rh Y2sgaW50byBpdHMgb3duIGZpbGUgYW5kIGNsZWFuIGl0IHVwIGEgYml0LgorICAgICAgICBNb3Zl IENsaXBTdGF0ZSB1bmRlciB0aGUgQ2xpcFN0YWNrIGNsYXNzLCBhbmQgc2ltcGx5IG5hbWUgaXQg U3RhdGUuCisKKyAgICAgICAgTW92ZSB0aGUgQ2xpcFN0YXRlIG1ldGhvZHMgaW50byBhIG1vcmUg c2Vuc2libGUgb3JkZXIuIFJlbW92ZSB0aGUgaW5saW5lCisgICAgICAgIHNwZWNpZmllcnMsIHRo ZXNlIGFyZW4ndCByZWFsbHkgbmVlZGVkIGZvciB0aGUgbWV0aG9kcyBkZWZpbmVkIGluIHRoZSBo ZWFkZXIuCisgICAgICAgIGFwcGx5KCkgYW5kIGFwcGx5SWZOZWVkZWQoKSBub3cgYWNjZXB0IGEg cmVmZXJlbmNlIHRvIHRoZSBHcmFwaGljc0NvbnRleHQzRAorICAgICAgICBvYmplY3QsIG5vdCBh IHBvaW50ZXIuCisKKyAgICAgICAgVHVybiBZQXhpc01vZGUgZW51bSBpbnRvIGFuIGVudW0gY2xh c3MsIHVwZGF0ZSB0aGUgdXNlcyB0byBwcm9wZXJseSBzcGVjaWZ5CisgICAgICAgIHRoZSBzY29w ZSBvZiB0aGUgZW51bSB2YWx1ZS4KKworICAgICAgICBSZW9yZGVyIHRoZSBDbGlwU3RhY2sgbWVt YmVyIHZhcmlhYmxlcyBpbnRvIGEgbW9yZSBlZmZpY2llbnQgb3JkZXIuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzIC0tIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIENNYWtlTGlz dHMudHh0OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJl R0wuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Qml0bWFwVGV4dHVyZUdMOjpjbGVhcklmTmVlZGVk KToKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcFRleHR1cmVHTDo6YmluZEFzU3VyZmFjZSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmVHTC5oOgorICAg ICAgICAoV2ViQ29yZTo6Qml0bWFwVGV4dHVyZUdMOjpjbGlwU3RhY2spOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9DbGlwU3RhY2suY3BwOiBBZGRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkNsaXBTdGFjazo6cHVzaCk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwU3RhY2s6OnBv cCk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwU3RhY2s6OnJlc2V0KToKKyAgICAgICAgKFdlYkNv cmU6OkNsaXBTdGFjazo6aW50ZXJzZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBTdGFjazo6 c2V0U3RlbmNpbEluZGV4KToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBTdGFjazo6YXBwbHkpOgor ICAgICAgICAoV2ViQ29yZTo6Q2xpcFN0YWNrOjphcHBseUlmTmVlZGVkKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQ2xpcFN0YWNrLmg6IEFkZGVkLgorICAgICAgICAoV2Vi Q29yZTo6Q2xpcFN0YWNrOjpTdGF0ZTo6U3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6Q2xpcFN0 YWNrOjpjdXJyZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBTdGFjazo6Z2V0U3RlbmNpbElu ZGV4KToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBTdGFjazo6aXNDdXJyZW50U2Npc3NvckJveEVt cHR5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6Y2xpcFN0YWNrKToKKyAg ICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6YmVnaW5QYWludGluZyk6CisgICAgICAg IChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OmJpbmREZWZhdWx0U3VyZmFjZSk6CisgICAgICAg IChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OmJlZ2luU2Npc3NvckNsaXApOgorICAgICAgICAo V2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpiZWdpbkNsaXApOgorICAgICAgICAoV2ViQ29yZTo6 VGV4dHVyZU1hcHBlckdMOjplbmRDbGlwKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBw ZXJHTDo6Q2xpcFN0YWNrOjpyZXNldCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpUZXh0 dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6aW50ZXJzZWN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0YWNrOjpzZXRTdGVuY2lsSW5kZXgpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OnB1c2gp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6 OnBvcCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OkNsaXBT dGFjazo6YXBwbHkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdM OjpDbGlwU3RhY2s6OmFwcGx5SWZOZWVkZWQpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRl eHR1cmVNYXBwZXJHTDo6Q2xpcFN0YXRlOjpDbGlwU3RhdGUpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OkNsaXBTdGFjayk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6Y3VycmVudCk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6 Z2V0U3RlbmNpbEluZGV4KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBw ZXJHTDo6Q2xpcFN0YWNrOjppc0N1cnJlbnRTY2lzc29yQm94RW1wdHkpOiBEZWxldGVkLgorCiAy MDE1LTEyLTMxICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXBs YWNlIFdURjo6bW92ZSB3aXRoIFdURk1vdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NN YWtlTGlzdHMudHh0IGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKaW5kZXggYjI3MWZi ODA1MTk3YWNlYzYxNjIwNjYyNGNhZTAyZDJjYWM1OGM0OS4uODdlYjNiZWYyNDFiZGNlZThiYjYz ODIzMjRiZjVlZWM4MzIwZThmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0 cy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKQEAgLTIyNDMsNiArMjI0 Myw3IEBAIHNldChXZWJDb3JlX1NPVVJDRVMKIAogICAgIHBsYXRmb3JtL2dyYXBoaWNzL29wZW50 eXBlL09wZW5UeXBlTWF0aERhdGEuY3BwCiAKKyAgICBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv Q2xpcFN0YWNrLmNwcAogICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy LmNwcAogICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9u LmNwcAogICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQmFja2luZ1N0 b3JlLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL0JpdG1hcFRleHR1cmVHTC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmNwcAppbmRleCAyYTlmYjg1MDNlOGVmNDM0MGJkNTI0 YmJkMTBkY2ZhMDE1MzNjNWIwLi5kMmQ5YjUxYzA0NGNhNzcyZTllMmQ0YzE2YzM5Yzc4ZDM4ZWNk ZWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv Qml0bWFwVGV4dHVyZUdMLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmNwcApAQCAtMjk2LDggKzI5Niw4IEBAIHZvaWQgQml0 bWFwVGV4dHVyZUdMOjpjbGVhcklmTmVlZGVkKCkKICAgICBpZiAoIW1fc2hvdWxkQ2xlYXIpCiAg ICAgICAgIHJldHVybjsKIAotICAgIG1fY2xpcFN0YWNrLnJlc2V0KEludFJlY3QoSW50UG9pbnQ6 Onplcm8oKSwgbV90ZXh0dXJlU2l6ZSksIFRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0YWNrOjpEZWZh dWx0WUF4aXMpOwotICAgIG1fY2xpcFN0YWNrLmFwcGx5SWZOZWVkZWQobV9jb250ZXh0M0QuZ2V0 KCkpOworICAgIG1fY2xpcFN0YWNrLnJlc2V0KEludFJlY3QoSW50UG9pbnQ6Onplcm8oKSwgbV90 ZXh0dXJlU2l6ZSksIENsaXBTdGFjazo6WUF4aXNNb2RlOjpEZWZhdWx0KTsKKyAgICBtX2NsaXBT dGFjay5hcHBseUlmTmVlZGVkKCptX2NvbnRleHQzRCk7CiAgICAgbV9jb250ZXh0M0QtPmNsZWFy Q29sb3IoMCwgMCwgMCwgMCk7CiAgICAgbV9jb250ZXh0M0QtPmNsZWFyKEdyYXBoaWNzQ29udGV4 dDNEOjpDT0xPUl9CVUZGRVJfQklUKTsKICAgICBtX3Nob3VsZENsZWFyID0gZmFsc2U7CkBAIC0z MjEsNyArMzIxLDcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OmJpbmRBc1N1cmZhY2UoR3JhcGhp Y3NDb250ZXh0M0QqIGNvbnRleHQzRCkKICAgICBjb250ZXh0M0QtPmJpbmRGcmFtZWJ1ZmZlcihH cmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIG1fZmJvKTsKICAgICBjb250ZXh0M0QtPnZp ZXdwb3J0KDAsIDAsIG1fdGV4dHVyZVNpemUud2lkdGgoKSwgbV90ZXh0dXJlU2l6ZS5oZWlnaHQo KSk7CiAgICAgY2xlYXJJZk5lZWRlZCgpOwotICAgIG1fY2xpcFN0YWNrLmFwcGx5KG1fY29udGV4 dDNELmdldCgpKTsKKyAgICBtX2NsaXBTdGFjay5hcHBseSgqbV9jb250ZXh0M0QpOwogfQogCiBC aXRtYXBUZXh0dXJlR0w6On5CaXRtYXBUZXh0dXJlR0woKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmVHTC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmVHTC5oCmluZGV4 IDI3MTE0YmI0ZjgyNmQzMjZiMDg2YzBiYzViOWFlZjI4ZTQ2N2I3MGMuLmJiMzM3NGY0MDFmOWM3 ZGMwMzQwOGI4OTk4YTAzY2I1Y2ViZjNlMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJlR0wuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmgKQEAgLTI0LDYg KzI0LDcgQEAKICNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCiAKICNpbmNsdWRlICJCaXRtYXBU ZXh0dXJlLmgiCisjaW5jbHVkZSAiQ2xpcFN0YWNrLmgiCiAjaW5jbHVkZSAiRmlsdGVyT3BlcmF0 aW9uLmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0QuaCIKICNpbmNsdWRlICJJbnRTaXpl LmgiCkBAIC02Nyw3ICs2OCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHsgfQogICAgIH07CiAg ICAgY29uc3QgRmlsdGVySW5mbyogZmlsdGVySW5mbygpIGNvbnN0IHsgcmV0dXJuICZtX2ZpbHRl ckluZm87IH0KLSAgICBUZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjayYgY2xpcFN0YWNrKCkgeyBy ZXR1cm4gbV9jbGlwU3RhY2s7IH0KKyAgICBDbGlwU3RhY2smIGNsaXBTdGFjaygpIHsgcmV0dXJu IG1fY2xpcFN0YWNrOyB9CiAKICAgICBHQzNEaW50IGludGVybmFsRm9ybWF0KCkgY29uc3QgeyBy ZXR1cm4gbV9pbnRlcm5hbEZvcm1hdDsgfQogCkBAIC04MCw3ICs4MSw3IEBAIHByaXZhdGU6CiAg ICAgUGxhdGZvcm0zRE9iamVjdCBtX3JibzsKICAgICBQbGF0Zm9ybTNET2JqZWN0IG1fZGVwdGhC dWZmZXJPYmplY3Q7CiAgICAgYm9vbCBtX3Nob3VsZENsZWFyOwotICAgIFRleHR1cmVNYXBwZXJH TDo6Q2xpcFN0YWNrIG1fY2xpcFN0YWNrOworICAgIENsaXBTdGFjayBtX2NsaXBTdGFjazsKICAg ICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IG1fY29udGV4dDNEOwogCiAgICAgQml0bWFwVGV4 dHVyZUdMKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvQ2xpcFN0YWNrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9DbGlwU3RhY2suY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmNhM2NkMjZlNWI0ZTAxMTAxNWI3YzAwZTFl NjM3ZjMzNDM2ZDIwZTMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvQ2xpcFN0YWNrLmNwcApAQCAtMCwwICsxLDkwIEBACisvKgorICog Q29weXJpZ2h0IChDKSAyMDEwIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFy eSgtaWVzKQorICogQ29weXJpZ2h0IChDKSAyMDEyIElnYWxpYSBTLkwuCisgKiBDb3B5cmlnaHQg KEMpIDIwMTIgQWRvYmUgU3lzdGVtcyBJbmNvcnBvcmF0ZWQKKyAqCisgKiBUaGlzIGxpYnJhcnkg aXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2Rp ZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwor ICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsg ZWl0aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikg YW55IGxhdGVyIHZlcnNpb24uCisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGlu IHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FS UkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRB QklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUK KyAqIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoK KyAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdl bmVyYWwgUHVibGljIExpY2Vuc2UKKyAqIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhl IGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRlIHRvCisgKiB0aGUgRnJlZSBTb2Z0d2Fy ZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICog Qm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgor I2luY2x1ZGUgIkNsaXBTdGFjay5oIgorCisjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0QuaCIK KworbmFtZXNwYWNlIFdlYkNvcmUgeworCit2b2lkIENsaXBTdGFjazo6cHVzaCgpCit7CisgICAg Y2xpcFN0YWNrLmFwcGVuZChjbGlwU3RhdGUpOworICAgIGNsaXBTdGF0ZURpcnR5ID0gdHJ1ZTsK K30KKwordm9pZCBDbGlwU3RhY2s6OnBvcCgpCit7CisgICAgaWYgKGNsaXBTdGFjay5pc0VtcHR5 KCkpCisgICAgICAgIHJldHVybjsKKyAgICBjbGlwU3RhdGUgPSBjbGlwU3RhY2subGFzdCgpOwor ICAgIGNsaXBTdGFjay5yZW1vdmVMYXN0KCk7CisgICAgY2xpcFN0YXRlRGlydHkgPSB0cnVlOwor fQorCit2b2lkIENsaXBTdGFjazo6cmVzZXQoY29uc3QgSW50UmVjdCYgcmVjdCwgQ2xpcFN0YWNr OjpZQXhpc01vZGUgbW9kZSkKK3sKKyAgICBjbGlwU3RhY2suY2xlYXIoKTsKKyAgICBzaXplID0g cmVjdC5zaXplKCk7CisgICAgeUF4aXNNb2RlID0gbW9kZTsKKyAgICBjbGlwU3RhdGUgPSBTdGF0 ZShyZWN0KTsKKyAgICBjbGlwU3RhdGVEaXJ0eSA9IHRydWU7Cit9CisKK3ZvaWQgQ2xpcFN0YWNr OjppbnRlcnNlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKK3sKKyAgICBjbGlwU3RhdGUuc2Npc3Nv ckJveC5pbnRlcnNlY3QocmVjdCk7CisgICAgY2xpcFN0YXRlRGlydHkgPSB0cnVlOworfQorCit2 b2lkIENsaXBTdGFjazo6c2V0U3RlbmNpbEluZGV4KGludCBzdGVuY2lsSW5kZXgpCit7CisgICAg Y2xpcFN0YXRlLnN0ZW5jaWxJbmRleCA9IHN0ZW5jaWxJbmRleDsKKyAgICBjbGlwU3RhdGVEaXJ0 eSA9IHRydWU7Cit9CisKK3ZvaWQgQ2xpcFN0YWNrOjphcHBseShHcmFwaGljc0NvbnRleHQzRCYg Y29udGV4dCkKK3sKKyAgICBpZiAoY2xpcFN0YXRlLnNjaXNzb3JCb3guaXNFbXB0eSgpKQorICAg ICAgICByZXR1cm47CisKKyAgICBjb250ZXh0LnNjaXNzb3IoY2xpcFN0YXRlLnNjaXNzb3JCb3gu eCgpLAorICAgICAgICAoeUF4aXNNb2RlID09IFlBeGlzTW9kZTo6SW52ZXJ0ZWQpID8gc2l6ZS5o ZWlnaHQoKSAtIGNsaXBTdGF0ZS5zY2lzc29yQm94Lm1heFkoKSA6IGNsaXBTdGF0ZS5zY2lzc29y Qm94LnkoKSwKKyAgICAgICAgY2xpcFN0YXRlLnNjaXNzb3JCb3gud2lkdGgoKSwgY2xpcFN0YXRl LnNjaXNzb3JCb3guaGVpZ2h0KCkpOworICAgIGNvbnRleHQuc3RlbmNpbE9wKEdyYXBoaWNzQ29u dGV4dDNEOjpLRUVQLCBHcmFwaGljc0NvbnRleHQzRDo6S0VFUCwgR3JhcGhpY3NDb250ZXh0M0Q6 OktFRVApOworICAgIGNvbnRleHQuc3RlbmNpbEZ1bmMoR3JhcGhpY3NDb250ZXh0M0Q6OkVRVUFM LCBjbGlwU3RhdGUuc3RlbmNpbEluZGV4IC0gMSwgY2xpcFN0YXRlLnN0ZW5jaWxJbmRleCAtIDEp OworICAgIGlmIChjbGlwU3RhdGUuc3RlbmNpbEluZGV4ID09IDEpCisgICAgICAgIGNvbnRleHQu ZGlzYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9URVNUKTsKKyAgICBlbHNlCisgICAg ICAgIGNvbnRleHQuZW5hYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lMX1RFU1QpOworfQor Cit2b2lkIENsaXBTdGFjazo6YXBwbHlJZk5lZWRlZChHcmFwaGljc0NvbnRleHQzRCYgY29udGV4 dCkKK3sKKyAgICBpZiAoIWNsaXBTdGF0ZURpcnR5KQorICAgICAgICByZXR1cm47CisKKyAgICBj bGlwU3RhdGVEaXJ0eSA9IGZhbHNlOworICAgIGFwcGx5KGNvbnRleHQpOworfQorCit9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvQ2xpcFN0YWNrLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvQ2xpcFN0YWNrLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTNmN2IyODU5OGI5NzQ4ZjhiMzJlZjc2 NmQ0Yzg4YTE5NGEyNjQxOQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9DbGlwU3RhY2suaApAQCAtMCwwICsxLDc0IEBACisvKgorICog Q29weXJpZ2h0IChDKSAyMDEwIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFy eSgtaWVzKQorICogQ29weXJpZ2h0IChDKSAyMDE1IElnYWxpYSBTLkwuCisgKgorICogVGhpcyBs aWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgor ICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQ dWJsaWMKKyAqIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5k YXRpb247IGVpdGhlcgorICogdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBv cHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAqIFRoaXMgbGlicmFyeSBpcyBkaXN0cmli dXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICogYnV0IFdJVEhPVVQg QU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAqIE1F UkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0 aGUgR05VCisgKiBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWls cy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGli cmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisgKiBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsg c2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bworICogdGhlIEZyZWUg U29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9v ciwKKyAqIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgorICovCisKKyNpZm5kZWYgQ2xpcFN0 YWNrX2gKKyNkZWZpbmUgQ2xpcFN0YWNrX2gKKworI2luY2x1ZGUgIkludFJlY3QuaCIKKyNpbmNs dWRlICJJbnRTaXplLmgiCisjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgorCituYW1lc3BhY2UgV2Vi Q29yZSB7CisKK2NsYXNzIEdyYXBoaWNzQ29udGV4dDNEOworCitjbGFzcyBDbGlwU3RhY2sgewor cHVibGljOgorICAgIHN0cnVjdCBTdGF0ZSB7CisgICAgICAgIFN0YXRlKGNvbnN0IEludFJlY3Qm IHNjaXNzb3JzID0gSW50UmVjdCgpLCBpbnQgc3RlbmNpbCA9IDEpCisgICAgICAgICAgICA6IHNj aXNzb3JCb3goc2Npc3NvcnMpCisgICAgICAgICAgICAsIHN0ZW5jaWxJbmRleChzdGVuY2lsKQor ICAgICAgICB7IH0KKworICAgICAgICBJbnRSZWN0IHNjaXNzb3JCb3g7CisgICAgICAgIGludCBz dGVuY2lsSW5kZXg7CisgICAgfTsKKworICAgIC8vIFktYXhpcyBzaG91bGQgYmUgaW52ZXJ0ZWQg b25seSB3aGVuIHBhaW50aW5nIGludG8gdGhlIHdpbmRvdy4KKyAgICBlbnVtIGNsYXNzIFlBeGlz TW9kZSB7CisgICAgICAgIERlZmF1bHQsCisgICAgICAgIEludmVydGVkLAorICAgIH07CisKKyAg ICB2b2lkIHB1c2goKTsKKyAgICB2b2lkIHBvcCgpOworICAgIFN0YXRlJiBjdXJyZW50KCkgeyBy ZXR1cm4gY2xpcFN0YXRlOyB9CisKKyAgICB2b2lkIHJlc2V0KGNvbnN0IEludFJlY3QmLCBZQXhp c01vZGUpOworICAgIHZvaWQgaW50ZXJzZWN0KGNvbnN0IEludFJlY3QmKTsKKyAgICB2b2lkIHNl dFN0ZW5jaWxJbmRleChpbnQpOworICAgIGludCBnZXRTdGVuY2lsSW5kZXgoKSBjb25zdCB7IHJl dHVybiBjbGlwU3RhdGUuc3RlbmNpbEluZGV4OyB9CisKKyAgICB2b2lkIGFwcGx5KEdyYXBoaWNz Q29udGV4dDNEJik7CisgICAgdm9pZCBhcHBseUlmTmVlZGVkKEdyYXBoaWNzQ29udGV4dDNEJik7 CisKKyAgICBib29sIGlzQ3VycmVudFNjaXNzb3JCb3hFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIGNs aXBTdGF0ZS5zY2lzc29yQm94LmlzRW1wdHkoKTsgfQorCitwcml2YXRlOgorICAgIFZlY3RvcjxT dGF0ZT4gY2xpcFN0YWNrOworICAgIFN0YXRlIGNsaXBTdGF0ZTsKKyAgICBJbnRTaXplIHNpemU7 CisgICAgYm9vbCBjbGlwU3RhdGVEaXJ0eSB7IGZhbHNlIH07CisgICAgWUF4aXNNb2RlIHlBeGlz TW9kZSB7IFlBeGlzTW9kZTo6RGVmYXVsdCB9OworfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQorCisjZW5kaWYgLy8gQ2xpcFN0YWNrX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKaW5kZXggNjU3 NjkyNjhlOTFhNzdmZmJhNzBiMDBmMWZkYjNhYmQwYTg1ODMwZC4uMmRiMzIzODEwOTIzN2UzZDIy OWY3ZmQ0ZGFkNGZkMjY0ZjY3MDdmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKQEAgLTE1Niw2 NyArMTU2LDYgQEAgVGV4dHVyZU1hcHBlckdMRGF0YTo6flRleHR1cmVNYXBwZXJHTERhdGEoKQog ICAgICAgICBjb250ZXh0LT5kZWxldGVCdWZmZXIoZW50cnkudmFsdWUpOwogfQogCi12b2lkIFRl eHR1cmVNYXBwZXJHTDo6Q2xpcFN0YWNrOjpyZXNldChjb25zdCBJbnRSZWN0JiByZWN0LCBUZXh0 dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6WUF4aXNNb2RlIG1vZGUpCi17Ci0gICAgY2xpcFN0YWNr LmNsZWFyKCk7Ci0gICAgc2l6ZSA9IHJlY3Quc2l6ZSgpOwotICAgIHlBeGlzTW9kZSA9IG1vZGU7 Ci0gICAgY2xpcFN0YXRlID0gVGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhdGUocmVjdCk7Ci0gICAg Y2xpcFN0YXRlRGlydHkgPSB0cnVlOwotfQotCi12b2lkIFRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0 YWNrOjppbnRlcnNlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKLXsKLSAgICBjbGlwU3RhdGUuc2Np c3NvckJveC5pbnRlcnNlY3QocmVjdCk7Ci0gICAgY2xpcFN0YXRlRGlydHkgPSB0cnVlOwotfQot Ci12b2lkIFRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0YWNrOjpzZXRTdGVuY2lsSW5kZXgoaW50IHN0 ZW5jaWxJbmRleCkKLXsKLSAgICBjbGlwU3RhdGUuc3RlbmNpbEluZGV4ID0gc3RlbmNpbEluZGV4 OwotICAgIGNsaXBTdGF0ZURpcnR5ID0gdHJ1ZTsKLX0KLQotdm9pZCBUZXh0dXJlTWFwcGVyR0w6 OkNsaXBTdGFjazo6cHVzaCgpCi17Ci0gICAgY2xpcFN0YWNrLmFwcGVuZChjbGlwU3RhdGUpOwot ICAgIGNsaXBTdGF0ZURpcnR5ID0gdHJ1ZTsKLX0KLQotdm9pZCBUZXh0dXJlTWFwcGVyR0w6OkNs aXBTdGFjazo6cG9wKCkKLXsKLSAgICBpZiAoY2xpcFN0YWNrLmlzRW1wdHkoKSkKLSAgICAgICAg cmV0dXJuOwotICAgIGNsaXBTdGF0ZSA9IGNsaXBTdGFjay5sYXN0KCk7Ci0gICAgY2xpcFN0YWNr LnJlbW92ZUxhc3QoKTsKLSAgICBjbGlwU3RhdGVEaXJ0eSA9IHRydWU7Ci19Ci0KLXZvaWQgVGV4 dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OmFwcGx5KEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0 KQotewotICAgIGlmIChjbGlwU3RhdGUuc2Npc3NvckJveC5pc0VtcHR5KCkpCi0gICAgICAgIHJl dHVybjsKLQotICAgIGNvbnRleHQtPnNjaXNzb3IoY2xpcFN0YXRlLnNjaXNzb3JCb3gueCgpLAot ICAgICAgICAoeUF4aXNNb2RlID09IEludmVydGVkWUF4aXMpID8gc2l6ZS5oZWlnaHQoKSAtIGNs aXBTdGF0ZS5zY2lzc29yQm94Lm1heFkoKSA6IGNsaXBTdGF0ZS5zY2lzc29yQm94LnkoKSwKLSAg ICAgICAgY2xpcFN0YXRlLnNjaXNzb3JCb3gud2lkdGgoKSwgY2xpcFN0YXRlLnNjaXNzb3JCb3gu aGVpZ2h0KCkpOwotICAgIGNvbnRleHQtPnN0ZW5jaWxPcChHcmFwaGljc0NvbnRleHQzRDo6S0VF UCwgR3JhcGhpY3NDb250ZXh0M0Q6OktFRVAsIEdyYXBoaWNzQ29udGV4dDNEOjpLRUVQKTsKLSAg ICBjb250ZXh0LT5zdGVuY2lsRnVuYyhHcmFwaGljc0NvbnRleHQzRDo6RVFVQUwsIGNsaXBTdGF0 ZS5zdGVuY2lsSW5kZXggLSAxLCBjbGlwU3RhdGUuc3RlbmNpbEluZGV4IC0gMSk7Ci0gICAgaWYg KGNsaXBTdGF0ZS5zdGVuY2lsSW5kZXggPT0gMSkKLSAgICAgICAgY29udGV4dC0+ZGlzYWJsZShH cmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9URVNUKTsKLSAgICBlbHNlCi0gICAgICAgIGNvbnRl eHQtPmVuYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9URVNUKTsKLX0KLQotdm9pZCBU ZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6YXBwbHlJZk5lZWRlZChHcmFwaGljc0NvbnRleHQz RCogY29udGV4dCkKLXsKLSAgICBpZiAoIWNsaXBTdGF0ZURpcnR5KQotICAgICAgICByZXR1cm47 Ci0KLSAgICBjbGlwU3RhdGVEaXJ0eSA9IGZhbHNlOwotICAgIGFwcGx5KGNvbnRleHQpOwotfQot CiB2b2lkIFRleHR1cmVNYXBwZXJHTERhdGE6OmluaXRpYWxpemVTdGVuY2lsKCkKIHsKICAgICBp ZiAoY3VycmVudFN1cmZhY2UpIHsKQEAgLTI0Miw3ICsxODEsNyBAQCBUZXh0dXJlTWFwcGVyR0w6 OlRleHR1cmVNYXBwZXJHTCgpCiAjZW5kaWYKIH0KIAotVGV4dHVyZU1hcHBlckdMOjpDbGlwU3Rh Y2smIFRleHR1cmVNYXBwZXJHTDo6Y2xpcFN0YWNrKCkKK0NsaXBTdGFjayYgVGV4dHVyZU1hcHBl ckdMOjpjbGlwU3RhY2soKQogewogICAgIHJldHVybiBkYXRhKCkuY3VycmVudFN1cmZhY2UgPyB0 b0JpdG1hcFRleHR1cmVHTChkYXRhKCkuY3VycmVudFN1cmZhY2UuZ2V0KCkpLT5jbGlwU3RhY2so KSA6IG1fY2xpcFN0YWNrOwogfQpAQCAtMjU4LDcgKzE5Nyw3IEBAIHZvaWQgVGV4dHVyZU1hcHBl ckdMOjpiZWdpblBhaW50aW5nKFBhaW50RmxhZ3MgZmxhZ3MpCiAgICAgbV9jb250ZXh0M0QtPmRl cHRoTWFzaygwKTsKICAgICBtX2NvbnRleHQzRC0+Z2V0SW50ZWdlcnYoR3JhcGhpY3NDb250ZXh0 M0Q6OlZJRVdQT1JULCBkYXRhKCkudmlld3BvcnQpOwogICAgIG1fY29udGV4dDNELT5nZXRJbnRl Z2VydihHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NPUl9CT1gsIGRhdGEoKS5wcmV2aW91c1NjaXNz b3IpOwotICAgIG1fY2xpcFN0YWNrLnJlc2V0KEludFJlY3QoMCwgMCwgZGF0YSgpLnZpZXdwb3J0 WzJdLCBkYXRhKCkudmlld3BvcnRbM10pLCBDbGlwU3RhY2s6OkludmVydGVkWUF4aXMpOworICAg IG1fY2xpcFN0YWNrLnJlc2V0KEludFJlY3QoMCwgMCwgZGF0YSgpLnZpZXdwb3J0WzJdLCBkYXRh KCkudmlld3BvcnRbM10pLCBDbGlwU3RhY2s6OllBeGlzTW9kZTo6SW52ZXJ0ZWQpOwogICAgIG1f Y29udGV4dDNELT5nZXRJbnRlZ2VydihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVJfQklO RElORywgJmRhdGEoKS50YXJnZXRGcmFtZUJ1ZmZlcik7CiAgICAgZGF0YSgpLlBhaW50RmxhZ3Mg PSBmbGFnczsKICAgICBiaW5kU3VyZmFjZSgwKTsKQEAgLTY4Miw3ICs2MjEsNyBAQCB2b2lkIFRl eHR1cmVNYXBwZXJHTDo6YmluZERlZmF1bHRTdXJmYWNlKCkKICAgICBJbnRTaXplIHZpZXdwb3J0 U2l6ZShkYXRhKCkudmlld3BvcnRbMl0sIGRhdGEoKS52aWV3cG9ydFszXSk7CiAgICAgZGF0YSgp LnByb2plY3Rpb25NYXRyaXggPSBjcmVhdGVQcm9qZWN0aW9uTWF0cml4KHZpZXdwb3J0U2l6ZSwg ZGF0YSgpLlBhaW50RmxhZ3MgJiBQYWludGluZ01pcnJvcmVkKTsKICAgICBtX2NvbnRleHQzRC0+ dmlld3BvcnQoZGF0YSgpLnZpZXdwb3J0WzBdLCBkYXRhKCkudmlld3BvcnRbMV0sIHZpZXdwb3J0 U2l6ZS53aWR0aCgpLCB2aWV3cG9ydFNpemUuaGVpZ2h0KCkpOwotICAgIG1fY2xpcFN0YWNrLmFw cGx5KG1fY29udGV4dDNELmdldCgpKTsKKyAgICBtX2NsaXBTdGFjay5hcHBseSgqbV9jb250ZXh0 M0QpOwogICAgIGRhdGEoKS5jdXJyZW50U3VyZmFjZSA9IG51bGxwdHI7CiB9CiAKQEAgLTcxOCw3 ICs2NTcsNyBAQCBib29sIFRleHR1cmVNYXBwZXJHTDo6YmVnaW5TY2lzc29yQ2xpcChjb25zdCBU cmFuc2Zvcm1hdGlvbk1hdHJpeCYgbW9kZWxWaWV3TWF0cgogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICBjbGlwU3RhY2soKS5pbnRlcnNlY3QocmVjdCk7Ci0gICAgY2xpcFN0YWNrKCkuYXBw bHlJZk5lZWRlZChtX2NvbnRleHQzRC5nZXQoKSk7CisgICAgY2xpcFN0YWNrKCkuYXBwbHlJZk5l ZWRlZCgqbV9jb250ZXh0M0QpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC03NzAsMTMgKzcw OSwxMyBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6YmVnaW5DbGlwKGNvbnN0IFRyYW5zZm9ybWF0 aW9uTWF0cml4JiBtb2RlbFZpZXdNYXRyaXgsIGNvbgogCiAgICAgLy8gSW5jcmVhc2Ugc3RlbmNp bEluZGV4IGFuZCBhcHBseSBzdGVuY2lsIHRlc3RpbmcuCiAgICAgY2xpcFN0YWNrKCkuc2V0U3Rl bmNpbEluZGV4KHN0ZW5jaWxJbmRleCAqIDIpOwotICAgIGNsaXBTdGFjaygpLmFwcGx5SWZOZWVk ZWQobV9jb250ZXh0M0QuZ2V0KCkpOworICAgIGNsaXBTdGFjaygpLmFwcGx5SWZOZWVkZWQoKm1f Y29udGV4dDNEKTsKIH0KIAogdm9pZCBUZXh0dXJlTWFwcGVyR0w6OmVuZENsaXAoKQogewogICAg IGNsaXBTdGFjaygpLnBvcCgpOwotICAgIGNsaXBTdGFjaygpLmFwcGx5SWZOZWVkZWQobV9jb250 ZXh0M0QuZ2V0KCkpOworICAgIGNsaXBTdGFjaygpLmFwcGx5SWZOZWVkZWQoKm1fY29udGV4dDNE KTsKIH0KIAogSW50UmVjdCBUZXh0dXJlTWFwcGVyR0w6OmNsaXBCb3VuZHMoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJH TC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJHTC5oCmluZGV4IGI2ZWRkMTJmMGQ2MWQyM2FlMTViNzVlZTE0ZTU5YmZiZGY3NTEwNDAuLjc5 YjUzZDE3NDQ0NjEwNDJiZDRkNmUwM2ZkNWQwNzc3MmRkZWJkM2YgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmgKQEAgLTIzLDYgKzIzLDcgQEAKIAogI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKIAorI2lu Y2x1ZGUgIkNsaXBTdGFjay5oIgogI2luY2x1ZGUgIkZpbHRlck9wZXJhdGlvbi5oIgogI2luY2x1 ZGUgIkZsb2F0UXVhZC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCkBAIC0zOSw1 MiArNDAsNiBAQCBjbGFzcyBGaWx0ZXJPcGVyYXRpb247CiAvLyBBbiBPcGVuR0wtRVMyIGltcGxl bWVudGF0aW9uIG9mIFRleHR1cmVNYXBwZXIuCiBjbGFzcyBUZXh0dXJlTWFwcGVyR0wgOiBwdWJs aWMgVGV4dHVyZU1hcHBlciB7CiBwdWJsaWM6Ci0gICAgc3RydWN0IENsaXBTdGF0ZSB7Ci0gICAg ICAgIEludFJlY3Qgc2Npc3NvckJveDsKLSAgICAgICAgaW50IHN0ZW5jaWxJbmRleDsKLSAgICAg ICAgQ2xpcFN0YXRlKGNvbnN0IEludFJlY3QmIHNjaXNzb3JzID0gSW50UmVjdCgpLCBpbnQgc3Rl bmNpbCA9IDEpCi0gICAgICAgICAgICA6IHNjaXNzb3JCb3goc2Npc3NvcnMpCi0gICAgICAgICAg ICAsIHN0ZW5jaWxJbmRleChzdGVuY2lsKQotICAgICAgICB7IH0KLSAgICB9OwotCi0gICAgY2xh c3MgQ2xpcFN0YWNrIHsKLSAgICBwdWJsaWM6Ci0gICAgICAgIENsaXBTdGFjaygpCi0gICAgICAg ICAgICA6IGNsaXBTdGF0ZURpcnR5KGZhbHNlKQotICAgICAgICB7IH0KLQotICAgICAgICAvLyBZ LWF4aXMgc2hvdWxkIGJlIGludmVydGVkIG9ubHkgd2hlbiBwYWludGluZyBpbnRvIHRoZSB3aW5k b3cuCi0gICAgICAgIGVudW0gWUF4aXNNb2RlIHsKLSAgICAgICAgICAgIERlZmF1bHRZQXhpcywK LSAgICAgICAgICAgIEludmVydGVkWUF4aXMKLSAgICAgICAgfTsKLQotICAgICAgICB2b2lkIHB1 c2goKTsKLSAgICAgICAgdm9pZCBwb3AoKTsKLSAgICAgICAgdm9pZCBhcHBseShHcmFwaGljc0Nv bnRleHQzRCopOwotICAgICAgICB2b2lkIGFwcGx5SWZOZWVkZWQoR3JhcGhpY3NDb250ZXh0M0Qq KTsKLSAgICAgICAgaW5saW5lIENsaXBTdGF0ZSYgY3VycmVudCgpIHsgcmV0dXJuIGNsaXBTdGF0 ZTsgfQotICAgICAgICB2b2lkIHJlc2V0KGNvbnN0IEludFJlY3QmLCBZQXhpc01vZGUpOwotICAg ICAgICB2b2lkIGludGVyc2VjdChjb25zdCBJbnRSZWN0Jik7Ci0gICAgICAgIHZvaWQgc2V0U3Rl bmNpbEluZGV4KGludCk7Ci0gICAgICAgIGlubGluZSBpbnQgZ2V0U3RlbmNpbEluZGV4KCkgY29u c3QKLSAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIGNsaXBTdGF0ZS5zdGVuY2lsSW5kZXg7 Ci0gICAgICAgIH0KLSAgICAgICAgaW5saW5lIGJvb2wgaXNDdXJyZW50U2Npc3NvckJveEVtcHR5 KCkgY29uc3QKLSAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIGNsaXBTdGF0ZS5zY2lzc29y Qm94LmlzRW1wdHkoKTsKLSAgICAgICAgfQotCi0gICAgcHJpdmF0ZToKLSAgICAgICAgQ2xpcFN0 YXRlIGNsaXBTdGF0ZTsKLSAgICAgICAgVmVjdG9yPENsaXBTdGF0ZT4gY2xpcFN0YWNrOwotICAg ICAgICBib29sIGNsaXBTdGF0ZURpcnR5OwotICAgICAgICBJbnRTaXplIHNpemU7Ci0gICAgICAg IFlBeGlzTW9kZSB5QXhpc01vZGU7Ci0gICAgfTsKLQogICAgIFRleHR1cmVNYXBwZXJHTCgpOwog ICAgIHZpcnR1YWwgflRleHR1cmVNYXBwZXJHTCgpOwogCg==