190600 2018-10-15 13:57:22 -0700 Remove unused parameters of WebPageGroupData 2018-10-15 18:13:45 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez don.olmstead mcatanzaro webkit-bug-importer oldest_to_newest 1469437 0 achristensen 2018-10-15 13:57:22 -0700 Remove unused parameters of WebPageGroupData 1469438 1 352373 achristensen 2018-10-15 13:58:14 -0700 Created attachment 352373 Patch 1469448 2 352373 cdumez 2018-10-15 14:07:12 -0700 Comment on attachment 352373 Patch r=me if the bots are happy. 1469468 3 achristensen 2018-10-15 14:34:06 -0700 http://trac.webkit.org/r237146 1469472 4 webkit-bug-importer 2018-10-15 14:35:37 -0700 <rdar://problem/45284661> 1469560 5 don.olmstead 2018-10-15 17:31:44 -0700 WinCairo bot was not happy with this one. 1469561 6 achristensen 2018-10-15 17:32:35 -0700 I'll take a look. 1469565 7 achristensen 2018-10-15 17:39:21 -0700 https://trac.webkit.org/changeset/237161/webkit Could WinCairo stop using the entire concept of PageGroups? It's a legacy concept that we're trying to remove, so a new port should not have it. 1469566 8 don.olmstead 2018-10-15 17:41:09 -0700 (In reply to Alex Christensen from comment #7) > https://trac.webkit.org/changeset/237161/webkit > Could WinCairo stop using the entire concept of PageGroups? It's a legacy > concept that we're trying to remove, so a new port should not have it. Sure. GTK ports were also affected though. You want to get stuff to green or do you want to start ripping out PageGroups? 1469568 9 achristensen 2018-10-15 17:42:03 -0700 Get stuff to green for now. We unfortunately can't remove PageGroups right now because they're used by an Apple-internal client. 1469569 10 352412 don.olmstead 2018-10-15 17:43:04 -0700 Created attachment 352412 Build fix Here's a build fix that should work. Your call if you want to land it. 1469576 11 352414 don.olmstead 2018-10-15 17:52:14 -0700 Created attachment 352414 Build fix Now with GTK 1469585 12 don.olmstead 2018-10-15 18:07:23 -0700 Ok so the GTK bots are borked because of that BUBBLE_WRAP dependency they added. Michael this patch work for you in GTK? I don't have a GTK build. 1469589 13 achristensen 2018-10-15 18:13:45 -0700 Fixed GTK in 237165 Fixed API tests in r237167 352373 2018-10-15 13:58:14 -0700 2018-10-15 14:07:12 -0700 Patch bug-190600-20181015135813.patch text/plain 10869 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzcxNDApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDE4LTEwLTE1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIHVudXNl ZCBwYXJhbWV0ZXJzIG9mIFdlYlBhZ2VHcm91cERhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDYwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIHZpc2libGVUb0luamVjdGVkQnVuZGxlIGFuZCB2aXNp YmxlVG9IaXN0b3J5Q2xpZW50IGFyZSBib3RoIGFsd2F5cyB0cnVlLgorICAgICAgICBUaGlzIHJl bW92ZXMgYSBteXN0ZXJpb3VzIGNoZWNrIGluIHRoZSBoaXN0b3J5IGNvZGUuCisKKyAgICAgICAg KiBTaGFyZWQvV2ViUGFnZUdyb3VwRGF0YS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VH cm91cERhdGE6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VHcm91cERh dGE6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VHcm91cERhdGEuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZUdyb3VwOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpwYWdlR3JvdXBEYXRhKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZUdyb3VwOjpXZWJQYWdlR3JvdXApOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlR3JvdXAuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUdyb3VwOjpXZWJQ YWdlR3JvdXApOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlR3JvdXA6OmNyZWF0ZSk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRhdGVHbG9iYWxIaXN0 b3J5KToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OnVwZGF0ZUdsb2Jh bEhpc3RvcnlSZWRpcmVjdExpbmtzKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJD bGllbnQ6OnNldFRpdGxlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OmNsb3NlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZUdy b3VwUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlR3JvdXBQcm94eTo6Y3JlYXRl KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZUdyb3VwUHJveHkuaDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZUdyb3VwUHJveHk6OnBhZ2VHcm91cElEIGNvbnN0KToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZUdyb3VwUHJveHk6OmlzVmlzaWJsZVRvSW5qZWN0ZWRCdW5k bGUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlR3JvdXBQcm94eTo6 aXNWaXNpYmxlVG9IaXN0b3J5Q2xpZW50IGNvbnN0KTogRGVsZXRlZC4KKwogMjAxOC0xMC0xNSAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJl bW92ZSB1bnVzZWQgcGFyYW1ldGVycyBmcm9tIEZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVGcmFt ZQpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUdyb3VwRGF0YS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUdyb3VwRGF0YS5jcHAJKHJldmlz aW9uIDIzNzEzOCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VHcm91cERhdGEuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zNCwzMCArMzQsMjcgQEAgdm9pZCBXZWJQYWdlR3JvdXBEYXRh OjplbmNvZGUoSVBDOjpFbmNvZAogewogICAgIGVuY29kZXIgPDwgaWRlbnRpZmllcjsKICAgICBl bmNvZGVyIDw8IHBhZ2VHcm91cElEOwotICAgIGVuY29kZXIgPDwgdmlzaWJsZVRvSW5qZWN0ZWRC dW5kbGU7Ci0gICAgZW5jb2RlciA8PCB2aXNpYmxlVG9IaXN0b3J5Q2xpZW50OwogICAgIGVuY29k ZXIgPDwgdXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllci50b1VJbnQ2NCgpOwogfQogCiBz dGQ6Om9wdGlvbmFsPFdlYlBhZ2VHcm91cERhdGE+IFdlYlBhZ2VHcm91cERhdGE6OmRlY29kZShJ UEM6OkRlY29kZXImIGRlY29kZXIpCiB7Ci0gICAgU3RyaW5nIGlkOwotICAgIGlmICghZGVjb2Rl ci5kZWNvZGUoaWQpKQorICAgIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBpZGVudGlmaWVyOworICAg IGRlY29kZXIgPj4gaWRlbnRpZmllcjsKKyAgICBpZiAoIWlkZW50aWZpZXIpCiAgICAgICAgIHJl dHVybiBzdGQ6Om51bGxvcHQ7Ci0gICAgdWludDY0X3QgcGFnZUdyb3VwSUQ7Ci0gICAgaWYgKCFk ZWNvZGVyLmRlY29kZShwYWdlR3JvdXBJRCkpCisgICAgCisgICAgc3RkOjpvcHRpb25hbDx1aW50 NjRfdD4gcGFnZUdyb3VwSUQ7CisgICAgZGVjb2RlciA+PiBwYWdlR3JvdXBJRDsKKyAgICBpZiAo IXBhZ2VHcm91cElEKQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwotICAgIGJvb2wgdmlz aWJsZVRvSW5qZWN0ZWRCdW5kbGU7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZSh2aXNpYmxlVG9J bmplY3RlZEJ1bmRsZSkpCi0gICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Ci0gICAgYm9vbCB2 aXNpYmxlVG9IaXN0b3J5Q2xpZW50OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUodmlzaWJsZVRv SGlzdG9yeUNsaWVudCkpCi0gICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Ci0gICAgc3RkOjpv cHRpb25hbDx1aW50NjRfdD4gdXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllcjsKKyAgICAK KyAgICBzdGQ6Om9wdGlvbmFsPFVzZXJDb250ZW50Q29udHJvbGxlcklkZW50aWZpZXI+IHVzZXJD b250ZW50Q29udHJvbGxlcklkZW50aWZpZXI7CiAgICAgZGVjb2RlciA+PiB1c2VyQ29udGVudENv bnRyb2xsZXJJZGVudGlmaWVyOwogICAgIGlmICghdXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRp ZmllcikKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLSAgICByZXR1cm4geyB7IGlkLCBw YWdlR3JvdXBJRCwgdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUsIHZpc2libGVUb0hpc3RvcnlDbGll bnQsIG1ha2VPYmplY3RJZGVudGlmaWVyPFVzZXJDb250ZW50Q29udHJvbGxlcklkZW50aWZpZXJU eXBlPigqdXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllcikgfSB9OworICAgIAorICAgIHJl dHVybiB7eyBXVEZNb3ZlKCppZGVudGlmaWVyKSwgV1RGTW92ZSgqcGFnZUdyb3VwSUQpLCBXVEZN b3ZlKCp1c2VyQ29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyKSB9fTsKIH0KIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlR3JvdXBEYXRh LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUdyb3VwRGF0YS5o CShyZXZpc2lvbiAyMzcxMzgpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlR3JvdXBE YXRhLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDggKzQxLDYgQEAgc3RydWN0IFdlYlBhZ2VHcm91 cERhdGEgewogCiAgICAgU3RyaW5nIGlkZW50aWZpZXI7CiAgICAgdWludDY0X3QgcGFnZUdyb3Vw SUQ7Ci0gICAgYm9vbCB2aXNpYmxlVG9JbmplY3RlZEJ1bmRsZTsKLSAgICBib29sIHZpc2libGVU b0hpc3RvcnlDbGllbnQ7CiAKICAgICBVc2VyQ29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyIHVz ZXJDb250ZW50Q29udHJvbGxlcklkZW50aWZpZXI7CiB9OwpJbmRleDogU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZUdyb3VwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlR3JvdXAuY3BwCShyZXZpc2lvbiAyMzcxMzgpCisrKyBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NCw5ICs1 NCw5IEBAIHN0YXRpYyBXZWJQYWdlR3JvdXBNYXAmIHdlYlBhZ2VHcm91cE1hcCgKICAgICByZXR1 cm4gbWFwOwogfQogCi1SZWY8V2ViUGFnZUdyb3VwPiBXZWJQYWdlR3JvdXA6OmNyZWF0ZShjb25z dCBTdHJpbmcmIGlkZW50aWZpZXIsIGJvb2wgdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUsIGJvb2wg dmlzaWJsZVRvSGlzdG9yeUNsaWVudCkKK1JlZjxXZWJQYWdlR3JvdXA+IFdlYlBhZ2VHcm91cDo6 Y3JlYXRlKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllcikKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYo Km5ldyBXZWJQYWdlR3JvdXAoaWRlbnRpZmllciwgdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUsIHZp c2libGVUb0hpc3RvcnlDbGllbnQpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJQYWdl R3JvdXAoaWRlbnRpZmllcikpOwogfQogCiBXZWJQYWdlR3JvdXAqIFdlYlBhZ2VHcm91cDo6Z2V0 KHVpbnQ2NF90IHBhZ2VHcm91cElEKQpAQCAtNjQsNyArNjQsNyBAQCBXZWJQYWdlR3JvdXAqIFdl YlBhZ2VHcm91cDo6Z2V0KHVpbnQ2NF90CiAgICAgcmV0dXJuIHdlYlBhZ2VHcm91cE1hcCgpLmdl dChwYWdlR3JvdXBJRCk7CiB9CiAKLXN0YXRpYyBXZWJQYWdlR3JvdXBEYXRhIHBhZ2VHcm91cERh dGEoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBib29sIHZpc2libGVUb0luamVjdGVkQnVuZGxl LCBib29sIHZpc2libGVUb0hpc3RvcnlDbGllbnQpCitzdGF0aWMgV2ViUGFnZUdyb3VwRGF0YSBw YWdlR3JvdXBEYXRhKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllcikKIHsKICAgICBXZWJQYWdlR3Jv dXBEYXRhIGRhdGE7CiAKQEAgLTc1LDE2ICs3NSwxMyBAQCBzdGF0aWMgV2ViUGFnZUdyb3VwRGF0 YSBwYWdlR3JvdXBEYXRhKGNvCiAgICAgZWxzZQogICAgICAgICBkYXRhLmlkZW50aWZpZXIgPSBt YWtlU3RyaW5nKCJfX3VuaXF1ZVBhZ2VHcm91cElELSIsIFN0cmluZzo6bnVtYmVyKGRhdGEucGFn ZUdyb3VwSUQpKTsKIAotICAgIGRhdGEudmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUgPSB2aXNpYmxl VG9JbmplY3RlZEJ1bmRsZTsKLSAgICBkYXRhLnZpc2libGVUb0hpc3RvcnlDbGllbnQgPSB2aXNp YmxlVG9IaXN0b3J5Q2xpZW50OwotCiAgICAgcmV0dXJuIGRhdGE7CiB9CiAKIC8vIEZJWE1FOiBX aHkgZG9lcyB0aGUgV2ViUHJlZmVyZW5jZXMgb2JqZWN0IGhlcmUgdXNlICIuV2ViS2l0MiIgaW5z dGVhZCBvZiAiV2ViS2l0Mi4iIHdoaWNoIGFsbCB0aGUgb3RoZXIgY29uc3RydWN0b3JzIHVzZS4K IC8vIElmIGl0IHR1cm5zIG91dCB0aGF0IGl0J3Mgd3JvbmcsIHdlIGNhbiBjaGFuZ2UgaXQgdG8g dG8gIldlYktpdDIuIiBhbmQgZ2V0IHJpZCBvZiB0aGUgZ2xvYmFsRGVidWdLZXlQcmVmaXggZnJv bSBXZWJQcmVmZXJlbmNlcy4KLVdlYlBhZ2VHcm91cDo6V2ViUGFnZUdyb3VwKGNvbnN0IFN0cmlu ZyYgaWRlbnRpZmllciwgYm9vbCB2aXNpYmxlVG9JbmplY3RlZEJ1bmRsZSwgYm9vbCB2aXNpYmxl VG9IaXN0b3J5Q2xpZW50KQotICAgIDogbV9kYXRhKHBhZ2VHcm91cERhdGEoaWRlbnRpZmllciwg dmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUsIHZpc2libGVUb0hpc3RvcnlDbGllbnQpKQorV2ViUGFn ZUdyb3VwOjpXZWJQYWdlR3JvdXAoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyKQorICAgIDogbV9k YXRhKHBhZ2VHcm91cERhdGEoaWRlbnRpZmllcikpCiAgICAgLCBtX3ByZWZlcmVuY2VzKFdlYlBy ZWZlcmVuY2VzOjpjcmVhdGVXaXRoTGVnYWN5RGVmYXVsdHMobV9kYXRhLmlkZW50aWZpZXIsICIu V2ViS2l0MiIsICJXZWJLaXQyLiIpKQogICAgICwgbV91c2VyQ29udGVudENvbnRyb2xsZXIoV2Vi VXNlckNvbnRlbnRDb250cm9sbGVyUHJveHk6OmNyZWF0ZSgpKQogewpJbmRleDogU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmgJKHJldmlzaW9uIDIzNzEzOCkKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5oCSh3b3JraW5nIGNvcHkpCkBAIC00MSw4ICs0 MSw4IEBAIGNsYXNzIFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5OwogCiBjbGFzcyBXZWJQ YWdlR3JvdXAgOiBwdWJsaWMgQVBJOjpPYmplY3RJbXBsPEFQSTo6T2JqZWN0OjpUeXBlOjpQYWdl R3JvdXA+IHsKIHB1YmxpYzoKLSAgICBXZWJQYWdlR3JvdXAoY29uc3QgU3RyaW5nJiBpZGVudGlm aWVyID0gU3RyaW5nKCksIGJvb2wgdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUgPSB0cnVlLCBib29s IHZpc2libGVUb0hpc3RvcnlDbGllbnQgPSB0cnVlKTsKLSAgICBzdGF0aWMgUmVmPFdlYlBhZ2VH cm91cD4gY3JlYXRlKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciA9IFN0cmluZygpLCBib29sIHZp c2libGVUb0luamVjdGVkQnVuZGxlID0gdHJ1ZSwgYm9vbCB2aXNpYmxlVG9IaXN0b3J5Q2xpZW50 ID0gdHJ1ZSk7CisgICAgZXhwbGljaXQgV2ViUGFnZUdyb3VwKGNvbnN0IFN0cmluZyYgaWRlbnRp ZmllciA9IHsgfSk7CisgICAgc3RhdGljIFJlZjxXZWJQYWdlR3JvdXA+IGNyZWF0ZShjb25zdCBT dHJpbmcmIGlkZW50aWZpZXIgPSB7IH0pOwogCiAgICAgc3RhdGljIFdlYlBhZ2VHcm91cCogZ2V0 KHVpbnQ2NF90IHBhZ2VHcm91cElEKTsKIApJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuY3BwCShyZXZpc2lvbiAyMzcxMzgpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x MDc5LDcgKzEwNzksNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpmaW5pc2hlZExvYWRp CiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRhdGVHbG9iYWxIaXN0b3J5KCkKIHsKICAg ICBXZWJQYWdlKiB3ZWJQYWdlID0gbV9mcmFtZS0+cGFnZSgpOwotICAgIGlmICghd2ViUGFnZSB8 fCAhd2ViUGFnZS0+cGFnZUdyb3VwKCktPmlzVmlzaWJsZVRvSGlzdG9yeUNsaWVudCgpKQorICAg IGlmICghd2ViUGFnZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgRG9jdW1lbnRMb2FkZXIqIGxv YWRlciA9IG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpOwpA QCAtMTA5Nyw3ICsxMDk3LDcgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dXBkYXRlR2xv YmFsSAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dXBkYXRlR2xvYmFsSGlzdG9yeVJlZGly ZWN0TGlua3MoKQogewogICAgIFdlYlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7Ci0g ICAgaWYgKCF3ZWJQYWdlIHx8ICF3ZWJQYWdlLT5wYWdlR3JvdXAoKS0+aXNWaXNpYmxlVG9IaXN0 b3J5Q2xpZW50KCkpCisgICAgaWYgKCF3ZWJQYWdlKQogICAgICAgICByZXR1cm47CiAKICAgICBE b2N1bWVudExvYWRlciogbG9hZGVyID0gbV9mcmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLmRv Y3VtZW50TG9hZGVyKCk7CkBAIC0xMzQwLDcgKzEzNDAsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVy Q2xpZW50Ojp1cGRhdGVDYWNoZWRECiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpzZXRUaXRs ZShjb25zdCBTdHJpbmdXaXRoRGlyZWN0aW9uJiB0aXRsZSwgY29uc3QgVVJMJiB1cmwpCiB7CiAg ICAgV2ViUGFnZSogd2ViUGFnZSA9IG1fZnJhbWUtPnBhZ2UoKTsKLSAgICBpZiAoIXdlYlBhZ2Ug fHwgIXdlYlBhZ2UtPnBhZ2VHcm91cCgpLT5pc1Zpc2libGVUb0hpc3RvcnlDbGllbnQoKSkKKyAg ICBpZiAoIXdlYlBhZ2UpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIEZJWE1FOiBVc2UgZGly ZWN0aW9uIG9mIHRpdGxlLgpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDIzNzEzOCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNDEsNyArMzQxLDcg QEAgUmVmPFdlYlBhZ2U+IFdlYlBhZ2U6OmNyZWF0ZSh1aW50NjRfdCBwYQogewogICAgIFJlZjxX ZWJQYWdlPiBwYWdlID0gYWRvcHRSZWYoKm5ldyBXZWJQYWdlKHBhZ2VJRCwgV1RGTW92ZShwYXJh bWV0ZXJzKSkpOwogCi0gICAgaWYgKHBhZ2UtPnBhZ2VHcm91cCgpLT5pc1Zpc2libGVUb0luamVj dGVkQnVuZGxlKCkgJiYgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuaW5qZWN0ZWRCdW5kbGUoKSkK KyAgICBpZiAoV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuaW5qZWN0ZWRCdW5kbGUoKSkKICAgICAg ICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuaW5qZWN0ZWRCdW5kbGUoKS0+ZGlkQ3JlYXRlUGFn ZShwYWdlLnB0cigpKTsKIAogICAgIHJldHVybiBwYWdlOwpAQCAtMTE3Niw3ICsxMTc2LDcgQEAg dm9pZCBXZWJQYWdlOjpjbG9zZSgpCiAgICAgaWYgKCFtYWluV2ViRnJhbWUoKS0+dXJsKCkuaXNF bXB0eSgpKQogICAgICAgICByZXBvcnRVc2VkRmVhdHVyZXMoKTsKIAotICAgIGlmIChwYWdlR3Jv dXAoKS0+aXNWaXNpYmxlVG9JbmplY3RlZEJ1bmRsZSgpICYmIFdlYlByb2Nlc3M6OnNpbmdsZXRv bigpLmluamVjdGVkQnVuZGxlKCkpCisgICAgaWYgKFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmlu amVjdGVkQnVuZGxlKCkpCiAgICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmluamVjdGVk QnVuZGxlKCktPndpbGxEZXN0cm95UGFnZSh0aGlzKTsKIAogICAgIGlmIChtX2luc3BlY3Rvcikg ewpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZUdyb3VwUHJv eHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2VHcm91cFByb3h5LmNwcAkocmV2aXNpb24gMjM3MTM4KQorKysgU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZUdyb3VwUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zOSw3ICszOSw3IEBAIFJlZjxXZWJQYWdlR3JvdXBQcm94eT4gV2ViUGFnZUdyb3VwUHJveHkK IHsKICAgICBhdXRvIHBhZ2VHcm91cCA9IGFkb3B0UmVmKCpuZXcgV2ViUGFnZUdyb3VwUHJveHko ZGF0YSkpOwogCi0gICAgaWYgKHBhZ2VHcm91cC0+aXNWaXNpYmxlVG9JbmplY3RlZEJ1bmRsZSgp ICYmIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmluamVjdGVkQnVuZGxlKCkpCisgICAgaWYgKFdl YlByb2Nlc3M6OnNpbmdsZXRvbigpLmluamVjdGVkQnVuZGxlKCkpCiAgICAgICAgIFdlYlByb2Nl c3M6OnNpbmdsZXRvbigpLmluamVjdGVkQnVuZGxlKCktPmRpZEluaXRpYWxpemVQYWdlR3JvdXAo cGFnZUdyb3VwLnB0cigpKTsKIAogICAgIHJldHVybiBwYWdlR3JvdXA7CkluZGV4OiBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlR3JvdXBQcm94eS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2VHcm91cFByb3h5LmgJ KHJldmlzaW9uIDIzNzEzOCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2VHcm91cFByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDggKzQ0LDYgQEAgcHVibGlj OgogCiAgICAgY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9kYXRh LmlkZW50aWZpZXI7IH0KICAgICB1aW50NjRfdCBwYWdlR3JvdXBJRCgpIGNvbnN0IHsgcmV0dXJu IG1fZGF0YS5wYWdlR3JvdXBJRDsgfQotICAgIGJvb2wgaXNWaXNpYmxlVG9JbmplY3RlZEJ1bmRs ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YS52aXNpYmxlVG9JbmplY3RlZEJ1bmRsZTsgfQotICAg IGJvb2wgaXNWaXNpYmxlVG9IaXN0b3J5Q2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhLnZp c2libGVUb0hpc3RvcnlDbGllbnQ7IH0KICAgICBXZWJDb3JlOjpQYWdlR3JvdXAqIGNvcmVQYWdl R3JvdXAoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VHcm91cDsgfQogCiAgICAgV2ViVXNlckNvbnRl bnRDb250cm9sbGVyJiB1c2VyQ29udGVudENvbnRyb2xsZXIoKTsK 352412 2018-10-15 17:43:04 -0700 2018-10-15 17:52:14 -0700 Build fix bug-190600-fix.diff text/plain 3578 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZDhlYWJkOWU1OTYuLmFjNGRiYTE5MWM5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDE4LTEwLTE1ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBwYXJhbWV0ZXJzIG9mIFdlYlBhZ2VHcm91cERhdGEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDYwMAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDUyODQ2NjE+CisKKyAgICAgICAgVW5yZXZpZXdlZCBi dWlsZCBmaXguCisKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1JlbW90ZVdlYkluc3BlY3RvclBy b3h5R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlV2ViSW5zcGVjdG9yUHJveHk6OnBs YXRmb3JtQ3JlYXRlRnJvbnRlbmRQYWdlQW5kV2luZG93KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv Z3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVj dG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlRnJvbnRlbmRQYWdlKToKKyAgICAgICAgKiBVSVByb2Nl c3Mvd2luL1dlYkluc3BlY3RvclByb3h5V2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5z cGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlRnJvbnRlbmRQYWdlKToKKwogMjAxOC0xMC0xNSAg Q2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIy MzY1MTIpOiBbIE1hYyBXSzIgXSBMYXlvdXQgVGVzdCBlZGl0aW5nL3VuZG8vdW5kby1zbWFydC1k ZWxldGUtd29yZC5odG1sIGlzIGZsYWt5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9ndGsvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvZ3RrL1JlbW90ZVdlYkluc3BlY3RvclByb3h5R3RrLmNwcAppbmRleCBjOTRhYmRk MTJjZS4uZjllY2VkZjYzZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0 ay9SZW1vdGVXZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvZ3RrL1JlbW90ZVdlYkluc3BlY3RvclByb3h5R3RrLmNwcApAQCAtNTcsNyArNTcsNyBA QCBXZWJQYWdlUHJveHkqIFJlbW90ZVdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0ZUZy b250ZW5kUGFnZUFuZFdpbmRvdygpCiAgICAgcHJlZmVyZW5jZXMtPnNldERldmVsb3BlckV4dHJh c0VuYWJsZWQodHJ1ZSk7CiAgICAgcHJlZmVyZW5jZXMtPnNldExvZ3NQYWdlTWVzc2FnZXNUb1N5 c3RlbUNvbnNvbGVFbmFibGVkKHRydWUpOwogI2VuZGlmCi0gICAgUmVmUHRyPFdlYlBhZ2VHcm91 cD4gcGFnZUdyb3VwID0gV2ViUGFnZUdyb3VwOjpjcmVhdGUoaW5zcGVjdG9yUGFnZUdyb3VwSWRl bnRpZmllckZvclBhZ2UobnVsbHB0ciksIGZhbHNlLCBmYWxzZSk7CisgICAgUmVmUHRyPFdlYlBh Z2VHcm91cD4gcGFnZUdyb3VwID0gV2ViUGFnZUdyb3VwOjpjcmVhdGUoaW5zcGVjdG9yUGFnZUdy b3VwSWRlbnRpZmllckZvclBhZ2UobnVsbHB0cikpOwogCiAgICAgYXV0byBwYWdlQ29uZmlndXJh dGlvbiA9IEFQSTo6UGFnZUNvbmZpZ3VyYXRpb246OmNyZWF0ZSgpOwogICAgIHBhZ2VDb25maWd1 cmF0aW9uLT5zZXRQcm9jZXNzUG9vbCgmaW5zcGVjdG9yUHJvY2Vzc1Bvb2woaW5zcGVjdG9yTGV2 ZWxGb3JQYWdlKG51bGxwdHIpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Z3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcAppbmRleCAwMjJhZjZmODYwYS4uZGYxZjZkNTdi ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XZWJJbnNwZWN0b3JQ cm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3Rv clByb3h5R3RrLmNwcApAQCAtMTQ1LDcgKzE0NSw3IEBAIFdlYlBhZ2VQcm94eSogV2ViSW5zcGVj dG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlRnJvbnRlbmRQYWdlKCkKICNlbmRpZgogICAgIHByZWZl cmVuY2VzLT5zZXRKYXZhU2NyaXB0UnVudGltZUZsYWdzKHsKICAgICB9KTsKLSAgICBSZWZQdHI8 V2ViUGFnZUdyb3VwPiBwYWdlR3JvdXAgPSBXZWJQYWdlR3JvdXA6OmNyZWF0ZShpbnNwZWN0b3JQ YWdlR3JvdXBJZGVudGlmaWVyRm9yUGFnZShpbnNwZWN0ZWRQYWdlKCkpLCBmYWxzZSwgZmFsc2Up OworICAgIFJlZlB0cjxXZWJQYWdlR3JvdXA+IHBhZ2VHcm91cCA9IFdlYlBhZ2VHcm91cDo6Y3Jl YXRlKGluc3BlY3RvclBhZ2VHcm91cElkZW50aWZpZXJGb3JQYWdlKGluc3BlY3RlZFBhZ2UoKSkp OwogCiAgICAgYXV0byBwYWdlQ29uZmlndXJhdGlvbiA9IEFQSTo6UGFnZUNvbmZpZ3VyYXRpb246 OmNyZWF0ZSgpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRQcm9jZXNzUG9vbCgmaW5zcGVj dG9yUHJvY2Vzc1Bvb2woaW5zcGVjdGlvbkxldmVsKCkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL3dpbi9XZWJJbnNwZWN0b3JQcm94eVdpbi5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy93aW4vV2ViSW5zcGVjdG9yUHJveHlXaW4uY3BwCmluZGV4IGVlODYyN2Uy YzM1Li4wYjBmYTAwZTcyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mvd2lu L1dlYkluc3BlY3RvclByb3h5V2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93 aW4vV2ViSW5zcGVjdG9yUHJveHlXaW4uY3BwCkBAIC0xOTksNyArMTk5LDcgQEAgV2ViUGFnZVBy b3h5KiBXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVGcm9udGVuZFBhZ2UoKQogI2Vu ZGlmCiAgICAgcHJlZmVyZW5jZXMtPnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyh0cnVl KTsKICAgICBwcmVmZXJlbmNlcy0+c2V0SmF2YVNjcmlwdFJ1bnRpbWVGbGFncyh7IH0pOwotICAg IFJlZlB0cjxXZWJQYWdlR3JvdXA+IHBhZ2VHcm91cCA9IFdlYlBhZ2VHcm91cDo6Y3JlYXRlKGlu c3BlY3RvclBhZ2VHcm91cElkZW50aWZpZXJGb3JQYWdlKGluc3BlY3RlZFBhZ2UoKSksIGZhbHNl LCBmYWxzZSk7CisgICAgUmVmUHRyPFdlYlBhZ2VHcm91cD4gcGFnZUdyb3VwID0gV2ViUGFnZUdy b3VwOjpjcmVhdGUoaW5zcGVjdG9yUGFnZUdyb3VwSWRlbnRpZmllckZvclBhZ2UoaW5zcGVjdGVk UGFnZSgpKSk7CiAgICAgYXV0byBwYWdlQ29uZmlndXJhdGlvbiA9IEFQSTo6UGFnZUNvbmZpZ3Vy YXRpb246OmNyZWF0ZSgpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRQcm9jZXNzUG9vbCgm aW5zcGVjdG9yUHJvY2Vzc1Bvb2woaW5zcGVjdGlvbkxldmVsKCkpKTsKICAgICBwYWdlQ29uZmln dXJhdGlvbi0+c2V0UHJlZmVyZW5jZXMocHJlZmVyZW5jZXMuZ2V0KCkpOwo= 352414 2018-10-15 17:52:14 -0700 2018-10-15 17:52:14 -0700 Build fix bug-190600-fix.diff text/plain 2490 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOGY3NjY1ZDYwN2IuLmM5YjM5NWQ4YjE3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDE4LTEwLTE1ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBwYXJhbWV0ZXJzIG9mIFdlYlBhZ2VHcm91cERhdGEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDYwMAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDUyODQ2NjE+CisKKyAgICAgICAgVW5yZXZpZXdlZCBi dWlsZCBmaXguCisKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1JlbW90ZVdlYkluc3BlY3RvclBy b3h5R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlV2ViSW5zcGVjdG9yUHJveHk6OnBs YXRmb3JtQ3JlYXRlRnJvbnRlbmRQYWdlQW5kV2luZG93KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv Z3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVj dG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlRnJvbnRlbmRQYWdlKToKKwogMjAxOC0xMC0xNSAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBX aW5DYWlybyBidWlsZCBhZnRlciByMjM3MTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9ndGsvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvZ3RrL1JlbW90ZVdlYkluc3BlY3RvclByb3h5R3RrLmNwcAppbmRleCBjOTRh YmRkMTJjZS4uZjllY2VkZjYzZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2d0ay9SZW1vdGVXZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvZ3RrL1JlbW90ZVdlYkluc3BlY3RvclByb3h5R3RrLmNwcApAQCAtNTcsNyArNTcs NyBAQCBXZWJQYWdlUHJveHkqIFJlbW90ZVdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0 ZUZyb250ZW5kUGFnZUFuZFdpbmRvdygpCiAgICAgcHJlZmVyZW5jZXMtPnNldERldmVsb3BlckV4 dHJhc0VuYWJsZWQodHJ1ZSk7CiAgICAgcHJlZmVyZW5jZXMtPnNldExvZ3NQYWdlTWVzc2FnZXNU b1N5c3RlbUNvbnNvbGVFbmFibGVkKHRydWUpOwogI2VuZGlmCi0gICAgUmVmUHRyPFdlYlBhZ2VH cm91cD4gcGFnZUdyb3VwID0gV2ViUGFnZUdyb3VwOjpjcmVhdGUoaW5zcGVjdG9yUGFnZUdyb3Vw SWRlbnRpZmllckZvclBhZ2UobnVsbHB0ciksIGZhbHNlLCBmYWxzZSk7CisgICAgUmVmUHRyPFdl YlBhZ2VHcm91cD4gcGFnZUdyb3VwID0gV2ViUGFnZUdyb3VwOjpjcmVhdGUoaW5zcGVjdG9yUGFn ZUdyb3VwSWRlbnRpZmllckZvclBhZ2UobnVsbHB0cikpOwogCiAgICAgYXV0byBwYWdlQ29uZmln dXJhdGlvbiA9IEFQSTo6UGFnZUNvbmZpZ3VyYXRpb246OmNyZWF0ZSgpOwogICAgIHBhZ2VDb25m aWd1cmF0aW9uLT5zZXRQcm9jZXNzUG9vbCgmaW5zcGVjdG9yUHJvY2Vzc1Bvb2woaW5zcGVjdG9y TGV2ZWxGb3JQYWdlKG51bGxwdHIpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcAppbmRleCAwMjJhZjZmODYwYS4uZGYxZjZk NTdiZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XZWJJbnNwZWN0 b3JQcm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dlYkluc3Bl Y3RvclByb3h5R3RrLmNwcApAQCAtMTQ1LDcgKzE0NSw3IEBAIFdlYlBhZ2VQcm94eSogV2ViSW5z cGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlRnJvbnRlbmRQYWdlKCkKICNlbmRpZgogICAgIHBy ZWZlcmVuY2VzLT5zZXRKYXZhU2NyaXB0UnVudGltZUZsYWdzKHsKICAgICB9KTsKLSAgICBSZWZQ dHI8V2ViUGFnZUdyb3VwPiBwYWdlR3JvdXAgPSBXZWJQYWdlR3JvdXA6OmNyZWF0ZShpbnNwZWN0 b3JQYWdlR3JvdXBJZGVudGlmaWVyRm9yUGFnZShpbnNwZWN0ZWRQYWdlKCkpLCBmYWxzZSwgZmFs c2UpOworICAgIFJlZlB0cjxXZWJQYWdlR3JvdXA+IHBhZ2VHcm91cCA9IFdlYlBhZ2VHcm91cDo6 Y3JlYXRlKGluc3BlY3RvclBhZ2VHcm91cElkZW50aWZpZXJGb3JQYWdlKGluc3BlY3RlZFBhZ2Uo KSkpOwogCiAgICAgYXV0byBwYWdlQ29uZmlndXJhdGlvbiA9IEFQSTo6UGFnZUNvbmZpZ3VyYXRp b246OmNyZWF0ZSgpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRQcm9jZXNzUG9vbCgmaW5z cGVjdG9yUHJvY2Vzc1Bvb2woaW5zcGVjdGlvbkxldmVsKCkpKTsK