133248 2014-05-23 18:34:55 -0700 Share some more ScrollingTreeScrollingNode code 2014-05-24 13:41:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca cmarcelo commit-queue jamesr luiz simon.fraser tonikitoo oldest_to_newest 1011447 0 simon.fraser 2014-05-23 18:34:55 -0700 Share some more ScrollingTreeScrollingNode code 1011448 1 232009 simon.fraser 2014-05-23 18:36:43 -0700 Created attachment 232009 Patch 1011522 2 232009 sam 2014-05-24 11:55:34 -0700 Comment on attachment 232009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232009&action=review > Source/WebCore/ChangeLog:12 > + it virtual Future patches will reduce the confusion between the committed scroll Missing period after virtual. 1011533 3 simon.fraser 2014-05-24 13:41:05 -0700 https://trac.webkit.org/r169312 232009 2014-05-23 18:36:43 -0700 2014-05-24 11:55:34 -0700 Patch bug-133248-20140523183619.patch text/plain 13849 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5Mjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzM2YTM3ZGQ3MWVjNzli NWYyY2Y0YzVjMTdjMzQ2YTJlYTk4MWNhYy4uZDViODgxOWM5OTI0ZDJjZDk2YTAwZmY5NmUwOTBi NDc0ZDYyMzQyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE0LTA1LTIzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNoYXJlIHNvbWUg bW9yZSBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMyNDgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQdXNoIHNjcm9sbEJ5KCksIHNjcm9sbEJ5V2l0 aG91dENvbnRlbnRFZGdlQ29uc3RyYWludHMoKSBhbmQgc2V0U2Nyb2xsUG9zaXRpb24oKQorICAg ICAgICBkb3duIHRvIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuCisgICAgICAgIAor ICAgICAgICBUaGlzIHJlcXVpcmVzIHRoYXQgc2Nyb2xsUG9zaXRpb24oKSByZXR1cm4gdGhlIHJp Z2h0IHRoaW5nIGZvciBlYWNoIGNsYXNzLCBzbyBtYWtlCisgICAgICAgIGl0IHZpcnR1YWwgRnV0 dXJlIHBhdGNoZXMgd2lsbCByZWR1Y2UgdGhlIGNvbmZ1c2lvbiBiZXR3ZWVuIHRoZSBjb21taXR0 ZWQgc2Nyb2xsCisgICAgICAgIHBvc2l0aW9uIGFuZCB0aGUgb25lIGRlcml2ZWQgZnJvbSBsYXll cnMuCisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxp bmdOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGlu Z05vZGU6OnNjcm9sbEJ5KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNj cm9sbGluZ05vZGU6OnNjcm9sbEJ5V2l0aG91dENvbnRlbnRFZGdlQ29uc3RyYWludHMpOgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0U2Nyb2xs UG9zaXRpb24pOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNj cm9sbGluZ05vZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Ny b2xsaW5nTm9kZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05v ZGU6OnNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUy5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L2lvcy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TLm1tOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUzo6c2V0U2Nyb2xsUG9zaXRp b24pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xs aW5nTm9kZUlPUzo6c2Nyb2xsQnkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUzo6c2Nyb2xsQnlXaXRob3V0Q29udGVudEVkZ2VD b25zdHJhaW50cyk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9s bGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGlu Zy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYy5tbToKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWM6OnVwZGF0ZUJlZm9yZUNo aWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05v ZGVNYWM6OmltbWVkaWF0ZVNjcm9sbEJ5KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1Ry ZWVGcmFtZVNjcm9sbGluZ05vZGVNYWM6OmltbWVkaWF0ZVNjcm9sbEJ5V2l0aG91dENvbnRlbnRF ZGdlQ29uc3RyYWludHMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Ny b2xsaW5nTm9kZU1hYzo6c2Nyb2xsUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYzo6c2V0U2Nyb2xsUG9zaXRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYzo6c2Nyb2xsQnkp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZU1hYzo6c2Nyb2xsQnlXaXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyk6IERlbGV0ZWQu CisKIDIwMTQtMDUtMjMgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0NTUyBHcmlkIExheW91dF0gVXNlIGdyaWRSb3dDb3VudCgpIGFuZCBncmlk Q29sdW1uQ291bnQoKSB3aGVuIHBvc3NpYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUu Y3BwCmluZGV4IGY5NDRjYzM5MDc5MzA5OWIxYmQ5NTVjNTU4MDIwMjMzYjliYmNlNjMuLmQ2YmU3 Njc3YzMxNjI5ZmIxZjMxNzQ5YTQ0MTU3YjMwYjUwMTU2NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNj cm9sbGluZ05vZGUuY3BwCkBAIC03Miw3ICs3MiwyNiBAQCB2b2lkIFNjcm9sbGluZ1RyZWVGcmFt ZVNjcm9sbGluZ05vZGU6OnVwZGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnN0IFNjcm9sbGluZ1N0YXRl TgogICAgIGlmIChzdGF0ZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNj cm9sbGluZ05vZGU6OlRvcENvbnRlbnRJbnNldCkpCiAgICAgICAgIG1fdG9wQ29udGVudEluc2V0 ID0gc3RhdGUudG9wQ29udGVudEluc2V0KCk7CiB9Ci0gICAgCisKK3ZvaWQgU2Nyb2xsaW5nVHJl ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2Nyb2xsQnkoY29uc3QgRmxvYXRTaXplJiBvZmZzZXQpCit7 CisgICAgc2V0U2Nyb2xsUG9zaXRpb24oc2Nyb2xsUG9zaXRpb24oKSArIG9mZnNldCk7Cit9CisK K3ZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2Nyb2xsQnlXaXRob3V0Q29u dGVudEVkZ2VDb25zdHJhaW50cyhjb25zdCBGbG9hdFNpemUmIG9mZnNldCkKK3sKKyAgICBzZXRT Y3JvbGxQb3NpdGlvbldpdGhvdXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKHNjcm9sbFBvc2l0aW9u KCkgKyBvZmZzZXQpOworfQorCit2b2lkIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU6 OnNldFNjcm9sbFBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uKQorewor ICAgIEZsb2F0UG9pbnQgbmV3U2Nyb2xsUG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbjsKKyAgICBu ZXdTY3JvbGxQb3NpdGlvbiA9IG5ld1Njcm9sbFBvc2l0aW9uLnNocnVua1RvKG1heGltdW1TY3Jv bGxQb3NpdGlvbigpKTsKKyAgICBuZXdTY3JvbGxQb3NpdGlvbiA9IG5ld1Njcm9sbFBvc2l0aW9u LmV4cGFuZGVkVG8obWluaW11bVNjcm9sbFBvc2l0aW9uKCkpOworCisgICAgc2V0U2Nyb2xsUG9z aXRpb25XaXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhuZXdTY3JvbGxQb3NpdGlvbik7Cit9 CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShBU1lOQ19TQ1JP TExJTkcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmgKaW5kZXggYTliMzI1NzgxOGM5ZTg1 YTc1MDBkZGVmNmNiNzVhMWNkYzNjOGRhNS4uZDRlNjVhNjA5NTFhNWVkYTNlNDJjZTE5OWUxODA3 NzE0MDcxZDNiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuaApAQCAtNDYsNyArNDYs NyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHBhcmVudFNjcm9sbFBvc2l0aW9uRGlkQ2hh bmdlKGNvbnN0IEZsb2F0UmVjdCYgLyp2aWV3cG9ydFJlY3QqLywgY29uc3QgRmxvYXRTaXplJiAv KmN1bXVsYXRpdmVEZWx0YSovKSBvdmVycmlkZSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBoYW5k bGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpID0gMDsKLSAgICB2aXJ0dWFs IHZvaWQgc2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgRmxvYXRQb2ludCYpID0gMDsKKyAgICB2aXJ0 dWFsIHZvaWQgc2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgRmxvYXRQb2ludCYpOwogICAgIHZpcnR1 YWwgdm9pZCBzZXRTY3JvbGxQb3NpdGlvbldpdGhvdXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKGNv bnN0IEZsb2F0UG9pbnQmKSA9IDA7CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTGF5ZXJzQWZ0 ZXJWaWV3cG9ydENoYW5nZShjb25zdCBGbG9hdFJlY3QmIHZpZXdwb3J0UmVjdCwgZG91YmxlIHNj YWxlKSA9IDA7CkBAIC01OCw2ICs1OCw5IEBAIHB1YmxpYzoKIHByb3RlY3RlZDoKICAgICBTY3Jv bGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ1RyZWUmLCBTY3JvbGxpbmdOb2Rl SUQpOwogCisgICAgdm9pZCBzY3JvbGxCeShjb25zdCBGbG9hdFNpemUmKTsKKyAgICB2b2lkIHNj cm9sbEJ5V2l0aG91dENvbnRlbnRFZGdlQ29uc3RyYWludHMoY29uc3QgRmxvYXRTaXplJik7CisK ICAgICBmbG9hdCBmcmFtZVNjYWxlRmFjdG9yKCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZVNjYWxl RmFjdG9yOyB9CiAgICAgaW50IGhlYWRlckhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1faGVhZGVy SGVpZ2h0OyB9CiAgICAgaW50IGZvb3RlckhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9vdGVy SGVpZ2h0OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaAppbmRleCA2ZmVlY2ZjYTdkZDVjM2FlZTQ2NDg2 ZDYyN2Q1OTk0ZjIzZmQxOWRkLi44YTAxZjVmMThmODRkN2U1Y2MzNDQ1NmRmOGQ1N2I0YTQ0NWNj MjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmgKQEAgLTY0LDcgKzY0LDcgQEAgcHJvdGVjdGVkOgog CiAgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbExheWVyUG9zaXRpb24oY29uc3QgRmxvYXRQb2lu dCYpID0gMDsKIAotICAgIGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uKCkgY29uc3Qg eyByZXR1cm4gbV9zY3JvbGxQb3NpdGlvbjsgfQorICAgIHZpcnR1YWwgRmxvYXRQb2ludCBzY3Jv bGxQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsUG9zaXRpb247IH0KICAgICBjb25z dCBGbG9hdFNpemUmIHNjcm9sbGFibGVBcmVhU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xs YWJsZUFyZWFTaXplOyB9CiAgICAgY29uc3QgRmxvYXRTaXplJiB0b3RhbENvbnRlbnRzU2l6ZSgp IGNvbnN0IHsgcmV0dXJuIG1fdG90YWxDb250ZW50c1NpemU7IH0KICAgICBjb25zdCBJbnRQb2lu dCYgc2Nyb2xsT3JpZ2luKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxPcmlnaW47IH0KQEAgLTg3 LDcgKzg3LDcgQEAgcHJpdmF0ZToKICAgICBGbG9hdFNpemUgbV9zY3JvbGxhYmxlQXJlYVNpemU7 CiAgICAgRmxvYXRTaXplIG1fdG90YWxDb250ZW50c1NpemU7CiAgICAgRmxvYXRTaXplIG1fdG90 YWxDb250ZW50c1NpemVGb3JSdWJiZXJCYW5kOwotICAgIEZsb2F0UG9pbnQgbV9zY3JvbGxQb3Np dGlvbjsKKyAgICBGbG9hdFBvaW50IG1fc2Nyb2xsUG9zaXRpb247IC8vIEZJWE1FOiB0aGlzIGlz IHRoZSBjb21taXR0ZWQgc2Nyb2xsIHBvc2l0aW9uLgogICAgIEludFBvaW50IG1fc2Nyb2xsT3Jp Z2luOwogICAgIAogICAgIFNjcm9sbGFibGVBcmVhUGFyYW1ldGVycyBtX3Njcm9sbGFibGVBcmVh UGFyYW1ldGVyczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2lv cy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUy5oCmlu ZGV4IDVlYTc5ZjQzNmZhYzljZTQ0ZDA2YTNlNTYxNjczMzI5NGFiNjkzNzEuLmNhZmQ5NzE1MjA1 YWI0ZDFkNDJhZTYwYTI3YjY3N2YwOWRjODYzMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVGcmFt ZVNjcm9sbGluZ05vZGVJT1MuaApAQCAtNDgsOCArNDgsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdmly dHVhbCB2b2lkIHVwZGF0ZUFmdGVyQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJikg b3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZv cm1XaGVlbEV2ZW50Jikgb3ZlcnJpZGUgeyB9CiAKLSAgICBGbG9hdFBvaW50IHNjcm9sbFBvc2l0 aW9uKCkgY29uc3Q7Ci0gICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbFBvc2l0aW9uKGNvbnN0IEZs b2F0UG9pbnQmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIEZsb2F0UG9pbnQgc2Nyb2xsUG9zaXRp b24oKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsUG9zaXRpb25X aXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhjb25zdCBGbG9hdFBvaW50Jikgb3ZlcnJpZGU7 CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5nZShjb25z dCBGbG9hdFJlY3QmIHZpZXdwb3J0UmVjdCwgZG91YmxlIHNjYWxlKTsKQEAgLTYwLDkgKzU5LDYg QEAgcHJvdGVjdGVkOgogICAgIEZsb2F0UG9pbnQgbWluaW11bVNjcm9sbFBvc2l0aW9uKCkgY29u c3Q7CiAgICAgRmxvYXRQb2ludCBtYXhpbXVtU2Nyb2xsUG9zaXRpb24oKSBjb25zdDsKIAotICAg IHZvaWQgc2Nyb2xsQnkoY29uc3QgSW50U2l6ZSYpOwotICAgIHZvaWQgc2Nyb2xsQnlXaXRob3V0 Q29udGVudEVkZ2VDb25zdHJhaW50cyhjb25zdCBJbnRTaXplJik7Ci0KIHByaXZhdGU6CiAgICAg dm9pZCB1cGRhdGVDaGlsZE5vZGVzQWZ0ZXJTY3JvbGwoY29uc3QgRmxvYXRQb2ludCYpOwogICAg IENBTGF5ZXIgKnNjcm9sbExheWVyKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxMYXllci5nZXQo KTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9s bGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUy5tbQppbmRleCBi YjhjZjUyOTg3YTkyMGQzYTBkNDA4MDdkZTNkZjEzZDZkYjMyZWIyLi44YTk2OTdkZWQ0MzEzOWJh MTU2ZTVhNWQ5MTc3MzM4OGE4MDQ0MmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUy5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Ny b2xsaW5nTm9kZUlPUy5tbQpAQCAtMTA2LDE1ICsxMDYsNiBAQCBGbG9hdFBvaW50IFNjcm9sbGlu Z1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1M6OnNjcm9sbFBvc2l0aW9uKCkgY29uc3QKICAgICBy ZXR1cm4gSW50UG9pbnQoLXNjcm9sbExheWVyUG9zaXRpb24ueCArIHNjcm9sbE9yaWdpbigpLngo KSwgLXNjcm9sbExheWVyUG9zaXRpb24ueSArIHNjcm9sbE9yaWdpbigpLnkoKSk7CiB9CiAKLXZv aWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUzo6c2V0U2Nyb2xsUG9zaXRpb24o Y29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24pCi17Ci0gICAgRmxvYXRQb2ludCBuZXdT Y3JvbGxQb3NpdGlvbiA9IHNjcm9sbFBvc2l0aW9uOwotICAgIG5ld1Njcm9sbFBvc2l0aW9uID0g bmV3U2Nyb2xsUG9zaXRpb24uc2hydW5rVG8obWF4aW11bVNjcm9sbFBvc2l0aW9uKCkpOwotICAg IG5ld1Njcm9sbFBvc2l0aW9uID0gbmV3U2Nyb2xsUG9zaXRpb24uZXhwYW5kZWRUbyhtaW5pbXVt U2Nyb2xsUG9zaXRpb24oKSk7Ci0KLSAgICBzZXRTY3JvbGxQb3NpdGlvbldpdGhvdXRDb250ZW50 RWRnZUNvbnN0cmFpbnRzKG5ld1Njcm9sbFBvc2l0aW9uKTsKLX0KLQogdm9pZCBTY3JvbGxpbmdU cmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TOjpzZXRTY3JvbGxQb3NpdGlvbldpdGhvdXRDb250ZW50 RWRnZUNvbnN0cmFpbnRzKGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uKQogewogICAg IGlmIChzaG91bGRVcGRhdGVTY3JvbGxMYXllclBvc2l0aW9uU3luY2hyb25vdXNseSgpKSB7CkBA IC0yMTEsMTYgKzIwMiw2IEBAIEZsb2F0UG9pbnQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZUlPUzo6bWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3QKICAgICByZXR1cm4gcG9zaXRp b247CiB9CiAKLXZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUzo6c2Nyb2xs QnkoY29uc3QgSW50U2l6ZSYgb2Zmc2V0KQotewotICAgIHNldFNjcm9sbFBvc2l0aW9uKHNjcm9s bFBvc2l0aW9uKCkgKyBvZmZzZXQpOwotfQotCi12b2lkIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9s bGluZ05vZGVJT1M6OnNjcm9sbEJ5V2l0aG91dENvbnRlbnRFZGdlQ29uc3RyYWludHMoY29uc3Qg SW50U2l6ZSYgb2Zmc2V0KQotewotICAgIHNldFNjcm9sbFBvc2l0aW9uV2l0aG91dENvbnRlbnRF ZGdlQ29uc3RyYWludHMoc2Nyb2xsUG9zaXRpb24oKSArIG9mZnNldCk7Ci19Ci0KIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZy YW1lU2Nyb2xsaW5nTm9kZU1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFj L1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMuaAppbmRleCA3ZGZlYWY2MzYzZTBm OTFiYWZkODcwZWE3ODcxZjgzMTg4N2JhNjQ0Li5lZDY5MWU5N2NkM2NiOTNiYTA0NGY5NjkyZjU0 YTQ3YjdhMTZlNTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9t YWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFj LmgKQEAgLTY1LDcgKzY1LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc3RvcFNuYXBS dWJiZXJiYW5kVGltZXIoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2Nyb2xs UG9zaXRpb25Ub0JvdW5kc0lmTmVjZXNzYXJ5KCkgb3ZlcnJpZGU7CiAKLSAgICBGbG9hdFBvaW50 IHNjcm9sbFBvc2l0aW9uKCkgY29uc3Q7CisgICAgdmlydHVhbCBGbG9hdFBvaW50IHNjcm9sbFBv c2l0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbFBvc2l0 aW9uKGNvbnN0IEZsb2F0UG9pbnQmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Ny b2xsUG9zaXRpb25XaXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhjb25zdCBGbG9hdFBvaW50 Jikgb3ZlcnJpZGU7CiAKQEAgLTc2LDkgKzc2LDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIEZs b2F0UG9pbnQgbWluaW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmly dHVhbCBGbG9hdFBvaW50IG1heGltdW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0IG92ZXJyaWRlOwog Ci0gICAgdm9pZCBzY3JvbGxCeShjb25zdCBJbnRTaXplJik7Ci0gICAgdm9pZCBzY3JvbGxCeVdp dGhvdXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKGNvbnN0IEludFNpemUmKTsKLQogICAgIHZvaWQg dXBkYXRlTWFpbkZyYW1lUGluU3RhdGUoY29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24p OwogCiAgICAgdm9pZCBsb2dFeHBvc2VkVW5maWxsZWRBcmVhKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdU cmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tCmluZGV4IDNjOTg4MWQxOGNmYzYxODY0YzUyZTky ZDY1Yjg0OWVkYThhNjVhNDkuLjI3ZTAwOWQ2YWU3OGZkMDhmMTNlODdjOGI4MDZjYTYyOGYwOWY4 ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxp bmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tCkBAIC0x MDksNyArMTA5LDcgQEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjOjp1 cGRhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGEKICAgICAgICAgICAgICAgICBt X3Byb2JhYmxlTWFpblRocmVhZFNjcm9sbFBvc2l0aW9uID0gc2Nyb2xsaW5nU3RhdGVOb2RlLnJl cXVlc3RlZFNjcm9sbFBvc2l0aW9uKCk7CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAg ICAgICBDR1BvaW50IHNjcm9sbExheWVyUG9zaXRpb24gPSBtX3Njcm9sbExheWVyLmdldCgpLnBv c2l0aW9uOwotICAgICAgICAgICAgICAgIG1fcHJvYmFibGVNYWluVGhyZWFkU2Nyb2xsUG9zaXRp b24gPSBJbnRQb2ludCgtc2Nyb2xsTGF5ZXJQb3NpdGlvbi54LCAtc2Nyb2xsTGF5ZXJQb3NpdGlv bi55KTsKKyAgICAgICAgICAgICAgICBtX3Byb2JhYmxlTWFpblRocmVhZFNjcm9sbFBvc2l0aW9u ID0gRmxvYXRQb2ludCgtc2Nyb2xsTGF5ZXJQb3NpdGlvbi54LCAtc2Nyb2xsTGF5ZXJQb3NpdGlv bi55KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCkBAIC0yNjIsMTIgKzI2MiwxMiBAQCBJ bnRQb2ludCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjOjphYnNvbHV0ZVNjcm9s bFBvc2l0aW9uKCkKIAogdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjOjpp bW1lZGlhdGVTY3JvbGxCeShjb25zdCBGbG9hdFNpemUmIG9mZnNldCkKIHsKLSAgICBzY3JvbGxC eShyb3VuZGVkSW50U2l6ZShvZmZzZXQpKTsKKyAgICBzY3JvbGxCeShvZmZzZXQpOwogfQogCiB2 b2lkIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWM6OmltbWVkaWF0ZVNjcm9sbEJ5 V2l0aG91dENvbnRlbnRFZGdlQ29uc3RyYWludHMoY29uc3QgRmxvYXRTaXplJiBvZmZzZXQpCiB7 Ci0gICAgc2Nyb2xsQnlXaXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhyb3VuZGVkSW50U2l6 ZShvZmZzZXQpKTsKKyAgICBzY3JvbGxCeVdpdGhvdXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKG9m ZnNldCk7CiB9CiAKIHZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYzo6c3Rh cnRTbmFwUnViYmVyYmFuZFRpbWVyKCkKQEAgLTMxNSwxNiArMzE1LDEyIEBAIEZsb2F0UG9pbnQg U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYzo6c2Nyb2xsUG9zaXRpb24oKSBjb25z dAogICAgICAgICByZXR1cm4gbV9wcm9iYWJsZU1haW5UaHJlYWRTY3JvbGxQb3NpdGlvbjsKIAog ICAgIENHUG9pbnQgc2Nyb2xsTGF5ZXJQb3NpdGlvbiA9IG1fc2Nyb2xsTGF5ZXIuZ2V0KCkucG9z aXRpb247Ci0gICAgcmV0dXJuIEludFBvaW50KC1zY3JvbGxMYXllclBvc2l0aW9uLnggKyBzY3Jv bGxPcmlnaW4oKS54KCksIC1zY3JvbGxMYXllclBvc2l0aW9uLnkgKyBzY3JvbGxPcmlnaW4oKS55 KCkpOworICAgIHJldHVybiBGbG9hdFBvaW50KC1zY3JvbGxMYXllclBvc2l0aW9uLnggKyBzY3Jv bGxPcmlnaW4oKS54KCksIC1zY3JvbGxMYXllclBvc2l0aW9uLnkgKyBzY3JvbGxPcmlnaW4oKS55 KCkpOwogfQogCiB2b2lkIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWM6OnNldFNj cm9sbFBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uKQogewotICAgIEZs b2F0UG9pbnQgbmV3U2Nyb2xsUG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbjsKLSAgICBuZXdTY3Jv bGxQb3NpdGlvbiA9IG5ld1Njcm9sbFBvc2l0aW9uLnNocnVua1RvKG1heGltdW1TY3JvbGxQb3Np dGlvbigpKTsKLSAgICBuZXdTY3JvbGxQb3NpdGlvbiA9IG5ld1Njcm9sbFBvc2l0aW9uLmV4cGFu ZGVkVG8obWluaW11bVNjcm9sbFBvc2l0aW9uKCkpOwotCi0gICAgc2V0U2Nyb2xsUG9zaXRpb25X aXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhuZXdTY3JvbGxQb3NpdGlvbik7CisgICAgU2Ny b2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0U2Nyb2xsUG9zaXRpb24oc2Nyb2xsUG9z aXRpb24pOwogCiAgICAgaWYgKHNjcm9sbGluZ1RyZWUoKS5zY3JvbGxpbmdQZXJmb3JtYW5jZUxv Z2dpbmdFbmFibGVkKCkpCiAgICAgICAgIGxvZ0V4cG9zZWRVbmZpbGxlZEFyZWEoKTsKQEAgLTQ0 MywxNiArNDM5LDYgQEAgRmxvYXRQb2ludCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl TWFjOjptYXhpbXVtU2Nyb2xsUG9zaXRpb24oKSBjb25zdAogICAgIHJldHVybiBwb3NpdGlvbjsK IH0KIAotdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjOjpzY3JvbGxCeShj b25zdCBJbnRTaXplJiBvZmZzZXQpCi17Ci0gICAgc2V0U2Nyb2xsUG9zaXRpb24oc2Nyb2xsUG9z aXRpb24oKSArIG9mZnNldCk7Ci19Ci0KLXZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZU1hYzo6c2Nyb2xsQnlXaXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhjb25zdCBJbnRT aXplJiBvZmZzZXQpCi17Ci0gICAgc2V0U2Nyb2xsUG9zaXRpb25XaXRob3V0Q29udGVudEVkZ2VD b25zdHJhaW50cyhzY3JvbGxQb3NpdGlvbigpICsgb2Zmc2V0KTsKLX0KLQogdm9pZCBTY3JvbGxp bmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjOjp1cGRhdGVNYWluRnJhbWVQaW5TdGF0ZShjb25z dCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbikKIHsKICAgICBib29sIHBpbm5lZFRvVGhlTGVm dCA9IHNjcm9sbFBvc2l0aW9uLngoKSA8PSBtaW5pbXVtU2Nyb2xsUG9zaXRpb24oKS54KCk7Cg==