130809 2014-03-26 18:31:12 -0700 Hook up -webkit-overflow-scrolling:touch for iOS WK2 2014-03-26 23:51:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca bdakin cmarcelo commit-queue esprehn+autocc glenn jamesr kondapallykalyan luiz sam simon.fraser thorton tonikitoo oldest_to_newest 994774 0 simon.fraser 2014-03-26 18:31:12 -0700 Hook up -webkit-overflow-scrolling:touch for iOS WK2 994775 1 227905 simon.fraser 2014-03-26 18:34:53 -0700 Created attachment 227905 Patch 994779 2 227905 thorton 2014-03-26 18:41:21 -0700 Comment on attachment 227905 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227905&action=review > Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:61 > + UIScrollView *scrollView = (UIScrollView *)[scrollLayer() delegate]; tiny eww > Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm:94 > + layerOrView = adoptNS([[UIScrollView alloc] initWithFrame:CGRectZero]); I vaguely remember being chastised for using initWithFrame:CGRectZero instead of init in the recent past, but I don't mind either way. 994791 3 simon.fraser 2014-03-26 19:17:00 -0700 https://trac.webkit.org/r166333 994840 4 ap 2014-03-26 23:30:10 -0700 This broke a number of tests on Mac: platform/mac-wk2/tiled-drawing/clamp-out-of-bounds-scrolls.html [ Failure ] platform/mac-wk2/tiled-drawing/fixed/absolute-inside-fixed.html [ Failure ] platform/mac-wk2/tiled-drawing/fixed/absolute-inside-out-of-view-fixed.html [ Failure ] platform/mac-wk2/tiled-drawing/fixed/fixed-in-overflow.html [ Failure ] platform/mac-wk2/tiled-drawing/fixed/four-bars-with-header-and-footer.html [ Failure ] platform/mac-wk2/tiled-drawing/fixed/four-bars.html [ Failure ] platform/mac-wk2/tiled-drawing/fixed/nested-fixed.html [ Failure ] platform/mac-wk2/tiled-drawing/fixed/percentage-inside-fixed.html [ Failure ] platform/mac-wk2/tiled-drawing/sticky/sticky-horizontal.html [ Failure ] 994843 5 simon.fraser 2014-03-26 23:38:48 -0700 Looking 994847 6 simon.fraser 2014-03-26 23:51:46 -0700 (In reply to comment #4) > This broke a number of tests on Mac: Fixed in http://trac.webkit.org/changeset/166348 227905 2014-03-26 18:34:53 -0700 2014-03-26 18:41:36 -0700 Patch bug-130809-20140326183437.patch text/plain 18655 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFlN2M1ZDVjYTBiMTdk ODAyZmE1YTUyYWUxMWRhMTNmNTMwZmJkYi4uYjkyMTU3YjZhZmIwZTNmMjE3NTA1ZDI1YWNjNmE2 YjNkYjQ3NzhmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE0LTAzLTI2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEhvb2sgdXAgLXdl YmtpdC1vdmVyZmxvdy1zY3JvbGxpbmc6dG91Y2ggZm9yIGlPUyBXSzIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDgwOQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdldCAtd2Via2l0LW92ZXJmbG93LXNj cm9sbGluZzogdG91Y2ggd29ya2luZyBmb3IgaU9TIFdLMi4KKyAgICAgICAgCisgICAgICAgICog V2ViQ29yZS5leHAuaW46CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3JkaW5h dG9yOjp1cGRhdGVTY3JvbGxpbmdOb2RlKToKKyAgICAgICAgU2VuZCBpbiBTY3JvbGxpbmdHZW9t ZXRyeSB3aGVuIHdlIHVwZGF0ZSBzY3JvbGxpbmcgbm9kZXMuCisgICAgICAgICogcGFnZS9zY3Jv bGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdD b29yZGluYXRvcjo6dXBkYXRlU2Nyb2xsaW5nTm9kZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxp bmcvaW9zL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlSU9TLmg6CisgICAgICAgIE5lZWQgdG8g Z2V0IHRvIHRoZSBzY3JvbGxpbmcgbGF5ZXIgaW4gYSBzdWJjbGFzcy4KKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlSU9TOjpzY3JvbGxMYXllcik6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyOjpoYXNBY2NlbGVyYXRlZFRvdWNoU2Nyb2xsaW5nKTogUmVtb3ZlIGNvZGUKKyAgICAgICAg dGhhdCB0ZW1wb3JhcmlseSBkaXNhYmxlZCB0b3VjaC1zY3JvbGxpbmcuCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9sbENvb3JkaW5hdGVkTGF5ZXIpOiBXaGVuIHdl CisgICAgICAgIHVwZGF0ZSBzY3JvbGxpbmcgbm9kZXMsIHNlbmQgaW4gdGhlIHJpZ2h0IHNjcm9s bGluZyBnZW9tZXRyeS4KKwogMjAxNC0wMy0yNiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBh cHBsZS5jb20+CiAKICAgICAgICAgTW9kZXJuaXplIHRoZSBsb29wcyBpbiBJbnNwZWN0b3JQYWdl QWdlbnQuY3BwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDk5MGRjOWRiMWE5YmY4ODNhMGI4ZGNmYjE1YjcyYTIx YzBhMzEwMTQuLmRiNmI2YTE3YjJkNjg0OWMwMjMwN2ExM2Y0MDVkNWE1NmE5YjMwMjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxNC0wMy0yNiAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBIb29rIHVwIC13ZWJraXQtb3ZlcmZsb3ctc2Ny b2xsaW5nOnRvdWNoIGZvciBpT1MgV0syCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzA4MDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVP dmVyZmxvd1Njcm9sbGluZ05vZGVJT1MuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvU2Nyb2xsaW5n L2lvcy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TLm1tOgorICAgICAgICAo V2ViS2l0OjpTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TOjp1cGRhdGVBZnRl ckNoaWxkcmVuKToKKyAgICAgICAgU2V0IHRoZSBjb250ZW50IHNpemUgb2YgdGhlIFVJU2Nyb2xs VklldyBiYXNlZCBvbiB0aGUgZ2VvbWV0cnkuCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9SZW1v dGVMYXllclRyZWVIb3N0SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVI b3N0OjpjcmVhdGVMYXllcik6IE1ha2UgYSBVSVNjcm9sbFZpZXcgaWYgdGhlCisgICAgICAgIGxh eWVyIHByb3BlcnRpZXMgdGVsbCB1cyB0aGF0IHdlIGhhdmUgdGhlIHNjcm9sbGluZyBiZWhhdmlv ci4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAgICAgICgt W1dLQ29udGVudFZpZXcgaW5pdFdpdGhGcmFtZTpjb250ZXh0OldlYktpdDo6Y29uZmlndXJhdGlv bjpXZWJLaXQ6OndlYlZpZXc6XSk6CisgICAgICAgIFdlIG5lZWQgdG8gYWxsb3cgdXNlciBpbnRl cmFjdGlvbiBpbiB0aGUgX3Jvb3RDb250ZW50VmlldyBzbyB0aGF0IGV2ZW50cyBnZXQgdG8KKyAg ICAgICAgbmVzdGVkIFVJU2Nyb2xsVmlld3MgKHRoaXMgY291bGQgYmUgb3B0aW1pemVkIGluIGZ1 dHVyZSkuCisgICAgICAgICogVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lmg6Cisg ICAgICAgICogVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1tOgorICAgICAgICAo V2ViS2l0OjpSZW1vdGVMYXllclRyZWVIb3N0Ojp1cGRhdGVMYXllclRyZWUpOgorICAgICAgICAo V2ViS2l0OjpSZW1vdGVMYXllclRyZWVIb3N0OjpjcmVhdGVMYXllcik6IE5lZWQgdG8gcGFzcyBS ZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzCisgICAgICAgIGluIHNv IHdlIGNhbiBnZXQgYXQgdGhlIGN1c3RvbSBiZWhhdmlvci4KKwogMjAxNC0wMy0yNiAgQW5keSBF c3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBFeHBvc2UgRG93bmxv YWRDbGllbnQ6OmRpZEZhaWwoKSBhbmQgRG93bmxvYWRDbGllbnQ6OmRpZENhbmNlbCgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCmluZGV4IDYxOTE3ZWJiYzdhZDI4ZWQwNDQ1OWZmNTNjMTlhMGQzODhmZGJl YzcuLjYxYTgxMDViNGQwZGNhNTNiNDBhNzUxODhlMWVkMDMzZTU3ZDg1ZmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZXhwLmluCkBAIC0yNzU2LDcgKzI3NTYsNyBAQCBfX1pON1dlYkNvcmUyNUFzeW5jU2Nyb2xs aW5nQ29vcmRpbmF0b3IxNGNsZWFyU3RhdGVUcmVlRXYKIF9fWk43V2ViQ29yZTI1QXN5bmNTY3Jv bGxpbmdDb29yZGluYXRvcjE3YXR0YWNoVG9TdGF0ZVRyZWVFTlNfMTdTY3JvbGxpbmdOb2RlVHlw ZUV5eQogX19aTjdXZWJDb3JlMjVBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yMThzeW5jQ2hpbGRQ b3NpdGlvbnNFUktOU18xMExheW91dFJlY3RFCiBfX1pON1dlYkNvcmUyNUFzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IxOWRldGFjaEZyb21TdGF0ZVRyZWVFeQotX19aTjdXZWJDb3JlMjVBc3luY1Nj cm9sbGluZ0Nvb3JkaW5hdG9yMTl1cGRhdGVTY3JvbGxpbmdOb2RlRXlQTlNfMTNHcmFwaGljc0xh eWVyRVMyX1MyXworX19aTjdXZWJDb3JlMjVBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yMTl1cGRh dGVTY3JvbGxpbmdOb2RlRXlQTlNfMTNHcmFwaGljc0xheWVyRVMyX1MyX1JLTlNfMjBTY3JvbGxp bmdDb29yZGluYXRvcjE3U2Nyb2xsaW5nR2VvbWV0cnlFCiBfX1pON1dlYkNvcmUyNUFzeW5jU2Ny b2xsaW5nQ29vcmRpbmF0b3IyMmZyYW1lVmlld0xheW91dFVwZGF0ZWRFUE5TXzlGcmFtZVZpZXdF CiBfX1pON1dlYkNvcmUyNUFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IyN2ZyYW1lVmlld1Jvb3RM YXllckRpZENoYW5nZUVQTlNfOUZyYW1lVmlld0UKIF9fWk43V2ViQ29yZTI1QXN5bmNTY3JvbGxp bmdDb29yZGluYXRvcjI3cmVxdWVzdFNjcm9sbFBvc2l0aW9uVXBkYXRlRVBOU185RnJhbWVWaWV3 RVJLTlNfOEludFBvaW50RQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAppbmRleCBhYmMxNTIzN2U5OGRh Yjc2ZjA2YmNiM2MwMmExMTliMDZjMzAzODE4Li5lOWY3Mzc3NjAwNWIwYzM3YWE5ZWJlNjI2ZWI1 NWExOWNlNzIzODQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9B c3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcApAQCAtMjg3LDcgKzI4Nyw3IEBA IHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6ZW5zdXJlUm9vdFN0YXRlTm9kZUZvckZy YW1lVmlldyhGcmFtZVZpZXcqIGZyYW1lCiAgICAgYXR0YWNoVG9TdGF0ZVRyZWUoRnJhbWVTY3Jv bGxpbmdOb2RlLCBmcmFtZVZpZXctPnNjcm9sbExheWVySUQoKSwgMCk7CiB9CiAKLXZvaWQgQXN5 bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdOb2Rl SUQgbm9kZUlELCBHcmFwaGljc0xheWVyKiBsYXllciwgR3JhcGhpY3NMYXllciogc2Nyb2xsZWRD b250ZW50c0xheWVyLCBHcmFwaGljc0xheWVyKiBjb3VudGVyU2Nyb2xsaW5nTGF5ZXIpCit2b2lk IEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5n Tm9kZUlEIG5vZGVJRCwgR3JhcGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIHNjcm9s bGVkQ29udGVudHNMYXllciwgR3JhcGhpY3NMYXllciogY291bnRlclNjcm9sbGluZ0xheWVyLCBj b25zdCBTY3JvbGxpbmdHZW9tZXRyeSYgc2Nyb2xsaW5nR2VvbWV0cnkpCiB7CiAgICAgU2Nyb2xs aW5nU3RhdGVTY3JvbGxpbmdOb2RlKiBub2RlID0gdG9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05v ZGUobV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnN0YXRlTm9kZUZvcklEKG5vZGVJRCkpOwogICAgIEFT U0VSVChub2RlKTsKQEAgLTI5Nyw2ICsyOTcsMTAgQEAgdm9pZCBBc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yOjp1cGRhdGVTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIEdyYXAK ICAgICBub2RlLT5zZXRMYXllcihsYXllcik7CiAgICAgbm9kZS0+c2V0U2Nyb2xsZWRDb250ZW50 c0xheWVyKHNjcm9sbGVkQ29udGVudHNMYXllcik7CiAgICAgbm9kZS0+c2V0Q291bnRlclNjcm9s bGluZ0xheWVyKGNvdW50ZXJTY3JvbGxpbmdMYXllcik7CisKKyAgICBub2RlLT5zZXRTY3JvbGxP cmlnaW4oc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsT3JpZ2luKTsKKyAgICBub2RlLT5zZXRTY3Jv bGxQb3NpdGlvbihzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxQb3NpdGlvbik7CisgICAgbm9kZS0+ c2V0VG90YWxDb250ZW50c1NpemUoc2Nyb2xsaW5nR2VvbWV0cnkuY29udGVudFNpemUpOwogfQog CiB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZVZpZXdwb3J0Q29uc3RyYWlu ZWROb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIGNvbnN0IFZpZXdwb3J0Q29uc3RyYWludHMm IGNvbnN0cmFpbnRzLCBHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVyKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5o IGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRv ci5oCmluZGV4IDYyNWRlYmU1MGQ1NWU4YjE2ODRkYTE0OGUzMWI5YjA3YzM0MWFhZWMuLjJkMjQ3 NjdjOWZlYTJiN2Y2ZGUwZDlhYTc1NTUxMjUyNGNiYjMxMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgK QEAgLTg3LDcgKzg3LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJTdGF0ZVRy ZWUoKSBvdmVycmlkZTsKIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVWaWV3cG9ydENvbnN0cmFp bmVkTm9kZShTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IFZpZXdwb3J0Q29uc3RyYWludHMmLCBHcmFw aGljc0xheWVyKikgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZVNjcm9sbGluZ05v ZGUoU2Nyb2xsaW5nTm9kZUlELCBHcmFwaGljc0xheWVyKiwgR3JhcGhpY3NMYXllciogc2Nyb2xs ZWRDb250ZW50c0xheWVyLCBHcmFwaGljc0xheWVyKiBjb3VudGVyU2Nyb2xsaW5nTGF5ZXIpIG92 ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05v ZGVJRCwgR3JhcGhpY3NMYXllciosIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbGVkQ29udGVudHNMYXll ciwgR3JhcGhpY3NMYXllciogY291bnRlclNjcm9sbGluZ0xheWVyLCBjb25zdCBTY3JvbGxpbmdH ZW9tZXRyeSYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgU3RyaW5nIHNjcm9sbGluZ1N0YXRlVHJl ZUFzVGV4dCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBpc1J1YmJlckJhbmRJ blByb2dyZXNzKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbFBp bm5pbmdCZWhhdmlvcihTY3JvbGxQaW5uaW5nQmVoYXZpb3IpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKaW5k ZXggMjQ5NjU2ZDcxY2Y0MzY1NWVjMGFjZWJlNjEzYTY5M2ZmYTIyZTI1Ny4uMDg5OWE0NTc4MGYy ZTIwMDhiNTBkNjAwMjI0MDFjZTQ3YTA4ZGI1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCkBAIC0xNTIsNyArMTUyLDE0 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGV0YWNoRnJvbVN0YXRlVHJlZShTY3JvbGxp bmdOb2RlSUQpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBjbGVhclN0YXRlVHJlZSgpIHsgfQogICAg IHZpcnR1YWwgdm9pZCB1cGRhdGVWaWV3cG9ydENvbnN0cmFpbmVkTm9kZShTY3JvbGxpbmdOb2Rl SUQsIGNvbnN0IFZpZXdwb3J0Q29uc3RyYWludHMmLCBHcmFwaGljc0xheWVyKikgeyB9Ci0gICAg dmlydHVhbCB2b2lkIHVwZGF0ZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9kZUlELCBHcmFwaGlj c0xheWVyKiAvKnNjcm9sbExheWVyKi8sIEdyYXBoaWNzTGF5ZXIqIC8qc2Nyb2xsZWRDb250ZW50 c0xheWVyKi8sIEdyYXBoaWNzTGF5ZXIqIC8qY291bnRlclNjcm9sbGluZ0xheWVyKi8pIHsgfQor CisgICAgc3RydWN0IFNjcm9sbGluZ0dlb21ldHJ5IHsKKyAgICAgICAgSW50U2l6ZSBjb250ZW50 U2l6ZTsKKyAgICAgICAgRmxvYXRQb2ludCBzY3JvbGxQb3NpdGlvbjsKKyAgICAgICAgSW50UG9p bnQgc2Nyb2xsT3JpZ2luOworICAgIH07CisKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU2Nyb2xs aW5nTm9kZShTY3JvbGxpbmdOb2RlSUQsIEdyYXBoaWNzTGF5ZXIqIC8qc2Nyb2xsTGF5ZXIqLywg R3JhcGhpY3NMYXllciogLypzY3JvbGxlZENvbnRlbnRzTGF5ZXIqLywgR3JhcGhpY3NMYXllciog Lypjb3VudGVyU2Nyb2xsaW5nTGF5ZXIqLywgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkmKSB7IH0K ICAgICB2aXJ0dWFsIHZvaWQgc3luY0NoaWxkUG9zaXRpb25zKGNvbnN0IExheW91dFJlY3QmKSB7 IH0KICAgICB2aXJ0dWFsIFN0cmluZyBzY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHQoKSBjb25zdDsK ICAgICB2aXJ0dWFsIGJvb2wgaXNSdWJiZXJCYW5kSW5Qcm9ncmVzcygpIGNvbnN0IHsgcmV0dXJu IGZhbHNlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9pb3Mv U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVJT1MuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZUlPUy5oCmluZGV4IGFlODdkMGIy YTUyN2U2NjA3OTY2N2JlZjYyMWQzOWViMmQzZjc0N2UuLjA1MDVkYmFjZTk2YzQzMGUxYzJlY2Y4 MWI5ZmYzYmU5Nzk0MmRmNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZUlPUy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZUlPUy5oCkBA IC00MywxMiArNDMsMTQgQEAgcHVibGljOgogcHJvdGVjdGVkOgogICAgIFNjcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlSU9TKFNjcm9sbGluZ1RyZWUmLCBTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xs aW5nTm9kZUlEKTsKIAotcHJpdmF0ZToKICAgICAvLyBTY3JvbGxpbmdUcmVlTm9kZSBtZW1iZXIg ZnVuY3Rpb25zLgogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBT Y3JvbGxpbmdTdGF0ZU5vZGUmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQWZ0 ZXJDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZU5vZGUmKSBvdmVycmlkZTsKICAgICB2aXJ0 dWFsIHZvaWQgaGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmKSBvdmVy cmlkZSB7IH0KIAorICAgIENBTGF5ZXIgKnNjcm9sbExheWVyKCkgY29uc3QgeyByZXR1cm4gbV9z Y3JvbGxMYXllci5nZXQoKTsgfQorCitwcml2YXRlOgogICAgIEZsb2F0UG9pbnQgc2Nyb2xsUG9z aXRpb24oKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsUG9zaXRpb24oY29uc3Qg RmxvYXRQb2ludCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxQb3NpdGlv bldpdGhvdXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKGNvbnN0IEZsb2F0UG9pbnQmKSBvdmVycmlk ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDYwMGVjZGEw MTQwZjk5N2Q1YTIwMjkzMTNiNmI2YTJiMDY0OTcyZDMuLmM2NWQxM2NmYWQ1MGQxZjMyNDdkODE2 MzY4ODkxMmVjNjFlMzQ0MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcApAQCAtMjA4NywxNCArMjA4Nyw3IEBAIGJvb2wgUmVuZGVyTGF5ZXI6Omhhc0FjY2VsZXJh dGVkVG91Y2hTY3JvbGxpbmcoKSBjb25zdAogICAgIGlmICghc2Nyb2xsc092ZXJmbG93KCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIC8vIFRlbXBvcmFyeTogdHVybiBvZmYgYWNjZWxl cmF0ZWQgc2Nyb2xsaW5nIGluIFdLMi4KLSAgICBpZiAoUGFnZSogcGFnZSA9IHJlbmRlcmVyKCku ZnJhbWUoKS5wYWdlKCkpIHsKLSAgICAgICAgaWYgKHBhZ2UtPnNjcm9sbGluZ0Nvb3JkaW5hdG9y KCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotICAgIAogICAgIFNldHRpbmdz KiBzZXR0aW5ncyA9IHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5zZXR0aW5ncygpOwotCiAgICAgLy8g RklYTUU6IHNldHRpbmdzIHNob3VsZCBub3QgYmUgbnVsbCBhdCB0aGlzIHBvaW50LiBJZiB5b3Ug ZmluZCBhIHJlbGlhYmxlIHdheSB0byBoaXQgdGhpcyBhc3NlcnRpb24sIHBsZWFzZSBmaWxlIGEg YnVnLgogICAgIC8vIFNlZSA8cmRhcjovL3Byb2JsZW0vMTAyNjYxMDE+LgogICAgIEFTU0VSVChz ZXR0aW5ncyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuY3BwCmluZGV4IGNmNzcyOGJkMWRlMWIwNjdlZWI2MTM3ZTZkMjQ2NTBkOTYzYTQ2 ZWMuLjBhN2M5Y2IzNzZlZjdlMGQ3YjhjMmMzMDM1MjRlYjZkM2U0OWMwMTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0z NTIwLDEzICszNTIwLDIyIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3Jv bGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwgU2NyCiAgICAgICAgIEdyYXBo aWNzTGF5ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciA9IGJhY2tpbmctPnNjcm9sbGluZ0NvbnRl bnRzTGF5ZXIoKTsKICAgICAgICAgR3JhcGhpY3NMYXllciogY291bnRlclNjcm9sbGluZ0xheWVy ID0gbnVsbHB0cjsKIAorICAgICAgICBTY3JvbGxpbmdDb29yZGluYXRvcjo6U2Nyb2xsaW5nR2Vv bWV0cnkgc2Nyb2xsaW5nR2VvbWV0cnk7CiAgICAgICAgIGlmIChpc1Jvb3RMYXllcikgewogICAg ICAgICAgICAgc2Nyb2xsaW5nTGF5ZXIgPSBtX3Njcm9sbExheWVyLmdldCgpOwogICAgICAgICAg ICAgc2Nyb2xsZWRDb250ZW50c0xheWVyID0gbnVsbHB0cjsKICAgICAgICAgICAgIGNvdW50ZXJT Y3JvbGxpbmdMYXllciA9IGZpeGVkUm9vdEJhY2tncm91bmRMYXllcigpOworCisgICAgICAgICAg ICBzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxPcmlnaW4gPSBtX3JlbmRlclZpZXcuZnJhbWVWaWV3 KCkuc2Nyb2xsT3JpZ2luKCk7CisgICAgICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxQ b3NpdGlvbiA9IG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKS5zY3JvbGxQb3NpdGlvbigpOworICAg ICAgICAgICAgc2Nyb2xsaW5nR2VvbWV0cnkuY29udGVudFNpemUgPSBtX3JlbmRlclZpZXcuZnJh bWVWaWV3KCkudG90YWxDb250ZW50c1NpemUoKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgIHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbE9yaWdpbiA9IGxheWVyLnNjcm9sbE9yaWdpbigp OworICAgICAgICAgICAgc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsUG9zaXRpb24gPSBsYXllci5z Y3JvbGxQb3NpdGlvbigpOworICAgICAgICAgICAgc2Nyb2xsaW5nR2VvbWV0cnkuY29udGVudFNp emUgPSBsYXllci5jb250ZW50c1NpemUoKTsKICAgICAgICAgfQotICAgIAotICAgICAgICBzY3Jv bGxpbmdDb29yZGluYXRvci0+dXBkYXRlU2Nyb2xsaW5nTm9kZShub2RlSUQsIHNjcm9sbGluZ0xh eWVyLCBzY3JvbGxlZENvbnRlbnRzTGF5ZXIsIGNvdW50ZXJTY3JvbGxpbmdMYXllcik7CisKKyAg ICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnVwZGF0ZVNjcm9sbGluZ05vZGUobm9kZUlELCBz Y3JvbGxpbmdMYXllciwgc2Nyb2xsZWRDb250ZW50c0xheWVyLCBjb3VudGVyU2Nyb2xsaW5nTGF5 ZXIsIHNjcm9sbGluZ0dlb21ldHJ5KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9s bGluZ05vZGVJT1MuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvaW9zL1Nj cm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1MuaAppbmRleCA4NTMyZDMyNmIzMzA5 NzQzZWY2YmE3NzRlNzRhMGM1YzRkYjZmNmE4Li42MzBiOWI3NTJjMjQ4ZjgwYjRmMzY5MmRmMTFh NmY5NDM4MmMyMWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xs aW5nL2lvcy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TLmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93 U2Nyb2xsaW5nTm9kZUlPUy5oCkBAIC00MSw2ICs0MSw5IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToK ICAgICBTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TKFdlYkNvcmU6OlNjcm9s bGluZ1RyZWUmLCBXZWJDb3JlOjpTY3JvbGxpbmdOb2RlSUQpOworCisgICAgdmlydHVhbCB2b2lk IHVwZGF0ZUFmdGVyQ2hpbGRyZW4oY29uc3QgV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVOb2RlJikg b3ZlcnJpZGU7CisKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93 U2Nyb2xsaW5nTm9kZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcv aW9zL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1MubW0KaW5kZXggYmRkYzE1 NjBhOWUwNzg0NWVmNDdhZWEwZDA1ZGFmZGQ2ZWIzYmYwYy4uNWFiNzdkYzhmNjQ1OTg5YzcwNjg4 ZmExNjlhZGRlMTI4ZGJkMjdhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVl T3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TLm1tCkBAIC0yNSw2ICsyNSw5IEBACiAKICNpbXBvcnQg ImNvbmZpZy5oIgogI2ltcG9ydCAiU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlP Uy5oIgorI2ltcG9ydCA8V2ViQ29yZS9CbG9ja0V4Y2VwdGlvbnMuaD4KKyNpbXBvcnQgPFdlYkNv cmUvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmg+CisjaW1wb3J0IDxVSUtpdC9VSVNjcm9s bFZpZXcuaD4KIAogI2lmIFBMQVRGT1JNKElPUykKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5H KQpAQCAtNDcsNiArNTAsMjMgQEAgU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlP Uzo6flNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1MoKQogewogfQogCit2b2lk IFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1M6OnVwZGF0ZUFmdGVyQ2hpbGRy ZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJiBzdGF0ZU5vZGUpCit7CisgICAgU2Nyb2xsaW5n VHJlZVNjcm9sbGluZ05vZGVJT1M6OnVwZGF0ZUFmdGVyQ2hpbGRyZW4oc3RhdGVOb2RlKTsKKwor ICAgIGNvbnN0IGF1dG8mIHNjcm9sbGluZ1N0YXRlTm9kZSA9IHRvU2Nyb2xsaW5nU3RhdGVTY3Jv bGxpbmdOb2RlKHN0YXRlTm9kZSk7CisKKyAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0No YW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlRvdGFsQ29udGVudHNT aXplKSkgeworICAgICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMKKyAgICAgICAgVUlT Y3JvbGxWaWV3ICpzY3JvbGxWaWV3ID0gKFVJU2Nyb2xsVmlldyAqKVtzY3JvbGxMYXllcigpIGRl bGVnYXRlXTsKKyAgICAgICAgQVNTRVJUKFtzY3JvbGxWaWV3IGlzS2luZE9mQ2xhc3M6W1VJU2Ny b2xsVmlldyBzZWxmXV0pOworCisgICAgICAgIHNjcm9sbFZpZXcuY29udGVudFNpemUgPSBzY3Jv bGxpbmdTdGF0ZU5vZGUudG90YWxDb250ZW50c1NpemUoKTsKKworICAgICAgICBFTkRfQkxPQ0tf T0JKQ19FWENFUFRJT05TCisgICAgfQorfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNl bmRpZiAvLyBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9SZW1vdGVMYXllclRyZWVIb3N0SU9TLm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9SZW1vdGVMYXllclRyZWVIb3N0SU9TLm1tCmluZGV4IGJlZWQxYTMw ZjU3NWRjNTE1Nzc4N2IzNjM4ZmQyYTIzOTQ2MDVjMjYuLmMyNzUzMmY1ZDBmMGMzMDA3ZWE0NmE2 MzdhMWIzNmVhYTYxOGYyMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvUmVtb3RlTGF5ZXJUcmVlSG9zdElPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1JlbW90ZUxheWVyVHJlZUhvc3RJT1MubW0KQEAgLTc2LDcgKzc2LDcgQEAgQGVuZAog CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotTGF5ZXJPclZpZXcgKlJlbW90ZUxheWVyVHJlZUhvc3Q6 OmNyZWF0ZUxheWVyKGNvbnN0IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXllckNyZWF0 aW9uUHJvcGVydGllcyYgcHJvcGVydGllcykKK0xheWVyT3JWaWV3ICpSZW1vdGVMYXllclRyZWVI b3N0OjpjcmVhdGVMYXllcihjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJD cmVhdGlvblByb3BlcnRpZXMmIHByb3BlcnRpZXMsIGNvbnN0IFJlbW90ZUxheWVyVHJlZVRyYW5z YWN0aW9uOjpMYXllclByb3BlcnRpZXMqIGxheWVyUHJvcGVydGllcykKIHsKICAgICBSZXRhaW5Q dHI8TGF5ZXJPclZpZXc+JiBsYXllck9yVmlldyA9IG1fbGF5ZXJzLmFkZChwcm9wZXJ0aWVzLmxh eWVySUQsIG51bGxwdHIpLml0ZXJhdG9yLT52YWx1ZTsKIApAQCAtOTAsNyArOTAsMTAgQEAgTGF5 ZXJPclZpZXcgKlJlbW90ZUxheWVyVHJlZUhvc3Q6OmNyZWF0ZUxheWVyKGNvbnN0IFJlbW90ZUxh eWVyVHJlZVRyYW5zYWN0aW9uOjoKICAgICBjYXNlIFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBl VGlsZWRCYWNraW5nTGF5ZXI6CiAgICAgY2FzZSBQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZVBh Z2VUaWxlZEJhY2tpbmdMYXllcjoKICAgICBjYXNlIFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBl VGlsZWRCYWNraW5nVGlsZUxheWVyOgotICAgICAgICBsYXllck9yVmlldyA9IGFkb3B0TlMoW1tV SVZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0WmVyb10pOworICAgICAgICBpZiAobGF5 ZXJQcm9wZXJ0aWVzICYmIGxheWVyUHJvcGVydGllcy0+Y3VzdG9tQmVoYXZpb3IgPT0gR3JhcGhp Y3NMYXllcjo6Q3VzdG9tU2Nyb2xsaW5nQmVoYXZpb3IpCisgICAgICAgICAgICBsYXllck9yVmll dyA9IGFkb3B0TlMoW1tVSVNjcm9sbFZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0WmVy b10pOworICAgICAgICBlbHNlCisgICAgICAgICAgICBsYXllck9yVmlldyA9IGFkb3B0TlMoW1tV SVZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0WmVyb10pOwogICAgICAgICBicmVhazsK ICAgICBjYXNlIFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlVHJhbnNmb3JtTGF5ZXI6CiAgICAg ICAgIGxheWVyT3JWaWV3ID0gYWRvcHROUyhbW1dLVHJhbnNmb3JtVmlldyBhbGxvY10gaW5pdFdp dGhGcmFtZTpDR1JlY3RaZXJvXSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXcubW0KaW5kZXggYWIxMWU0MzBlOGNmZjRhY2YwNTEzMWJjMjQyMTBkYmIxNGY0 NTA4OS4uM2E1YjljYTM2YjU0MmRiYjhhOGIxNjQzNGRjM2I4OGJjNDJkOTZkOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQpAQCAtMTc5LDcgKzE3 OSw2IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aEZyYW1lOihDR1JlY3QpZnJhbWUgY29udGV4 dDooV2ViS2l0OjpXZWJDb250ZXh0Jiljb250ZXh0CiAKICAgICBfcm9vdENvbnRlbnRWaWV3ID0g YWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOwogICAgIFtfcm9vdENvbnRlbnRWaWV3IGxh eWVyXS5tYXNrc1RvQm91bmRzID0gTk87Ci0gICAgW19yb290Q29udGVudFZpZXcgc2V0VXNlcklu dGVyYWN0aW9uRW5hYmxlZDpOT107CiAKICAgICBbc2VsZiBhZGRTdWJ2aWV3Ol9yb290Q29udGVu dFZpZXcuZ2V0KCldOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFj L1JlbW90ZUxheWVyVHJlZUhvc3QuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVt b3RlTGF5ZXJUcmVlSG9zdC5oCmluZGV4IGE5MmQ4MzE0NzIxZTk0MGRhOWQ1YjIyZDM3ZGQxNGQ5 MjRlYzNlYWUuLmY5ZDZiMzQxNDZjMTFmNGY5MTExMDEzODA1ZjI0ZDNlZTU3YzUxMzEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5o CkBAIC01MSw3ICs1MSw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzRGVidWdMYXllclRyZWVIb3N0 KCkgY29uc3QgeyByZXR1cm4gbV9pc0RlYnVnTGF5ZXJUcmVlSG9zdDsgfQogCiBwcml2YXRlOgot ICAgIExheWVyT3JWaWV3ICpjcmVhdGVMYXllcihjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2Fj dGlvbjo6TGF5ZXJDcmVhdGlvblByb3BlcnRpZXMmKTsKKyAgICBMYXllck9yVmlldyAqY3JlYXRl TGF5ZXIoY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyQ3JlYXRpb25Qcm9w ZXJ0aWVzJiwgY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGll cyopOwogCiAgICAgTGF5ZXJPclZpZXcgKm1fcm9vdExheWVyOwogICAgIEhhc2hNYXA8V2ViQ29y ZTo6R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklELCBSZXRhaW5QdHI8TGF5ZXJPclZpZXc+ PiBtX2xheWVyczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVt b3RlTGF5ZXJUcmVlSG9zdC5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3Rl TGF5ZXJUcmVlSG9zdC5tbQppbmRleCA3ZDg5OGZhNTA3ODM3M2FjMDAyMWQzYmVlOThkYzM0OWFi ZjlkNDY4Li41YmM3MWExZjE2NDJjN2UxOGY2Y2QyYzEyYjgwZjM2MmMxZWQyYTc4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZUhvc3QubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1t CkBAIC01Myw4ICs1MywxMCBAQCBSZW1vdGVMYXllclRyZWVIb3N0Ojp+UmVtb3RlTGF5ZXJUcmVl SG9zdCgpCiAKIGJvb2wgUmVtb3RlTGF5ZXJUcmVlSG9zdDo6dXBkYXRlTGF5ZXJUcmVlKGNvbnN0 IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgZmxvYXQgaW5kaWNhdG9y U2NhbGVGYWN0b3IpCiB7Ci0gICAgZm9yIChjb25zdCBhdXRvJiBjcmVhdGVkTGF5ZXIgOiB0cmFu c2FjdGlvbi5jcmVhdGVkTGF5ZXJzKCkpCi0gICAgICAgIGNyZWF0ZUxheWVyKGNyZWF0ZWRMYXll cik7CisgICAgZm9yIChjb25zdCBhdXRvJiBjcmVhdGVkTGF5ZXIgOiB0cmFuc2FjdGlvbi5jcmVh dGVkTGF5ZXJzKCkpIHsKKyAgICAgICAgY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246 OkxheWVyUHJvcGVydGllcyogcHJvcGVydGllcyA9IHRyYW5zYWN0aW9uLmNoYW5nZWRMYXllcnMo KS5nZXQoY3JlYXRlZExheWVyLmxheWVySUQpOworICAgICAgICBjcmVhdGVMYXllcihjcmVhdGVk TGF5ZXIsIHByb3BlcnRpZXMpOworICAgIH0KIAogICAgIGJvb2wgcm9vdExheWVyQ2hhbmdlZCA9 IGZhbHNlOwogICAgIExheWVyT3JWaWV3ICpyb290TGF5ZXIgPSBnZXRMYXllcih0cmFuc2FjdGlv bi5yb290TGF5ZXJJRCgpKTsKQEAgLTEwNSw3ICsxMDcsNyBAQCBMYXllck9yVmlldyAqUmVtb3Rl TGF5ZXJUcmVlSG9zdDo6Z2V0TGF5ZXIoR3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEIGxh eWVySQogfQogCiAjaWYgIVBMQVRGT1JNKElPUykKLUxheWVyT3JWaWV3ICpSZW1vdGVMYXllclRy ZWVIb3N0OjpjcmVhdGVMYXllcihjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5 ZXJDcmVhdGlvblByb3BlcnRpZXMmIHByb3BlcnRpZXMpCitMYXllck9yVmlldyAqUmVtb3RlTGF5 ZXJUcmVlSG9zdDo6Y3JlYXRlTGF5ZXIoY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246 OkxheWVyQ3JlYXRpb25Qcm9wZXJ0aWVzJiBwcm9wZXJ0aWVzLCBjb25zdCBSZW1vdGVMYXllclRy ZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzKikKIHsKICAgICBSZXRhaW5QdHI8Q0FMYXll cj4mIGxheWVyID0gbV9sYXllcnMuYWRkKHByb3BlcnRpZXMubGF5ZXJJRCwgbnVsbHB0cikuaXRl cmF0b3ItPnZhbHVlOwogCg==