193527 2019-01-16 20:59:18 -0800 ScrollingCoordinator: separate updating node geometry from node layers 2019-01-17 08:09:28 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser ews-watchlist fred.wang koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1495385 0 simon.fraser 2019-01-16 20:59:18 -0800 ScrollingCoordinator: separate updating node geometry from node layers 1495386 1 359347 simon.fraser 2019-01-16 21:03:03 -0800 Created attachment 359347 Patch 1495387 2 ews-watchlist 2019-01-16 21:05:19 -0800 Attachment 359347 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:16: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1495469 3 simon.fraser 2019-01-17 08:08:28 -0800 https://trac.webkit.org/changeset/240110/webkit 1495470 4 webkit-bug-importer 2019-01-17 08:09:28 -0800 <rdar://problem/47351358> 359347 2019-01-16 21:03:03 -0800 2019-01-16 22:16:51 -0800 Patch bug-193527-20190116210302.patch text/plain 22792 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzNiOTBkNjU2MjM4ZjM5 Y2M2ZjQ4ZDgzNzkyMmE4MWM1MDE1MzRjMC4uM2QxNmVlM2JhMzc1ZTNiOGM1NGUzODU5M2QyYzg5 Y2JkMmYyM2U2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE5LTAxLTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNjcm9sbGluZ0Nv b3JkaW5hdG9yOiBzZXBhcmF0ZSB1cGRhdGluZyBub2RlIGdlb21ldHJ5IGZyb20gbm9kZSBsYXll cnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzUy NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0 aW5nIHNjcm9sbGluZyB0cmVlIG5vZGUgbGF5ZXJzIGhhcHBlbnMgaW4gYSBkaWZmZXJlbnQgY29k ZSBwYXRoIGZyb20gdXBkYXRpbmcgZ2VvbWV0cnk7CisgICAgICAgIHRoZSBmb3JtZXIgaGFzIHRv IGJlIHBvc3QtZmx1c2gsIHdoZW4gR3JhcGhpY3NMYXllciBoYXMgbWFkZSB0aWxlZCBvciBzdHJ1 Y3R1cmFsIGxheWVycy4KKyAgICAgICAgR2VvbWV0cnkgb25seSBuZWVkcyB0byBiZSB1cGRhdGVk IGFmdGVyIGxheW91dCwgYW5kIHNvb24gd2UnbGwgZG8gdGhpcyB2aWEgY29tcG9zaXRpbmcgdXBk YXRlcy4KKyAgICAgICAgCisgICAgICAgIFdlIGNhbiBhbHNvIGNsZWFuIHVwIHRoZSBTY3JvbGxp bmdDb29yZGluYXRvciBBUEkgYW5kIGhhdmUgYSBzaW5nbGUgZnVuY3Rpb24gdGhhdCB1cGRhdGVz CisgICAgICAgIG5vZGUgbGF5ZXJzIChoYW5kbGluZyBkaWZmZXJlbnQgbm9kZSB0eXBlcyksIGFu ZCBzZXBhcmF0ZSBmdW5jdGlvbnMgZm9yIHB1c2hpbmcgdmlld3BvcnQtY29uc3RyYWluZWQKKyAg ICAgICAgYW5kIHNjcm9sbGluZyBub2RlIGdlb21ldHJ5LgorCisJCU5vIG9ic2VydmFibGUgYmVo YXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3JkaW5h dG9yOjpzZXROb2RlTGF5ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3I6OnNldFNjcm9sbGluZ05vZGVHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpB c3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpzZXRWaWV3cG9ydENvbnN0cmFpbnRlZE5vZGVHZW9t ZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRh dGVGcmFtZVNjcm9sbGluZ05vZGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6QXN5bmNT Y3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlKTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZU5v ZGVMYXllcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yOjp1cGRhdGVOb2RlVmlld3BvcnRDb25zdHJhaW50cyk6IERlbGV0ZWQuCisgICAgICAg ICogcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5oOgorICAgICAgICAq IHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmg6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxpbmdDb29yZGluYXRvcjo6c2V0Tm9kZUxheWVycyk6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxpbmdDb29yZGluYXRvcjo6c2V0U2Nyb2xsaW5nTm9kZUdlb21ldHJ5KToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpzZXRWaWV3cG9ydENvbnN0cmFpbnRl ZE5vZGVHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvcjo6 dXBkYXRlTm9kZUxheWVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nv b3JkaW5hdG9yOjp1cGRhdGVOb2RlVmlld3BvcnRDb25zdHJhaW50cyk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlRnJhbWVTY3JvbGxpbmdO b2RlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nvb3JkaW5hdG9yOjp1 cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRpb25Gb3JUaGlzRnJhbWUpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGlu YXRlZExheWVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmg6 CisKIDIwMTktMDEtMTUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgTWFrZSBkaWRDb21taXRDaGFuZ2VzRm9yTGF5ZXIoKSBleHBsaWNpdGx5IGFib3V0 IHRoZSBwbGF0Zm9ybSBsYXllciBjaGFuZ2luZyBiZWNhdXNlIG9mIHRpbGUvbm9uLXRpbGUgc3dh cHBpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Ny b2xsaW5nQ29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5 bmNTY3JvbGxpbmdDb29yZGluYXRvci5jcHAKaW5kZXggOWQ4MDJkMzc4NjViNTIwNThmNzE0Mjc2 Mzc1Y2IxZTVhMDc0Zjg1Yi4uZmI0ZTllMTMxYjEyMzRjYzc5NjUxYmRkYzVjZTdhNmQ2MmVmZDc5 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxp bmdDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5 bmNTY3JvbGxpbmdDb29yZGluYXRvci5jcHAKQEAgLTUyNSw1OCArNTI1LDUzIEBAIHZvaWQgQXN5 bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6ZW5zdXJlUm9vdFN0YXRlTm9kZUZvckZyYW1lVmlldyhG cmFtZVZpZXcmIGZyYW1lCiAgICAgYXR0YWNoVG9TdGF0ZVRyZWUoU2Nyb2xsaW5nTm9kZVR5cGU6 Ok1haW5GcmFtZSwgZnJhbWVWaWV3LnNjcm9sbExheWVySUQoKSwgMCwgMCk7CiB9CiAKLXZvaWQg QXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlRnJhbWVTY3JvbGxpbmdOb2RlKFNjcm9s bGluZ05vZGVJRCBub2RlSUQsIEdyYXBoaWNzTGF5ZXIqIGxheWVyLCBHcmFwaGljc0xheWVyKiBz Y3JvbGxlZENvbnRlbnRzTGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIGNvdW50ZXJTY3JvbGxpbmdMYXll ciwgR3JhcGhpY3NMYXllciogaW5zZXRDbGlwTGF5ZXIsIGNvbnN0IFNjcm9sbGluZ0dlb21ldHJ5 JiBzY3JvbGxpbmdHZW9tZXRyeSkKK3ZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6c2V0 Tm9kZUxheWVycyhTY3JvbGxpbmdOb2RlSUQgbm9kZUlELCBHcmFwaGljc0xheWVyKiBsYXllciwg R3JhcGhpY3NMYXllciogc2Nyb2xsZWRDb250ZW50c0xheWVyLCBHcmFwaGljc0xheWVyKiBjb3Vu dGVyU2Nyb2xsaW5nTGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIGluc2V0Q2xpcExheWVyKQogewotICAg IGF1dG8qIG5vZGUgPSBkb3duY2FzdDxTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZT4o bV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnN0YXRlTm9kZUZvcklEKG5vZGVJRCkpOworICAgIGF1dG8q IG5vZGUgPSBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+c3RhdGVOb2RlRm9ySUQobm9kZUlEKTsKICAg ICBBU1NFUlQobm9kZSk7CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm47CiAKICAgICBu b2RlLT5zZXRMYXllcihsYXllcik7Ci0gICAgbm9kZS0+c2V0SW5zZXRDbGlwTGF5ZXIoaW5zZXRD bGlwTGF5ZXIpOwotICAgIG5vZGUtPnNldFNjcm9sbGVkQ29udGVudHNMYXllcihzY3JvbGxlZENv bnRlbnRzTGF5ZXIpOwotICAgIG5vZGUtPnNldENvdW50ZXJTY3JvbGxpbmdMYXllcihjb3VudGVy U2Nyb2xsaW5nTGF5ZXIpOwotICAgIG5vZGUtPnNldFBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJl Y3Qoc2Nyb2xsaW5nR2VvbWV0cnkucGFyZW50UmVsYXRpdmVTY3JvbGxhYmxlUmVjdCk7Ci0gICAg bm9kZS0+c2V0U2Nyb2xsT3JpZ2luKHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbE9yaWdpbik7Ci0g ICAgbm9kZS0+c2V0U2Nyb2xsUG9zaXRpb24oc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsUG9zaXRp b24pOwotICAgIG5vZGUtPnNldFRvdGFsQ29udGVudHNTaXplKHNjcm9sbGluZ0dlb21ldHJ5LmNv bnRlbnRTaXplKTsKLSAgICBub2RlLT5zZXRSZWFjaGFibGVDb250ZW50c1NpemUoc2Nyb2xsaW5n R2VvbWV0cnkucmVhY2hhYmxlQ29udGVudFNpemUpOwotICAgIG5vZGUtPnNldFNjcm9sbGFibGVB cmVhU2l6ZShzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxhYmxlQXJlYVNpemUpOwotfQotICAgIAot dm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05v ZGUoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgR3JhcGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNz TGF5ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkmIHNj cm9sbGluZ0dlb21ldHJ5KQotewotICAgIGF1dG8qIG5vZGUgPSBkb3duY2FzdDxTY3JvbGxpbmdT dGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZT4obV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnN0YXRlTm9k ZUZvcklEKG5vZGVJRCkpOwotICAgIEFTU0VSVChub2RlKTsKLSAgICBpZiAoIW5vZGUpCi0gICAg ICAgIHJldHVybjsKIAotICAgIG5vZGUtPnNldExheWVyKGxheWVyKTsKLSAgICBub2RlLT5zZXRT Y3JvbGxlZENvbnRlbnRzTGF5ZXIoc2Nyb2xsZWRDb250ZW50c0xheWVyKTsKLSAgICBub2RlLT5z ZXRQYXJlbnRSZWxhdGl2ZVNjcm9sbGFibGVSZWN0KHNjcm9sbGluZ0dlb21ldHJ5LnBhcmVudFJl bGF0aXZlU2Nyb2xsYWJsZVJlY3QpOwotICAgIG5vZGUtPnNldFNjcm9sbE9yaWdpbihzY3JvbGxp bmdHZW9tZXRyeS5zY3JvbGxPcmlnaW4pOwotICAgIG5vZGUtPnNldFNjcm9sbFBvc2l0aW9uKHNj cm9sbGluZ0dlb21ldHJ5LnNjcm9sbFBvc2l0aW9uKTsKLSAgICBub2RlLT5zZXRUb3RhbENvbnRl bnRzU2l6ZShzY3JvbGxpbmdHZW9tZXRyeS5jb250ZW50U2l6ZSk7Ci0gICAgbm9kZS0+c2V0UmVh Y2hhYmxlQ29udGVudHNTaXplKHNjcm9sbGluZ0dlb21ldHJ5LnJlYWNoYWJsZUNvbnRlbnRTaXpl KTsKLSAgICBub2RlLT5zZXRTY3JvbGxhYmxlQXJlYVNpemUoc2Nyb2xsaW5nR2VvbWV0cnkuc2Ny b2xsYWJsZUFyZWFTaXplKTsKLSNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQKQotICAgIHNldFN0 YXRlU2Nyb2xsaW5nTm9kZVNuYXBPZmZzZXRzQXNGbG9hdCgqbm9kZSwgU2Nyb2xsRXZlbnRBeGlz OjpIb3Jpem9udGFsLCAmc2Nyb2xsaW5nR2VvbWV0cnkuaG9yaXpvbnRhbFNuYXBPZmZzZXRzLCAm c2Nyb2xsaW5nR2VvbWV0cnkuaG9yaXpvbnRhbFNuYXBPZmZzZXRSYW5nZXMsIG1fcGFnZS0+ZGV2 aWNlU2NhbGVGYWN0b3IoKSk7Ci0gICAgc2V0U3RhdGVTY3JvbGxpbmdOb2RlU25hcE9mZnNldHNB c0Zsb2F0KCpub2RlLCBTY3JvbGxFdmVudEF4aXM6OlZlcnRpY2FsLCAmc2Nyb2xsaW5nR2VvbWV0 cnkudmVydGljYWxTbmFwT2Zmc2V0cywgJnNjcm9sbGluZ0dlb21ldHJ5LnZlcnRpY2FsU25hcE9m ZnNldFJhbmdlcywgbV9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKLSAgICBub2RlLT5zZXRD dXJyZW50SG9yaXpvbnRhbFNuYXBQb2ludEluZGV4KHNjcm9sbGluZ0dlb21ldHJ5LmN1cnJlbnRI b3Jpem9udGFsU25hcFBvaW50SW5kZXgpOwotICAgIG5vZGUtPnNldEN1cnJlbnRWZXJ0aWNhbFNu YXBQb2ludEluZGV4KHNjcm9sbGluZ0dlb21ldHJ5LmN1cnJlbnRWZXJ0aWNhbFNuYXBQb2ludElu ZGV4KTsKLSNlbmRpZgorICAgIGlmIChpczxTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU+KG5v ZGUpKSB7CisgICAgICAgIGF1dG8mIHNjcm9sbGluZ05vZGUgPSBkb3duY2FzdDxTY3JvbGxpbmdT dGF0ZVNjcm9sbGluZ05vZGU+KCpub2RlKTsKKyAgICAgICAgc2Nyb2xsaW5nTm9kZS5zZXRTY3Jv bGxlZENvbnRlbnRzTGF5ZXIoc2Nyb2xsZWRDb250ZW50c0xheWVyKTsKKyAgICAKKyAgICAgICAg aWYgKGlzPFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlPihub2RlKSkgeworICAgICAg ICAgICAgYXV0byYgZnJhbWVTY3JvbGxpbmdOb2RlID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3RhdGVG cmFtZVNjcm9sbGluZ05vZGU+KCpub2RlKTsKKyAgICAgICAgICAgIGZyYW1lU2Nyb2xsaW5nTm9k ZS5zZXRJbnNldENsaXBMYXllcihpbnNldENsaXBMYXllcik7CisgICAgICAgICAgICBmcmFtZVNj cm9sbGluZ05vZGUuc2V0Q291bnRlclNjcm9sbGluZ0xheWVyKGNvdW50ZXJTY3JvbGxpbmdMYXll cik7CisgICAgICAgIH0KKyAgICB9CiB9CiAKLXZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRv cjo6dXBkYXRlTm9kZUxheWVyKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIEdyYXBoaWNzTGF5ZXIq IGdyYXBoaWNzTGF5ZXIpCit2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNldFNjcm9s bGluZ05vZGVHZW9tZXRyeShTY3JvbGxpbmdOb2RlSUQgbm9kZUlELCBjb25zdCBTY3JvbGxpbmdH ZW9tZXRyeSYgc2Nyb2xsaW5nR2VvbWV0cnkpCiB7Ci0gICAgYXV0byogbm9kZSA9IG1fc2Nyb2xs aW5nU3RhdGVUcmVlLT5zdGF0ZU5vZGVGb3JJRChub2RlSUQpOwotICAgIGlmICghbm9kZSkKKyAg ICBhdXRvKiBzY3JvbGxpbmdOb2RlID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdO b2RlPihtX3Njcm9sbGluZ1N0YXRlVHJlZS0+c3RhdGVOb2RlRm9ySUQobm9kZUlEKSk7CisgICAg QVNTRVJUKHNjcm9sbGluZ05vZGUpOworICAgIGlmICghc2Nyb2xsaW5nTm9kZSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgbm9kZS0+c2V0TGF5ZXIoZ3JhcGhpY3NMYXllcik7CisgICAgc2Nyb2xs aW5nTm9kZS0+c2V0UGFyZW50UmVsYXRpdmVTY3JvbGxhYmxlUmVjdChzY3JvbGxpbmdHZW9tZXRy eS5wYXJlbnRSZWxhdGl2ZVNjcm9sbGFibGVSZWN0KTsKKyAgICBzY3JvbGxpbmdOb2RlLT5zZXRT Y3JvbGxPcmlnaW4oc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsT3JpZ2luKTsKKyAgICBzY3JvbGxp bmdOb2RlLT5zZXRTY3JvbGxQb3NpdGlvbihzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxQb3NpdGlv bik7CisgICAgc2Nyb2xsaW5nTm9kZS0+c2V0VG90YWxDb250ZW50c1NpemUoc2Nyb2xsaW5nR2Vv bWV0cnkuY29udGVudFNpemUpOworICAgIHNjcm9sbGluZ05vZGUtPnNldFJlYWNoYWJsZUNvbnRl bnRzU2l6ZShzY3JvbGxpbmdHZW9tZXRyeS5yZWFjaGFibGVDb250ZW50U2l6ZSk7CisgICAgc2Ny b2xsaW5nTm9kZS0+c2V0U2Nyb2xsYWJsZUFyZWFTaXplKHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9s bGFibGVBcmVhU2l6ZSk7CisKKyNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQKQorICAgIC8vIHVw ZGF0ZVNjcm9sbFNuYXBQcm9wZXJ0aWVzV2l0aEZyYW1lVmlldygpIHNldHMgdGhlc2UgZm9yIGZy YW1lIHNjcm9sbGluZyBub2Rlcy4gRklYTUU6IFdoeSB0aGUgZGlmZmVyZW5jZT8KKyAgICBpZiAo aXM8U2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGU+KHNjcm9sbGluZ05vZGUpKSB7 CisgICAgICAgIHNldFN0YXRlU2Nyb2xsaW5nTm9kZVNuYXBPZmZzZXRzQXNGbG9hdCgqc2Nyb2xs aW5nTm9kZSwgU2Nyb2xsRXZlbnRBeGlzOjpIb3Jpem9udGFsLCAmc2Nyb2xsaW5nR2VvbWV0cnku aG9yaXpvbnRhbFNuYXBPZmZzZXRzLCAmc2Nyb2xsaW5nR2VvbWV0cnkuaG9yaXpvbnRhbFNuYXBP ZmZzZXRSYW5nZXMsIG1fcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgICAgIHNldFN0 YXRlU2Nyb2xsaW5nTm9kZVNuYXBPZmZzZXRzQXNGbG9hdCgqc2Nyb2xsaW5nTm9kZSwgU2Nyb2xs RXZlbnRBeGlzOjpWZXJ0aWNhbCwgJnNjcm9sbGluZ0dlb21ldHJ5LnZlcnRpY2FsU25hcE9mZnNl dHMsICZzY3JvbGxpbmdHZW9tZXRyeS52ZXJ0aWNhbFNuYXBPZmZzZXRSYW5nZXMsIG1fcGFnZS0+ ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgICAgIHNjcm9sbGluZ05vZGUtPnNldEN1cnJlbnRI b3Jpem9udGFsU25hcFBvaW50SW5kZXgoc2Nyb2xsaW5nR2VvbWV0cnkuY3VycmVudEhvcml6b250 YWxTbmFwUG9pbnRJbmRleCk7CisgICAgICAgIHNjcm9sbGluZ05vZGUtPnNldEN1cnJlbnRWZXJ0 aWNhbFNuYXBQb2ludEluZGV4KHNjcm9sbGluZ0dlb21ldHJ5LmN1cnJlbnRWZXJ0aWNhbFNuYXBQ b2ludEluZGV4KTsKKyAgICB9CisjZW5kaWYKIH0KIAotdm9pZCBBc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yOjp1cGRhdGVOb2RlVmlld3BvcnRDb25zdHJhaW50cyhTY3JvbGxpbmdOb2RlSUQgbm9k ZUlELCBjb25zdCBWaWV3cG9ydENvbnN0cmFpbnRzJiBjb25zdHJhaW50cykKK3ZvaWQgQXN5bmNT Y3JvbGxpbmdDb29yZGluYXRvcjo6c2V0Vmlld3BvcnRDb25zdHJhaW50ZWROb2RlR2VvbWV0cnko U2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgY29uc3QgVmlld3BvcnRDb25zdHJhaW50cyYgY29uc3Ry YWludHMpCiB7CiAgICAgYXV0byogbm9kZSA9IG1fc2Nyb2xsaW5nU3RhdGVUcmVlLT5zdGF0ZU5v ZGVGb3JJRChub2RlSUQpOwogICAgIGlmICghbm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAppbmRleCA4 ZWVlMTAwMzQzZTU5NTVhYmJjOWVlYWU4NGIyZWE5MWQzNjk5MzhhLi4wNzk2OGI4YWI3ZGNkODZl ZmViOGFjZjhmNDg2MGQxODhjYTE1MTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5oCkBAIC0xMDEsMTIg KzEwMSwxMCBAQCBwcml2YXRlOgogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZGV0YWNoRnJvbVN0 YXRlVHJlZShTY3JvbGxpbmdOb2RlSUQpIG92ZXJyaWRlOwogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgY2xlYXJTdGF0ZVRyZWUoKSBvdmVycmlkZTsKICAgICAKLSAgICBXRUJDT1JFX0VYUE9SVCB2 b2lkIHVwZGF0ZU5vZGVMYXllcihTY3JvbGxpbmdOb2RlSUQsIEdyYXBoaWNzTGF5ZXIqKSBvdmVy cmlkZTsKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHVwZGF0ZU5vZGVWaWV3cG9ydENvbnN0cmFp bnRzKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgVmlld3BvcnRDb25zdHJhaW50cyYpIG92ZXJyaWRl OwotICAgIAotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgdXBkYXRlRnJhbWVTY3JvbGxpbmdOb2Rl KFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NMYXllciogc2Nyb2xsTGF5ZXIsIEdyYXBoaWNzTGF5 ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwgR3JhcGhpY3NMYXllciogY291bnRlclNjcm9sbGlu Z0xheWVyLCBHcmFwaGljc0xheWVyKiBpbnNldENsaXBMYXllciwgY29uc3QgU2Nyb2xsaW5nR2Vv bWV0cnkmKSBvdmVycmlkZTsKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHVwZGF0ZU92ZXJmbG93 U2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdOb2RlSUQsIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbExheWVy LCBHcmFwaGljc0xheWVyKiBzY3JvbGxlZENvbnRlbnRzTGF5ZXIsIGNvbnN0IFNjcm9sbGluZ0dl b21ldHJ5Jikgb3ZlcnJpZGU7Ci0gICAgCisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXROb2Rl TGF5ZXJzKFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NMYXllciogLypsYXllciovLCBHcmFwaGlj c0xheWVyKiAvKnNjcm9sbGVkQ29udGVudHNMYXllciovID0gbnVsbHB0ciwgR3JhcGhpY3NMYXll ciogLypjb3VudGVyU2Nyb2xsaW5nTGF5ZXIqLyA9IG51bGxwdHIsIEdyYXBoaWNzTGF5ZXIqIC8q aW5zZXRDbGlwTGF5ZXIqLyA9IG51bGxwdHIpIG92ZXJyaWRlOworICAgIFdFQkNPUkVfRVhQT1JU IHZvaWQgc2V0U2Nyb2xsaW5nTm9kZUdlb21ldHJ5KFNjcm9sbGluZ05vZGVJRCwgY29uc3QgU2Ny b2xsaW5nR2VvbWV0cnkmKSBvdmVycmlkZTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFZp ZXdwb3J0Q29uc3RyYWludGVkTm9kZUdlb21ldHJ5KFNjcm9sbGluZ05vZGVJRCwgY29uc3QgVmll d3BvcnRDb25zdHJhaW50cyYpIG92ZXJyaWRlOworCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBy ZWNvbmNpbGVTY3JvbGxpbmdTdGF0ZShGcmFtZVZpZXcmLCBjb25zdCBGbG9hdFBvaW50JiwgY29u c3QgTGF5b3V0Vmlld3BvcnRPcmlnaW5Pck92ZXJyaWRlUmVjdCYsIGJvb2wgcHJvZ3JhbW1hdGlj U2Nyb2xsLCBWaWV3cG9ydFJlY3RTdGFiaWxpdHksIFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rp b24pIG92ZXJyaWRlOwogCiAgICAgYm9vbCBpc1J1YmJlckJhbmRJblByb2dyZXNzKCkgY29uc3Qg b3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdDb29yZGluYXRvci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nQ29vcmRpbmF0b3IuaAppbmRleCA2MTRiNjcwNTU3NDhhMWQwYzU4YWE0MTA1YWE4OTk2MGQ2 OTAxZTU2Li42M2VlNmVhZmJlMDcwZDhlNzA3ZjExZWU2OGEwODM2ZDk3NTA2ZTJlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9y LmgKQEAgLTE2OCw4ICsxNjgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRldGFjaEZy b21TdGF0ZVRyZWUoU2Nyb2xsaW5nTm9kZUlEKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJT dGF0ZVRyZWUoKSB7IH0KIAotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVOb2RlTGF5ZXIoU2Nyb2xs aW5nTm9kZUlELCBHcmFwaGljc0xheWVyKikgeyB9Ci0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZU5v ZGVWaWV3cG9ydENvbnN0cmFpbnRzKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgVmlld3BvcnRDb25z dHJhaW50cyYpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBzZXROb2RlTGF5ZXJzKFNjcm9sbGluZ05v ZGVJRCwgR3JhcGhpY3NMYXllciogLypsYXllciovLCBHcmFwaGljc0xheWVyKiAvKnNjcm9sbGVk Q29udGVudHNMYXllciovID0gbnVsbHB0ciwgR3JhcGhpY3NMYXllciogLypjb3VudGVyU2Nyb2xs aW5nTGF5ZXIqLyA9IG51bGxwdHIsIEdyYXBoaWNzTGF5ZXIqIC8qaW5zZXRDbGlwTGF5ZXIqLyA9 IG51bGxwdHIpIHsgfQogCiAgICAgc3RydWN0IFNjcm9sbGluZ0dlb21ldHJ5IHsKICAgICAgICAg TGF5b3V0UmVjdCBwYXJlbnRSZWxhdGl2ZVNjcm9sbGFibGVSZWN0OwpAQCAtMTg4LDggKzE4Nyw5 IEBAIHB1YmxpYzoKICNlbmRpZgogICAgIH07CiAKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRnJh bWVTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NMYXllciogLypzY3JvbGxM YXllciovLCBHcmFwaGljc0xheWVyKiAvKnNjcm9sbGVkQ29udGVudHNMYXllciovLCBHcmFwaGlj c0xheWVyKiAvKmNvdW50ZXJTY3JvbGxpbmdMYXllciovLCBHcmFwaGljc0xheWVyKiAvKmluc2V0 Q2xpcExheWVyKi8sIGNvbnN0IFNjcm9sbGluZ0dlb21ldHJ5JikgeyB9Ci0gICAgdmlydHVhbCB2 b2lkIHVwZGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdOb2RlSUQsIEdyYXBoaWNz TGF5ZXIqIC8qc2Nyb2xsTGF5ZXIqLywgR3JhcGhpY3NMYXllciogLypzY3JvbGxlZENvbnRlbnRz TGF5ZXIqLywgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQg c2V0U2Nyb2xsaW5nTm9kZUdlb21ldHJ5KFNjcm9sbGluZ05vZGVJRCwgY29uc3QgU2Nyb2xsaW5n R2VvbWV0cnkmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld3BvcnRDb25zdHJhaW50ZWRO b2RlR2VvbWV0cnkoU2Nyb2xsaW5nTm9kZUlELCBjb25zdCBWaWV3cG9ydENvbnN0cmFpbnRzJikg eyB9CisKICAgICB2aXJ0dWFsIHZvaWQgcmVjb25jaWxlVmlld3BvcnRDb25zdHJhaW5lZExheWVy UG9zaXRpb25zKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgTGF5b3V0UmVjdCYsIFNjcm9sbGluZ0xh eWVyUG9zaXRpb25BY3Rpb24pIHsgfQogICAgIHZpcnR1YWwgU3RyaW5nIHNjcm9sbGluZ1N0YXRl VHJlZUFzVGV4dChTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvciA9IFNjcm9sbGluZ1N0 YXRlVHJlZUFzVGV4dEJlaGF2aW9yTm9ybWFsKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgaXNS dWJiZXJCYW5kSW5Qcm9ncmVzcygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDI5 Zjc1ZmNhMmE5MDI4N2ZjM2Y0MTc2MjI0MzQyYWIzMTBmYzAwNGIuLjU0OGFmNmY4NzQxZWZiNWU2 ODQyYzFlM2I4NTUzNDE2MTNmNWVmN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0zODQ2LDI0ICszODQ2LDMwIEBAIHZv aWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyKFJl bmRlckxheWVyJiBsYXllciwgT3B0CiAgICAgYmFja2luZy0+ZGV0YWNoRnJvbVNjcm9sbGluZ0Nv b3JkaW5hdG9yKHJvbGVzKTsKIH0KIAotdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0 ZVNjcm9sbENvb3JkaW5hdGlvbkZvclRoaXNGcmFtZShTY3JvbGxpbmdOb2RlSUQgcGFyZW50Tm9k ZUlEKQordm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9sbENvb3JkaW5hdGlv bkZvclRoaXNGcmFtZShTY3JvbGxpbmdOb2RlSUQgcGFyZW50Tm9kZUlELCBPcHRpb25TZXQ8U2Ny b2xsaW5nTm9kZUNoYW5nZUZsYWdzPiBjaGFuZ2VzKQogewogICAgIGF1dG8qIHNjcm9sbGluZ0Nv b3JkaW5hdG9yID0gdGhpcy0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKTsKICAgICBGcmFtZVZpZXcm IGZyYW1lVmlldyA9IG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKTsKICAgICBBU1NFUlQoc2Nyb2xs aW5nQ29vcmRpbmF0b3ItPmNvb3JkaW5hdGVzU2Nyb2xsaW5nRm9yRnJhbWVWaWV3KGZyYW1lVmll dykpOwogCiAgICAgU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCA9IGF0dGFjaFNjcm9sbGluZ05vZGUo Km1fcmVuZGVyVmlldy5sYXllcigpLCBtX3JlbmRlclZpZXcuZnJhbWUoKS5pc01haW5GcmFtZSgp ID8gU2Nyb2xsaW5nTm9kZVR5cGU6Ok1haW5GcmFtZSA6IFNjcm9sbGluZ05vZGVUeXBlOjpTdWJm cmFtZSwgcGFyZW50Tm9kZUlEKTsKLSAgICBTY3JvbGxpbmdDb29yZGluYXRvcjo6U2Nyb2xsaW5n R2VvbWV0cnkgc2Nyb2xsaW5nR2VvbWV0cnk7Ci0gICAgLy8gRklYTUUoaHR0cHM6Ly93ZWJraXQu b3JnL2IvMTcyOTE3KTogUGFzcyBwYXJlbnRSZWxhdGl2ZVNjcm9sbGFibGVSZWN0PwotICAgIHNj cm9sbGluZ0dlb21ldHJ5LnNjcm9sbE9yaWdpbiA9IGZyYW1lVmlldy5zY3JvbGxPcmlnaW4oKTsK LSAgICBzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxhYmxlQXJlYVNpemUgPSBmcmFtZVZpZXcudmlz aWJsZUNvbnRlbnRSZWN0KCkuc2l6ZSgpOwotICAgIHNjcm9sbGluZ0dlb21ldHJ5LmNvbnRlbnRT aXplID0gZnJhbWVWaWV3LnRvdGFsQ29udGVudHNTaXplKCk7Ci0gICAgc2Nyb2xsaW5nR2VvbWV0 cnkucmVhY2hhYmxlQ29udGVudFNpemUgPSBmcmFtZVZpZXcudG90YWxDb250ZW50c1NpemUoKTsK KworICAgIGlmIChjaGFuZ2VzICYgU2Nyb2xsaW5nTm9kZUNoYW5nZUZsYWdzOjpMYXllcikKKyAg ICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNldE5vZGVMYXllcnMobm9kZUlELCBtX3Njcm9s bExheWVyLmdldCgpLCBtX3Jvb3RDb250ZW50TGF5ZXIuZ2V0KCksIGZpeGVkUm9vdEJhY2tncm91 bmRMYXllcigpLCBjbGlwTGF5ZXIoKSk7CisKKyAgICBpZiAoY2hhbmdlcyAmIFNjcm9sbGluZ05v ZGVDaGFuZ2VGbGFnczo6TGF5ZXJHZW9tZXRyeSkgeworICAgICAgICBTY3JvbGxpbmdDb29yZGlu YXRvcjo6U2Nyb2xsaW5nR2VvbWV0cnkgc2Nyb2xsaW5nR2VvbWV0cnk7CisgICAgICAgIC8vIEZJ WE1FKGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE3MjkxNyk6IFBhc3MgcGFyZW50UmVsYXRpdmVTY3Jv bGxhYmxlUmVjdD8KKyAgICAgICAgc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsT3JpZ2luID0gZnJh bWVWaWV3LnNjcm9sbE9yaWdpbigpOworICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxh YmxlQXJlYVNpemUgPSBmcmFtZVZpZXcudmlzaWJsZUNvbnRlbnRSZWN0KCkuc2l6ZSgpOworICAg ICAgICBzY3JvbGxpbmdHZW9tZXRyeS5jb250ZW50U2l6ZSA9IGZyYW1lVmlldy50b3RhbENvbnRl bnRzU2l6ZSgpOworICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS5yZWFjaGFibGVDb250ZW50U2l6 ZSA9IGZyYW1lVmlldy50b3RhbENvbnRlbnRzU2l6ZSgpOwogI2lmIEVOQUJMRShDU1NfU0NST0xM X1NOQVApCi0gICAgZnJhbWVWaWV3LnVwZGF0ZVNuYXBPZmZzZXRzKCk7Ci0gICAgc2Nyb2xsaW5n Q29vcmRpbmF0b3ItPnVwZGF0ZVNjcm9sbFNuYXBQcm9wZXJ0aWVzV2l0aEZyYW1lVmlldyhmcmFt ZVZpZXcpOworICAgICAgICBmcmFtZVZpZXcudXBkYXRlU25hcE9mZnNldHMoKTsKKyAgICAgICAg c2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnVwZGF0ZVNjcm9sbFNuYXBQcm9wZXJ0aWVzV2l0aEZyYW1l VmlldyhmcmFtZVZpZXcpOwogI2VuZGlmCi0gICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnVwZGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZShub2RlSUQsIG1fc2Nyb2xsTGF5ZXIuZ2V0KCksIG1fcm9vdENv bnRlbnRMYXllci5nZXQoKSwgZml4ZWRSb290QmFja2dyb3VuZExheWVyKCksIGNsaXBMYXllcigp LCBzY3JvbGxpbmdHZW9tZXRyeSk7CisgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5zZXRT Y3JvbGxpbmdOb2RlR2VvbWV0cnkobm9kZUlELCBzY3JvbGxpbmdHZW9tZXRyeSk7CisgICAgfQog fQogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29vcmRpbmF0ZWRM YXllcihSZW5kZXJMYXllciYgbGF5ZXIsIE9wdGlvblNldDxTY3JvbGxDb29yZGluYXRpb25Sb2xl PiByb2xlcywgT3B0aW9uU2V0PFNjcm9sbGluZ05vZGVDaGFuZ2VGbGFncz4gY2hhbmdlcykKQEAg LTM4ODIsNyArMzg4OCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3Jv bGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwgT3B0CiAgICAgICAgIGlmICgh cGFyZW50RG9jdW1lbnRIb3N0aW5nTm9kZUlEKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAg ICAgIHVwZGF0ZVNjcm9sbENvb3JkaW5hdGlvbkZvclRoaXNGcmFtZShwYXJlbnREb2N1bWVudEhv c3RpbmdOb2RlSUQpOworICAgICAgICB1cGRhdGVTY3JvbGxDb29yZGluYXRpb25Gb3JUaGlzRnJh bWUocGFyZW50RG9jdW1lbnRIb3N0aW5nTm9kZUlELCBjaGFuZ2VzKTsKICAgICAgICAgaWYgKCEo cm9sZXMuY29udGFpbnMoU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZTo6Vmlld3BvcnRDb25zdHJhaW5l ZCkpICYmIGlzUmVuZGVyVmlld0xheWVyKQogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAg LTM5MTEsMTUgKzM5MTcsMTUgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVNj cm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVyTGF5ZXImIGxheWVyLCBPcHQKICAgICAgICAgTE9H X1dJVEhfU1RSRUFNKENvbXBvc2l0aW5nLCBzdHJlYW0gPDwgIlJlZ2lzdGVyaW5nIFZpZXdwb3J0 Q29uc3RyYWluZWQgIiA8PCBub2RlVHlwZSA8PCAiIG5vZGUgIiA8PCBub2RlSUQgPDwgIiAobGF5 ZXIgIiA8PCBiYWNraW5nLT5ncmFwaGljc0xheWVyKCktPnByaW1hcnlMYXllcklEKCkgPDwgIikg YXMgY2hpbGQgb2YgIiA8PCBwYXJlbnROb2RlSUQpOwogCiAgICAgICAgIGlmIChjaGFuZ2VzICYg U2Nyb2xsaW5nTm9kZUNoYW5nZUZsYWdzOjpMYXllcikKLSAgICAgICAgICAgIHNjcm9sbGluZ0Nv b3JkaW5hdG9yLT51cGRhdGVOb2RlTGF5ZXIobm9kZUlELCBiYWNraW5nLT5ncmFwaGljc0xheWVy KCkpOworICAgICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNldE5vZGVMYXllcnMobm9k ZUlELCBiYWNraW5nLT5ncmFwaGljc0xheWVyKCkpOwogCiAgICAgICAgIGlmIChjaGFuZ2VzICYg U2Nyb2xsaW5nTm9kZUNoYW5nZUZsYWdzOjpMYXllckdlb21ldHJ5KSB7CiAgICAgICAgICAgICBz d2l0Y2ggKG5vZGVUeXBlKSB7CiAgICAgICAgICAgICBjYXNlIFNjcm9sbGluZ05vZGVUeXBlOjpG aXhlZDoKLSAgICAgICAgICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+dXBkYXRlTm9kZVZp ZXdwb3J0Q29uc3RyYWludHMobm9kZUlELCBjb21wdXRlRml4ZWRWaWV3cG9ydENvbnN0cmFpbnRz KGxheWVyKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNldFZpZXdw b3J0Q29uc3RyYWludGVkTm9kZUdlb21ldHJ5KG5vZGVJRCwgY29tcHV0ZUZpeGVkVmlld3BvcnRD b25zdHJhaW50cyhsYXllcikpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg Y2FzZSBTY3JvbGxpbmdOb2RlVHlwZTo6U3RpY2t5OgotICAgICAgICAgICAgICAgIHNjcm9sbGlu Z0Nvb3JkaW5hdG9yLT51cGRhdGVOb2RlVmlld3BvcnRDb25zdHJhaW50cyhub2RlSUQsIGNvbXB1 dGVTdGlja3lWaWV3cG9ydENvbnN0cmFpbnRzKGxheWVyKSk7CisgICAgICAgICAgICAgICAgc2Ny b2xsaW5nQ29vcmRpbmF0b3ItPnNldFZpZXdwb3J0Q29uc3RyYWludGVkTm9kZUdlb21ldHJ5KG5v ZGVJRCwgY29tcHV0ZVN0aWNreVZpZXdwb3J0Q29uc3RyYWludHMobGF5ZXIpKTsKICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgU2Nyb2xsaW5nTm9kZVR5cGU6Ok1haW5G cmFtZToKICAgICAgICAgICAgIGNhc2UgU2Nyb2xsaW5nTm9kZVR5cGU6OlN1YmZyYW1lOgpAQCAt MzkzNCwzNiArMzk0MCw0MSBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Ny b2xsQ29vcmRpbmF0ZWRMYXllcihSZW5kZXJMYXllciYgbGF5ZXIsIE9wdAogICAgICAgICAKICAg ICBpZiAocm9sZXMuY29udGFpbnMoU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZTo6U2Nyb2xsaW5nKSkg ewogICAgICAgICBpZiAoaXNSZW5kZXJWaWV3TGF5ZXIpCi0gICAgICAgICAgICB1cGRhdGVTY3Jv bGxDb29yZGluYXRpb25Gb3JUaGlzRnJhbWUocGFyZW50Tm9kZUlEKTsKKyAgICAgICAgICAgIHVw ZGF0ZVNjcm9sbENvb3JkaW5hdGlvbkZvclRoaXNGcmFtZShwYXJlbnROb2RlSUQsIGNoYW5nZXMp OwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIFNjcm9sbGluZ05vZGVUeXBlIG5vZGVUeXBl ID0gU2Nyb2xsaW5nTm9kZVR5cGU6Ok92ZXJmbG93OwogICAgICAgICAgICAgU2Nyb2xsaW5nTm9k ZUlEIG5vZGVJRCA9IGF0dGFjaFNjcm9sbGluZ05vZGUobGF5ZXIsIG5vZGVUeXBlLCBwYXJlbnRO b2RlSUQpOwogICAgICAgICAgICAgaWYgKCFub2RlSUQpCiAgICAgICAgICAgICAgICAgcmV0dXJu OwogCi0gICAgICAgICAgICBTY3JvbGxpbmdDb29yZGluYXRvcjo6U2Nyb2xsaW5nR2VvbWV0cnkg c2Nyb2xsaW5nR2VvbWV0cnk7Ci0gICAgICAgICAgICAvLyBGSVhNRShodHRwczovL3dlYmtpdC5v cmcvYi8xNzI5MTcpOiBQYXNzIHBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Q/Ci0gICAgICAg ICAgICBzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxPcmlnaW4gPSBsYXllci5zY3JvbGxPcmlnaW4o KTsKLSAgICAgICAgICAgIHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbFBvc2l0aW9uID0gbGF5ZXIu c2Nyb2xsUG9zaXRpb24oKTsKLSAgICAgICAgICAgIHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbGFi bGVBcmVhU2l6ZSA9IGxheWVyLnZpc2libGVTaXplKCk7Ci0gICAgICAgICAgICBzY3JvbGxpbmdH ZW9tZXRyeS5jb250ZW50U2l6ZSA9IGxheWVyLmNvbnRlbnRzU2l6ZSgpOwotICAgICAgICAgICAg c2Nyb2xsaW5nR2VvbWV0cnkucmVhY2hhYmxlQ29udGVudFNpemUgPSBsYXllci5zY3JvbGxhYmxl Q29udGVudHNTaXplKCk7CisgICAgICAgICAgICBpZiAoY2hhbmdlcyAmIFNjcm9sbGluZ05vZGVD aGFuZ2VGbGFnczo6TGF5ZXIpCisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3It PnNldE5vZGVMYXllcnMobm9kZUlELCBiYWNraW5nLT5zY3JvbGxpbmdMYXllcigpLCBiYWNraW5n LT5zY3JvbGxpbmdDb250ZW50c0xheWVyKCkpOworCisgICAgICAgICAgICBpZiAoY2hhbmdlcyAm IFNjcm9sbGluZ05vZGVDaGFuZ2VGbGFnczo6TGF5ZXJHZW9tZXRyeSkgeworICAgICAgICAgICAg ICAgIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpTY3JvbGxpbmdHZW9tZXRyeSBzY3JvbGxpbmdHZW9t ZXRyeTsKKyAgICAgICAgICAgICAgICAvLyBGSVhNRShodHRwczovL3dlYmtpdC5vcmcvYi8xNzI5 MTcpOiBQYXNzIHBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Q/CisgICAgICAgICAgICAgICAg c2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsT3JpZ2luID0gbGF5ZXIuc2Nyb2xsT3JpZ2luKCk7Cisg ICAgICAgICAgICAgICAgc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsUG9zaXRpb24gPSBsYXllci5z Y3JvbGxQb3NpdGlvbigpOworICAgICAgICAgICAgICAgIHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9s bGFibGVBcmVhU2l6ZSA9IGxheWVyLnZpc2libGVTaXplKCk7CisgICAgICAgICAgICAgICAgc2Ny b2xsaW5nR2VvbWV0cnkuY29udGVudFNpemUgPSBsYXllci5jb250ZW50c1NpemUoKTsKKyAgICAg ICAgICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS5yZWFjaGFibGVDb250ZW50U2l6ZSA9IGxheWVy LnNjcm9sbGFibGVDb250ZW50c1NpemUoKTsKICNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQKQot ICAgICAgICAgICAgaWYgKGNvbnN0IFZlY3RvcjxMYXlvdXRVbml0Piogb2Zmc2V0cyA9IGxheWVy Lmhvcml6b250YWxTbmFwT2Zmc2V0cygpKQotICAgICAgICAgICAgICAgIHNjcm9sbGluZ0dlb21l dHJ5Lmhvcml6b250YWxTbmFwT2Zmc2V0cyA9ICpvZmZzZXRzOwotICAgICAgICAgICAgaWYgKGNv bnN0IFZlY3RvcjxMYXlvdXRVbml0Piogb2Zmc2V0cyA9IGxheWVyLnZlcnRpY2FsU25hcE9mZnNl dHMoKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS52ZXJ0aWNhbFNuYXBPZmZz ZXRzID0gKm9mZnNldHM7Ci0gICAgICAgICAgICBpZiAoY29uc3QgVmVjdG9yPFNjcm9sbE9mZnNl dFJhbmdlPExheW91dFVuaXQ+PiogcmFuZ2VzID0gbGF5ZXIuaG9yaXpvbnRhbFNuYXBPZmZzZXRS YW5nZXMoKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS5ob3Jpem9udGFsU25h cE9mZnNldFJhbmdlcyA9ICpyYW5nZXM7Ci0gICAgICAgICAgICBpZiAoY29uc3QgVmVjdG9yPFNj cm9sbE9mZnNldFJhbmdlPExheW91dFVuaXQ+PiogcmFuZ2VzID0gbGF5ZXIudmVydGljYWxTbmFw T2Zmc2V0UmFuZ2VzKCkpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nR2VvbWV0cnkudmVydGlj YWxTbmFwT2Zmc2V0UmFuZ2VzID0gKnJhbmdlczsKLSAgICAgICAgICAgIHNjcm9sbGluZ0dlb21l dHJ5LmN1cnJlbnRIb3Jpem9udGFsU25hcFBvaW50SW5kZXggPSBsYXllci5jdXJyZW50SG9yaXpv bnRhbFNuYXBQb2ludEluZGV4KCk7Ci0gICAgICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS5jdXJy ZW50VmVydGljYWxTbmFwUG9pbnRJbmRleCA9IGxheWVyLmN1cnJlbnRWZXJ0aWNhbFNuYXBQb2lu dEluZGV4KCk7CisgICAgICAgICAgICAgICAgaWYgKGNvbnN0IFZlY3RvcjxMYXlvdXRVbml0Piog b2Zmc2V0cyA9IGxheWVyLmhvcml6b250YWxTbmFwT2Zmc2V0cygpKQorICAgICAgICAgICAgICAg ICAgICBzY3JvbGxpbmdHZW9tZXRyeS5ob3Jpem9udGFsU25hcE9mZnNldHMgPSAqb2Zmc2V0czsK KyAgICAgICAgICAgICAgICBpZiAoY29uc3QgVmVjdG9yPExheW91dFVuaXQ+KiBvZmZzZXRzID0g bGF5ZXIudmVydGljYWxTbmFwT2Zmc2V0cygpKQorICAgICAgICAgICAgICAgICAgICBzY3JvbGxp bmdHZW9tZXRyeS52ZXJ0aWNhbFNuYXBPZmZzZXRzID0gKm9mZnNldHM7CisgICAgICAgICAgICAg ICAgaWYgKGNvbnN0IFZlY3RvcjxTY3JvbGxPZmZzZXRSYW5nZTxMYXlvdXRVbml0Pj4qIHJhbmdl cyA9IGxheWVyLmhvcml6b250YWxTbmFwT2Zmc2V0UmFuZ2VzKCkpCisgICAgICAgICAgICAgICAg ICAgIHNjcm9sbGluZ0dlb21ldHJ5Lmhvcml6b250YWxTbmFwT2Zmc2V0UmFuZ2VzID0gKnJhbmdl czsKKyAgICAgICAgICAgICAgICBpZiAoY29uc3QgVmVjdG9yPFNjcm9sbE9mZnNldFJhbmdlPExh eW91dFVuaXQ+PiogcmFuZ2VzID0gbGF5ZXIudmVydGljYWxTbmFwT2Zmc2V0UmFuZ2VzKCkpCisg ICAgICAgICAgICAgICAgICAgIHNjcm9sbGluZ0dlb21ldHJ5LnZlcnRpY2FsU25hcE9mZnNldFJh bmdlcyA9ICpyYW5nZXM7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nR2VvbWV0cnkuY3VycmVu dEhvcml6b250YWxTbmFwUG9pbnRJbmRleCA9IGxheWVyLmN1cnJlbnRIb3Jpem9udGFsU25hcFBv aW50SW5kZXgoKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS5jdXJyZW50VmVy dGljYWxTbmFwUG9pbnRJbmRleCA9IGxheWVyLmN1cnJlbnRWZXJ0aWNhbFNuYXBQb2ludEluZGV4 KCk7CiAjZW5kaWYKIAotICAgICAgICAgICAgTE9HKENvbXBvc2l0aW5nLCAiUmVnaXN0ZXJpbmcg U2Nyb2xsaW5nIHNjcm9sbGluZyBub2RlICUiIFBSSXU2NCAiIChsYXllciAlIiBQUkl1NjQgIikg YXMgY2hpbGQgb2YgJSIgUFJJdTY0LCBub2RlSUQsIGJhY2tpbmctPmdyYXBoaWNzTGF5ZXIoKS0+ cHJpbWFyeUxheWVySUQoKSwgcGFyZW50Tm9kZUlEKTsKKyAgICAgICAgICAgICAgICBMT0coQ29t cG9zaXRpbmcsICJSZWdpc3RlcmluZyBTY3JvbGxpbmcgc2Nyb2xsaW5nIG5vZGUgJSIgUFJJdTY0 ICIgKGxheWVyICUiIFBSSXU2NCAiKSBhcyBjaGlsZCBvZiAlIiBQUkl1NjQsIG5vZGVJRCwgYmFj a2luZy0+Z3JhcGhpY3NMYXllcigpLT5wcmltYXJ5TGF5ZXJJRCgpLCBwYXJlbnROb2RlSUQpOwog Ci0gICAgICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+dXBkYXRlT3ZlcmZsb3dTY3JvbGxp bmdOb2RlKG5vZGVJRCwgYmFja2luZy0+c2Nyb2xsaW5nTGF5ZXIoKSwgYmFja2luZy0+c2Nyb2xs aW5nQ29udGVudHNMYXllcigpLCBzY3JvbGxpbmdHZW9tZXRyeSk7CisgICAgICAgICAgICAgICAg c2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNldFNjcm9sbGluZ05vZGVHZW9tZXRyeShub2RlSUQsIHNj cm9sbGluZ0dlb21ldHJ5KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0gZWxzZQog ICAgICAgICBkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyKGxheWVyLCBTY3JvbGxDb29yZGlu YXRpb25Sb2xlOjpTY3JvbGxpbmcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4IDljOTA3NGRkMmU2ZWEwODVlY2UzNTA4OTg0Njlm ZjVjMmY0YTBhY2IuLjliMTlmN2VkZTQ5ZWI0NzMyMDQ5YzRkNWJiZDZiYWZkYjI0NDUwOWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3Iu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgK QEAgLTQ3Miw3ICs0NzIsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCB1cGRhdGVDdXN0b21MYXll cnNBZnRlckZsdXNoKCk7CiAKLSAgICB2b2lkIHVwZGF0ZVNjcm9sbENvb3JkaW5hdGlvbkZvclRo aXNGcmFtZShTY3JvbGxpbmdOb2RlSUQpOworICAgIHZvaWQgdXBkYXRlU2Nyb2xsQ29vcmRpbmF0 aW9uRm9yVGhpc0ZyYW1lKFNjcm9sbGluZ05vZGVJRCwgT3B0aW9uU2V0PFNjcm9sbGluZ05vZGVD aGFuZ2VGbGFncz4pOwogICAgIFNjcm9sbGluZ05vZGVJRCBhdHRhY2hTY3JvbGxpbmdOb2RlKFJl bmRlckxheWVyJiwgU2Nyb2xsaW5nTm9kZVR5cGUsIFNjcm9sbGluZ05vZGVJRCBwYXJlbnROb2Rl SUQpOwogICAgIHZvaWQgdXBkYXRlU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihSZW5kZXJMYXllciYs IE9wdGlvblNldDxTY3JvbGxDb29yZGluYXRpb25Sb2xlPiwgT3B0aW9uU2V0PFNjcm9sbGluZ05v ZGVDaGFuZ2VGbGFncz4pOwogICAgIHZvaWQgZGV0YWNoU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihS ZW5kZXJMYXllciYsIE9wdGlvblNldDxTY3JvbGxDb29yZGluYXRpb25Sb2xlPik7Cg==