108734 2013-02-01 18:06:12 -0800 Fixed and sticky nodes have no nodeID set 2013-02-02 13:04:56 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca bdakin jamesr simon.fraser tonikitoo webkit.review.bot oldest_to_newest 823473 0 simon.fraser 2013-02-01 18:06:12 -0800 Fixed and sticky nodes in the scrolling tree have m_nodeID set to 0, which seems wrong (but harmless). 823475 1 simon.fraser 2013-02-01 18:07:59 -0800 @@ -182,6 +183,7 @@ void ScrollingTree::updateTreeFromStateNode(ScrollingStateNode* stateNode) newNode->setParent(parent); parent->appendChild(newNode.release()); } + newNodeRawPtr->setScrollingNodeID(stateNode->scrollingNodeID()); newNodeRawPtr->update(stateNode); } } 823540 2 186213 simon.fraser 2013-02-01 21:13:34 -0800 Created attachment 186213 Patch 823696 3 186213 webkit.review.bot 2013-02-02 13:04:52 -0800 Comment on attachment 186213 Patch Clearing flags on attachment: 186213 Committed r141703: <http://trac.webkit.org/changeset/141703> 823697 4 webkit.review.bot 2013-02-02 13:04:56 -0800 All reviewed patches have been landed. Closing bug. 186213 2013-02-01 21:13:34 -0800 2013-02-02 13:04:51 -0800 Patch bug-108734-20130201211016.patch text/plain 14845 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjkxZDNjZjFmNGU4NDFi M2U0ZjIyOWYzYmFlMDkyMGIxZTk5MDIyMS4uMzMzNjU5Mzk2ODdiMzg2NmViOTQ0ODc3MTNlN2M4 NDkzZTgyYWRiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEzLTAyLTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZpeGVkIGFuZCBz dGlja3kgbm9kZXMgaGF2ZSBubyBub2RlSUQgc2V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDg3MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFB1c2ggU2Nyb2xsaW5nTm9kZUlEcyBvbnRv IHNjcm9sbGluZyBub2RlcyBhdCBjb25zdHJ1Y3Rpb24gdGltZSwgYW5kIHRoZXJlYWZ0ZXIKKyAg ICAgICAgdHJlYXQgdGhlbSBhcyByZWFkb25seS4gUHJldmlvdXNseSwgb25seSB0aGUgcm9vdCBz Y3JvbGxpbmcgbm9kZSB3b3VsZCBoYXZlIGEgbm9kZSBJRC4KKyAgICAgICAgCisgICAgICAgIE5v ZGUgSURzIGFyZW4ndCBhY3R1YWxseSB1c2VkIGJ5IHRoZSBzY3JvbGxpbmcgdHJlZSB5ZXQsIGJ1 dCBhcmUgdXNlZnVsIGZvciBkZWJ1Z2dpbmcuCisKKyAgICAgICAgTm90IHRlc3RhYmxlIHNpbmNl IHdlIG9ubHkgZHVtcCB0aGUgc2Nyb2xsaW5nIHN0YXRlIHRyZWUsIG5vdCB0aGUgc2Nyb2xsaW5n CisgICAgICAgIG5vZGUgdHJlZSBpbiB0ZXN0cy4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1RyZWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZTo6U2Ny b2xsaW5nVHJlZSk6IE5vIGxvbmdlciBjcmVhdGUgdGhlIHJvb3Qgbm9kZSBoZXJlOworICAgICAg ICB3ZSBjYW4gb25seSBjcmVhdGUgaXQgd2hlbiB3ZSBrbm93IHdoYXQgaXRzIElEIHdpbGwgYmUu CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjp1cGRhdGVUcmVlRnJvbVN0YXRlTm9k ZSk6IENyZWF0ZSB0aGUgcm9vdCBub2RlIGlmCisgICAgICAgIG5lY2Vzc2FyeS4gUGFzcyBub2Rl IElEcyBpbnRvIGNyZWF0ZSBtZXRob2RzLgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1RyZWVOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVOb2RlOjpT Y3JvbGxpbmdUcmVlTm9kZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZU5vZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5n Tm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6 U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFj L1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMv U2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1Ry ZWVGaXhlZE5vZGU6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlRml4 ZWROb2RlOjpTY3JvbGxpbmdUcmVlRml4ZWROb2RlKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGlu Zy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMuaDoKKyAgICAgICAgKiBwYWdlL3Nj cm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW06CisgICAgICAgIChX ZWJDb3JlOjpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6Y3JlYXRlKToKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjOjpTY3JvbGxpbmdUcmVlU2Nyb2xs aW5nTm9kZU1hYyk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVT dGlja3lOb2RlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVT dGlja3lOb2RlLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6 OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZTo6U2Ny b2xsaW5nVHJlZVN0aWNreU5vZGUpOgorCiAyMDEzLTAyLTAxICBSb2dlciBGb25nICA8cm9nZXJf Zm9uZ0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQ2xlYW4gdXAgV2ViQ29yZSBW UzIwMTAgcHJvamVjdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nVHJlZS5jcHAKaW5kZXggNTI2N2NmMzQ4YWMzZmYxYTFjYTVhNmM2YmY2M2UxZGU5ZjFjY2Qw ZS4uMjYxZDg4NDg2YzMxYjQyZTA2Y2RkMGQ4OTY1ZTEzNGFhOWQxMjQwZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKQEAgLTQ4LDcgKzQ4 LDYgQEAgUGFzc1JlZlB0cjxTY3JvbGxpbmdUcmVlPiBTY3JvbGxpbmdUcmVlOjpjcmVhdGUoU2Ny b2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0MKIAogU2Nyb2xsaW5nVHJlZTo6U2Nyb2xsaW5n VHJlZShTY3JvbGxpbmdDb29yZGluYXRvciogc2Nyb2xsaW5nQ29vcmRpbmF0b3IpCiAgICAgOiBt X3Njcm9sbGluZ0Nvb3JkaW5hdG9yKHNjcm9sbGluZ0Nvb3JkaW5hdG9yKQotICAgICwgbV9yb290 Tm9kZShTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6Y3JlYXRlKHRoaXMpKQogICAgICwgbV9o YXNXaGVlbEV2ZW50SGFuZGxlcnMoZmFsc2UpCiAgICAgLCBtX2NhbkdvQmFjayhmYWxzZSkKICAg ICAsIG1fY2FuR29Gb3J3YXJkKGZhbHNlKQpAQCAtMTU3LDI0ICsxNTYsMjcgQEAgdm9pZCBTY3Jv bGxpbmdUcmVlOjp1cGRhdGVUcmVlRnJvbVN0YXRlTm9kZShTY3JvbGxpbmdTdGF0ZU5vZGUqIHN0 YXRlTm9kZSkKICAgICB9IGVsc2UgewogICAgICAgICAvLyBJZiB0aGUgbm9kZSBpc24ndCBmb3Vu ZCwgaXQncyBlaXRoZXIgbmV3IGFuZCBuZWVkcyB0byBiZSBhZGRlZCB0byB0aGUgdHJlZSwgb3Ig dGhlcmUgaXMgYSBuZXcgSUQgZm9yIG91cgogICAgICAgICAvLyByb290IG5vZGUuCisgICAgICAg IFNjcm9sbGluZ05vZGVJRCBub2RlSUQgPSBzdGF0ZU5vZGUtPnNjcm9sbGluZ05vZGVJRCgpOwog ICAgICAgICBpZiAoIXN0YXRlTm9kZS0+cGFyZW50KCkpIHsKICAgICAgICAgICAgIC8vIFRoaXMg aXMgdGhlIHJvb3Qgbm9kZS4KLSAgICAgICAgICAgIG1fcm9vdE5vZGUtPnNldFNjcm9sbGluZ05v ZGVJRChzdGF0ZU5vZGUtPnNjcm9sbGluZ05vZGVJRCgpKTsKLSAgICAgICAgICAgIG1fbm9kZU1h cC5zZXQoc3RhdGVOb2RlLT5zY3JvbGxpbmdOb2RlSUQoKSwgbV9yb290Tm9kZS5nZXQoKSk7Cisg ICAgICAgICAgICBpZiAoIW1fcm9vdE5vZGUpCisgICAgICAgICAgICAgICAgbV9yb290Tm9kZSA9 IFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpjcmVhdGUodGhpcywgbm9kZUlEKTsKKworICAg ICAgICAgICAgbV9ub2RlTWFwLnNldChub2RlSUQsIG1fcm9vdE5vZGUuZ2V0KCkpOwogICAgICAg ICAgICAgbV9yb290Tm9kZS0+dXBkYXRlKHN0YXRlTm9kZSk7CiAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICBPd25QdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IG5ld05vZGU7CiAgICAgICAgICAg ICBpZiAoc3RhdGVOb2RlLT5pc1Njcm9sbGluZ05vZGUoKSkKLSAgICAgICAgICAgICAgICBuZXdO b2RlID0gU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OmNyZWF0ZSh0aGlzKTsKKyAgICAgICAg ICAgICAgICBuZXdOb2RlID0gU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OmNyZWF0ZSh0aGlz LCBub2RlSUQpOwogICAgICAgICAgICAgZWxzZSBpZiAoc3RhdGVOb2RlLT5pc0ZpeGVkTm9kZSgp KQotICAgICAgICAgICAgICAgIG5ld05vZGUgPSBTY3JvbGxpbmdUcmVlRml4ZWROb2RlOjpjcmVh dGUodGhpcyk7CisgICAgICAgICAgICAgICAgbmV3Tm9kZSA9IFNjcm9sbGluZ1RyZWVGaXhlZE5v ZGU6OmNyZWF0ZSh0aGlzLCBub2RlSUQpOwogICAgICAgICAgICAgZWxzZSBpZiAoc3RhdGVOb2Rl LT5pc1N0aWNreU5vZGUoKSkKLSAgICAgICAgICAgICAgICBuZXdOb2RlID0gU2Nyb2xsaW5nVHJl ZVN0aWNreU5vZGU6OmNyZWF0ZSh0aGlzKTsKKyAgICAgICAgICAgICAgICBuZXdOb2RlID0gU2Ny b2xsaW5nVHJlZVN0aWNreU5vZGU6OmNyZWF0ZSh0aGlzLCBub2RlSUQpOwogICAgICAgICAgICAg ZWxzZQogICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogCiAgICAgICAgICAg ICBTY3JvbGxpbmdUcmVlTm9kZSogbmV3Tm9kZVJhd1B0ciA9IG5ld05vZGUuZ2V0KCk7Ci0gICAg ICAgICAgICBtX25vZGVNYXAuc2V0KHN0YXRlTm9kZS0+c2Nyb2xsaW5nTm9kZUlEKCksIG5ld05v ZGVSYXdQdHIpOworICAgICAgICAgICAgbV9ub2RlTWFwLnNldChub2RlSUQsIG5ld05vZGVSYXdQ dHIpOwogICAgICAgICAgICAgU2Nyb2xsaW5nVHJlZU5vZGVNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0 ID0gbV9ub2RlTWFwLmZpbmQoc3RhdGVOb2RlLT5wYXJlbnQoKS0+c2Nyb2xsaW5nTm9kZUlEKCkp OwogICAgICAgICAgICAgQVNTRVJUKGl0ICE9IG1fbm9kZU1hcC5lbmQoKSk7CiAgICAgICAgICAg ICBpZiAoaXQgIT0gbV9ub2RlTWFwLmVuZCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlTm9kZS5jcHAKaW5kZXggZDAzMzkyNTUyNjEzZGJj MTU0NDE1OTIyN2FmMTBhYmI2ZjZiMmMwMS4uZDgxMGI0MDhmNmNjYTcxZTYyODU4MDQ0YThmNzdj NzUzMWFmNGNhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZU5vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWVOb2RlLmNwcApAQCAtMzIsOSArMzIsOSBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKLVNjcm9sbGluZ1RyZWVOb2RlOjpTY3JvbGxpbmdUcmVlTm9kZShTY3JvbGxpbmdUcmVl KiBzY3JvbGxpbmdUcmVlKQorU2Nyb2xsaW5nVHJlZU5vZGU6OlNjcm9sbGluZ1RyZWVOb2RlKFNj cm9sbGluZ1RyZWUqIHNjcm9sbGluZ1RyZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCiAgICAg OiBtX3Njcm9sbGluZ1RyZWUoc2Nyb2xsaW5nVHJlZSkKLSAgICAsIG1fbm9kZUlEKDApCisgICAg LCBtX25vZGVJRChub2RlSUQpCiAgICAgLCBtX3BhcmVudCgwKQogewogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZU5vZGUuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVOb2RlLmgKaW5kZXggZDJiMTE5 MDgwYmU4YzUwZjVmOGUzZjQyMGYzZGVhNWQ2NTdjM2RkNC4uMDE0MjQ0YjVjYWUxNTM2Yzk4ZDEy NWFlYzVjZjIwNDEzNzMxZWJmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nVHJlZU5vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdUcmVlTm9kZS5oCkBAIC00MSw3ICs0MSw3IEBAIGNsYXNzIFNjcm9sbGlu Z1N0YXRlU2Nyb2xsaW5nTm9kZTsKIAogY2xhc3MgU2Nyb2xsaW5nVHJlZU5vZGUgewogcHVibGlj OgotICAgIGV4cGxpY2l0IFNjcm9sbGluZ1RyZWVOb2RlKFNjcm9sbGluZ1RyZWUqKTsKKyAgICBl eHBsaWNpdCBTY3JvbGxpbmdUcmVlTm9kZShTY3JvbGxpbmdUcmVlKiwgU2Nyb2xsaW5nTm9kZUlE KTsKICAgICB2aXJ0dWFsIH5TY3JvbGxpbmdUcmVlTm9kZSgpOwogCiAgICAgdmlydHVhbCB2b2lk IHVwZGF0ZShTY3JvbGxpbmdTdGF0ZU5vZGUqKSA9IDA7CkBAIC00OSw3ICs0OSw2IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgcGFyZW50U2Nyb2xsUG9zaXRpb25EaWRDaGFuZ2UoY29uc3Qg SW50UmVjdCYgdmlld3BvcnRSZWN0LCBjb25zdCBGbG9hdFNpemUmIGN1bXVsYXRpdmVEZWx0YSkg PSAwOwogCiAgICAgU2Nyb2xsaW5nTm9kZUlEIHNjcm9sbGluZ05vZGVJRCgpIGNvbnN0IHsgcmV0 dXJuIG1fbm9kZUlEOyB9Ci0gICAgdm9pZCBzZXRTY3JvbGxpbmdOb2RlSUQoU2Nyb2xsaW5nTm9k ZUlEIG5vZGVJRCkgeyBtX25vZGVJRCA9IG5vZGVJRDsgfQogCiAgICAgU2Nyb2xsaW5nVHJlZU5v ZGUqIHBhcmVudCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50OyB9CiAgICAgdm9pZCBzZXRQYXJl bnQoU2Nyb2xsaW5nVHJlZU5vZGUqIHBhcmVudCkgeyBtX3BhcmVudCA9IHBhcmVudDsgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9s bGluZ05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZVNjcm9sbGluZ05vZGUuY3BwCmluZGV4IDdlNjA4MDM2NmNkZGNlODk1YWQ3ZTRlZDdmMDUyNTI0 YjMzNzJmZDQuLjEyNWNhNzEyNjYwMDQ5OTYxNWUzMWVjNDUyYzc3YzY2MjA3ZDQzMTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxp bmdOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZS5jcHAKQEAgLTMyLDggKzMyLDggQEAKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCi1TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsaW5nVHJlZVNjcm9sbGlu Z05vZGUoU2Nyb2xsaW5nVHJlZSogc2Nyb2xsaW5nVHJlZSkKLSAgICA6IFNjcm9sbGluZ1RyZWVO b2RlKHNjcm9sbGluZ1RyZWUpCitTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsaW5n VHJlZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nVHJlZSogc2Nyb2xsaW5nVHJlZSwgU2Nyb2xsaW5n Tm9kZUlEIG5vZGVJRCkKKyAgICA6IFNjcm9sbGluZ1RyZWVOb2RlKHNjcm9sbGluZ1RyZWUsIG5v ZGVJRCkKICAgICAsIG1fZnJhbWVTY2FsZUZhY3RvcigxKQogICAgICwgbV9zaG91bGRVcGRhdGVT Y3JvbGxMYXllclBvc2l0aW9uT25NYWluVGhyZWFkKDApCiAgICAgLCBtX2hvcml6b250YWxTY3Jv bGxFbGFzdGljaXR5KFNjcm9sbEVsYXN0aWNpdHlOb25lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmgKaW5k ZXggYTE3ODI0YTgzMWFhNmI1MWRjN2EwMWY1NTQ1MDA2OTdkNGU5NGFhNy4uYTY5MDFmOWEwOGFh MWZmYjZhNGFjOTQ0MDkxYWI2YzZlOTE3MzMyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oCkBAIC00 Miw3ICs0Miw3IEBAIGNsYXNzIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTsKIAogY2xhc3Mg U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUgOiBwdWJsaWMgU2Nyb2xsaW5nVHJlZU5vZGUgewog cHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2Rl PiBjcmVhdGUoU2Nyb2xsaW5nVHJlZSopOworICAgIHN0YXRpYyBQYXNzT3duUHRyPFNjcm9sbGlu Z1RyZWVTY3JvbGxpbmdOb2RlPiBjcmVhdGUoU2Nyb2xsaW5nVHJlZSosIFNjcm9sbGluZ05vZGVJ RCk7CiAgICAgdmlydHVhbCB+U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUoKTsKIAogICAgIHZp cnR1YWwgdm9pZCB1cGRhdGUoU2Nyb2xsaW5nU3RhdGVOb2RlKikgT1ZFUlJJREU7CkBAIC01Niw3 ICs1Niw3IEBAIHB1YmxpYzoKICAgICBNYWluVGhyZWFkU2Nyb2xsaW5nUmVhc29ucyBzaG91bGRV cGRhdGVTY3JvbGxMYXllclBvc2l0aW9uT25NYWluVGhyZWFkKCkgY29uc3QgeyByZXR1cm4gbV9z aG91bGRVcGRhdGVTY3JvbGxMYXllclBvc2l0aW9uT25NYWluVGhyZWFkOyB9CiAKIHByb3RlY3Rl ZDoKLSAgICBleHBsaWNpdCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdUcmVl Kik7CisgICAgZXhwbGljaXQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nVHJl ZSosIFNjcm9sbGluZ05vZGVJRCk7CiAKICAgICBjb25zdCBJbnRSZWN0JiB2aWV3cG9ydFJlY3Qo KSBjb25zdCB7IHJldHVybiBtX3ZpZXdwb3J0UmVjdDsgfQogICAgIGNvbnN0IEludFNpemUmIGNv bnRlbnRzU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudHNTaXplOyB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZpeGVkTm9k ZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhl ZE5vZGUuaAppbmRleCBmODI1NmRlNDU1NzY2Y2Y2OGZjMTlmMWUxMDAxMDcwMGJlOGMzMTFkLi43 OTcxYzVmZDU4ODY5NmM3ZmU0ODJmYTFlYjY4NDRiNzhiNDY4MzRhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRml4ZWRO b2RlLmgKQEAgLTQwLDEyICs0MCwxMiBAQCBjbGFzcyBGaXhlZFBvc2l0aW9uVmlld3BvcnRDb25z dHJhaW50czsKIAogY2xhc3MgU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZSA6IHB1YmxpYyBTY3JvbGxp bmdUcmVlTm9kZSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8U2Nyb2xsaW5nVHJl ZUZpeGVkTm9kZT4gY3JlYXRlKFNjcm9sbGluZ1RyZWUqKTsKKyAgICBzdGF0aWMgUGFzc093blB0 cjxTY3JvbGxpbmdUcmVlRml4ZWROb2RlPiBjcmVhdGUoU2Nyb2xsaW5nVHJlZSosIFNjcm9sbGlu Z05vZGVJRCk7CiAKICAgICB2aXJ0dWFsIH5TY3JvbGxpbmdUcmVlRml4ZWROb2RlKCk7CiAKIHBy aXZhdGU6Ci0gICAgU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZShTY3JvbGxpbmdUcmVlKik7CisgICAg U2Nyb2xsaW5nVHJlZUZpeGVkTm9kZShTY3JvbGxpbmdUcmVlKiwgU2Nyb2xsaW5nTm9kZUlEKTsK IAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoU2Nyb2xsaW5nU3RhdGVOb2RlKikgT1ZFUlJJREU7 CiAgICAgdmlydHVhbCB2b2lkIHBhcmVudFNjcm9sbFBvc2l0aW9uRGlkQ2hhbmdlKGNvbnN0IElu dFJlY3QmIHZpZXdwb3J0UmVjdCwgY29uc3QgRmxvYXRTaXplJiBjdW11bGF0aXZlRGVsdGEpIE9W RVJSSURFOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Nj cm9sbGluZ1RyZWVGaXhlZE5vZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9t YWMvU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5tbQppbmRleCA0MjNmZDMwZTJhOTI2YjQ5Mzk5YmM0 NWJjOWY1ZGZlNDMwOGJlZmZlLi4yZTY0NDFmZTYwNzk2YjIyOGU0ODU0MWI1Y2NmNGI0Mzc4ZDky NGI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xs aW5nVHJlZUZpeGVkTm9kZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9t YWMvU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5tbQpAQCAtMzMsMTMgKzMzLDEzIEBACiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAotUGFzc093blB0cjxTY3JvbGxpbmdUcmVlRml4ZWROb2RlPiBTY3Jv bGxpbmdUcmVlRml4ZWROb2RlOjpjcmVhdGUoU2Nyb2xsaW5nVHJlZSogc2Nyb2xsaW5nVHJlZSkK K1Bhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZUZpeGVkTm9kZT4gU2Nyb2xsaW5nVHJlZUZpeGVkTm9k ZTo6Y3JlYXRlKFNjcm9sbGluZ1RyZWUqIHNjcm9sbGluZ1RyZWUsIFNjcm9sbGluZ05vZGVJRCBu b2RlSUQpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBTY3JvbGxpbmdUcmVlRml4ZWROb2Rl KHNjcm9sbGluZ1RyZWUpKTsKKyAgICByZXR1cm4gYWRvcHRQdHIobmV3IFNjcm9sbGluZ1RyZWVG aXhlZE5vZGUoc2Nyb2xsaW5nVHJlZSwgbm9kZUlEKSk7CiB9CiAKLVNjcm9sbGluZ1RyZWVGaXhl ZE5vZGU6OlNjcm9sbGluZ1RyZWVGaXhlZE5vZGUoU2Nyb2xsaW5nVHJlZSogc2Nyb2xsaW5nVHJl ZSkKLSAgICA6IFNjcm9sbGluZ1RyZWVOb2RlKHNjcm9sbGluZ1RyZWUpCitTY3JvbGxpbmdUcmVl Rml4ZWROb2RlOjpTY3JvbGxpbmdUcmVlRml4ZWROb2RlKFNjcm9sbGluZ1RyZWUqIHNjcm9sbGlu Z1RyZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCisgICAgOiBTY3JvbGxpbmdUcmVlTm9kZShz Y3JvbGxpbmdUcmVlLCBub2RlSUQpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2Rl TWFjLmgKaW5kZXggZmUxYzI0MjBiOTEwOTUwMGQxZmM0YmJlZGU4NWQzZGMwMWNjNDgyYS4uMTE0 MjY1ODc2MzY1NTJjODI1YTQyZWRjYWRhNzA0OTVmMmY5ODk4YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFj LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlTWFjLmgKQEAgLTM4LDcgKzM4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiBjbGFzcyBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYyA6IHB1YmxpYyBTY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZSwgcHJpdmF0ZSBTY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlckNsaWVu dCB7CiBwdWJsaWM6Ci0gICAgZXhwbGljaXQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMo U2Nyb2xsaW5nVHJlZSopOworICAgIGV4cGxpY2l0IFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2Rl TWFjKFNjcm9sbGluZ1RyZWUqLCBTY3JvbGxpbmdOb2RlSUQpOwogICAgIHZpcnR1YWwgflNjcm9s bGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjKCk7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVN YWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNj cm9sbGluZ05vZGVNYWMubW0KaW5kZXggNjYzYzczNDFiNjhmOGJhZjkxMWY0NjIwZjYxZjE3MmU1 OWQwYjI5MS4uMDA4YzM3N2EwYTVhOTBlMzE1ZDVkNWNiMWNkZjZmMGIyMTg4OThkMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3Jv bGxpbmdOb2RlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5tbQpAQCAtNDcsMTMgKzQ3LDEzIEBAIHN0YXRp YyB2b2lkIGxvZ1RocmVhZGVkU2Nyb2xsaW5nTW9kZSh1bnNpZ25lZCBtYWluVGhyZWFkU2Nyb2xs aW5nUmVhc29ucyk7CiBzdGF0aWMgdm9pZCBsb2dXaGVlbEV2ZW50SGFuZGxlckNvdW50Q2hhbmdl ZCh1bnNpZ25lZCk7CiAKIAotUGFzc093blB0cjxTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZT4g U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OmNyZWF0ZShTY3JvbGxpbmdUcmVlKiBzY3JvbGxp bmdUcmVlKQorUGFzc093blB0cjxTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZT4gU2Nyb2xsaW5n VHJlZVNjcm9sbGluZ05vZGU6OmNyZWF0ZShTY3JvbGxpbmdUcmVlKiBzY3JvbGxpbmdUcmVlLCBT Y3JvbGxpbmdOb2RlSUQgbm9kZUlEKQogewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgU2Nyb2xs aW5nVHJlZVNjcm9sbGluZ05vZGVNYWMoc2Nyb2xsaW5nVHJlZSkpOworICAgIHJldHVybiBhZG9w dFB0cihuZXcgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMoc2Nyb2xsaW5nVHJlZSwgbm9k ZUlEKSk7CiB9CiAKLVNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjOjpTY3JvbGxpbmdUcmVl U2Nyb2xsaW5nTm9kZU1hYyhTY3JvbGxpbmdUcmVlKiBzY3JvbGxpbmdUcmVlKQotICAgIDogU2Ny b2xsaW5nVHJlZVNjcm9sbGluZ05vZGUoc2Nyb2xsaW5nVHJlZSkKK1Njcm9sbGluZ1RyZWVTY3Jv bGxpbmdOb2RlTWFjOjpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYyhTY3JvbGxpbmdUcmVl KiBzY3JvbGxpbmdUcmVlLCBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQorICAgIDogU2Nyb2xsaW5n VHJlZVNjcm9sbGluZ05vZGUoc2Nyb2xsaW5nVHJlZSwgbm9kZUlEKQogICAgICwgbV9zY3JvbGxF bGFzdGljaXR5Q29udHJvbGxlcih0aGlzKQogICAgICwgbV9sYXN0U2Nyb2xsSGFkVW5maWxsZWRQ aXhlbHMoZmFsc2UpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9tYWMvU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5oCmluZGV4IDRiMTUyNDMyY2U2Nzhl NmFhNDJiMDdjMGNmYjUzZjM4N2ExOTg0MjMuLjMzMmI4NWU3ODY4OTljOTY1NzI5Y2Y3NTQ0YzY1 YzRjOTgyNzlkZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21h Yy9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5oCkBAIC00MCwxMiArNDAsMTIgQEAg Y2xhc3MgU3RpY2t5UG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzOwogCiBjbGFzcyBTY3JvbGxp bmdUcmVlU3RpY2t5Tm9kZSA6IHB1YmxpYyBTY3JvbGxpbmdUcmVlTm9kZSB7CiBwdWJsaWM6Ci0g ICAgc3RhdGljIFBhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU+IGNyZWF0ZShTY3Jv bGxpbmdUcmVlKik7CisgICAgc3RhdGljIFBhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZVN0aWNreU5v ZGU+IGNyZWF0ZShTY3JvbGxpbmdUcmVlKiwgU2Nyb2xsaW5nTm9kZUlEKTsKIAogICAgIHZpcnR1 YWwgflNjcm9sbGluZ1RyZWVTdGlja3lOb2RlKCk7CiAKIHByaXZhdGU6Ci0gICAgU2Nyb2xsaW5n VHJlZVN0aWNreU5vZGUoU2Nyb2xsaW5nVHJlZSopOworICAgIFNjcm9sbGluZ1RyZWVTdGlja3lO b2RlKFNjcm9sbGluZ1RyZWUqLCBTY3JvbGxpbmdOb2RlSUQpOwogCiAgICAgdmlydHVhbCB2b2lk IHVwZGF0ZShTY3JvbGxpbmdTdGF0ZU5vZGUqKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQg cGFyZW50U2Nyb2xsUG9zaXRpb25EaWRDaGFuZ2UoY29uc3QgSW50UmVjdCYgdmlld3BvcnRSZWN0 LCBjb25zdCBGbG9hdFNpemUmIGN1bXVsYXRpdmVEZWx0YSkgT1ZFUlJJREU7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVN0aWNreU5v ZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVN0 aWNreU5vZGUubW0KaW5kZXggMDY5MDUxNDQ4M2NlNmMzODQ1NWM3ZTlmNzZmYTAyOGJkYmQwZDdl NS4uZTQ0YmQ4ODE5M2M0ZDk3ZWE1ZDY5OGZhZGRiY2ZjMzk5OTE3YTYxOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTdGlja3lOb2Rl Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVl U3RpY2t5Tm9kZS5tbQpAQCAtMzMsMTMgKzMzLDEzIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAotUGFzc093blB0cjxTY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZT4gU2Nyb2xsaW5nVHJlZVN0aWNr eU5vZGU6OmNyZWF0ZShTY3JvbGxpbmdUcmVlKiBzY3JvbGxpbmdUcmVlKQorUGFzc093blB0cjxT Y3JvbGxpbmdUcmVlU3RpY2t5Tm9kZT4gU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6OmNyZWF0ZShT Y3JvbGxpbmdUcmVlKiBzY3JvbGxpbmdUcmVlLCBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQogewot ICAgIHJldHVybiBhZG9wdFB0cihuZXcgU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUoc2Nyb2xsaW5n VHJlZSkpOworICAgIHJldHVybiBhZG9wdFB0cihuZXcgU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUo c2Nyb2xsaW5nVHJlZSwgbm9kZUlEKSk7CiB9CiAKLVNjcm9sbGluZ1RyZWVTdGlja3lOb2RlOjpT Y3JvbGxpbmdUcmVlU3RpY2t5Tm9kZShTY3JvbGxpbmdUcmVlKiBzY3JvbGxpbmdUcmVlKQotICAg IDogU2Nyb2xsaW5nVHJlZU5vZGUoc2Nyb2xsaW5nVHJlZSkKK1Njcm9sbGluZ1RyZWVTdGlja3lO b2RlOjpTY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZShTY3JvbGxpbmdUcmVlKiBzY3JvbGxpbmdUcmVl LCBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQorICAgIDogU2Nyb2xsaW5nVHJlZU5vZGUoc2Nyb2xs aW5nVHJlZSwgbm9kZUlEKQogewogfQogCg==