136558 2014-09-04 16:35:57 -0700 ScrollablArea::handleWheelEvent() should return early if the ScrollableArea is not actually scrollable 2014-09-05 11:55:04 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin sam simon.fraser thorton oldest_to_newest 1033347 0 bdakin 2014-09-04 16:35:57 -0700 ScrollablArea::handleWheelEvent() should return early if the ScrollableArea is not actually scrollable 1033352 1 237659 bdakin 2014-09-04 16:45:35 -0700 Created attachment 237659 Patch 1033504 2 bdakin 2014-09-05 11:55:04 -0700 Thanks Simon! http://trac.webkit.org/changeset/173320 237659 2014-09-04 16:45:35 -0700 2014-09-04 16:56:57 -0700 Patch for-review.txt text/plain 12210 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzI4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDYxIEBACisyMDE0LTA5LTA0ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBTY3JvbGxhYmxBcmVhOjpoYW5kbGVX aGVlbEV2ZW50KCkgc2hvdWxkIHJldHVybiBlYXJseSBpZiB0aGUgU2Nyb2xsYWJsZUFyZWEgaXMg bm90IAorICAgICAgICBhY3R1YWxseSBzY3JvbGxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY1NTgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHJlcXVpcmVzIGFkZGluZyBhIG5l dyB2aXJ0dWFsIGZ1bmN0aW9uIHRvIFNjcm9sbGFibGVBcmVhIGNhbGxlZCAKKyAgICAgICAgaXNT Y3JvbGxhYmxlT3JSdWJiZXJiYW5kYWJsZSgpLiBVbmZvcnR1bmF0ZWx5LCB0aGVyZSBpcyBhbHJl YWR5IGEgdmlydHVhbCBmdW5jdGlvbiAKKyAgICAgICAgb2YgdGhhdCBuYW1lIHRoYXQgZXhpc3Rz IG9uIFJlbmRlckxheWVyTW9kZWxPYmplY3QsIHdoaWNoIGlzIG9ubHkgcHJvYmxlbWF0aWMgCisg ICAgICAgIGJlY2F1c2UgUmVuZGVyTGlzdEJveCBpbmhlcml0cyBmcm9tIGJvdGggUmVuZGVyTGF5 ZXJNb2RlbE9iamVjdCBhbmQgCisgICAgICAgIFNjcm9sbGFibGVBcmVhLiBUaGlzIHBhdGNoIHJl c29sdmVzIHRoYXQgY29uZmxpY3QgaW4gdGhlIHNpbXBsZXN0IHdheSwgYnkgcmUtCisgICAgICAg IG5hbWluZyB0aGUgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCB2ZXJzaW9uIG9mIHRoZSBmdW5jdGlv biB0byAKKyAgICAgICAgaXNTY3JvbGxhYmxlT3JSdWJiZXJiYW5kYWJsZUJveCgpLiBJdOKAmXMg YSBsaXR0bGUgdW5mb3J0dW5hdGUsIGJ1dCBzaW1wbGVyIHRoYW4gdGhlIAorICAgICAgICBvdGhl ciBzb2x1dGlvbnMgSSBjYW1lIHVwIHdpdGguCisKKyAgICAgICAgTmV3IFNjcm9sbGFibGVBcmVh IHZpcnR1YWwgZnVuY3Rpb24uCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojppc1Njcm9sbGFibGVPclJ1YmJlcmJhbmRhYmxlKToKKyAg ICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorCisgICAgICAgIFRoZSBwb2ludCBvZiB0aGUgd2hv bGUgcGF0Y2ghIFJldHVybiBlYXJseSBpZiB5b3UgY2Fu4oCZdCBzY3JvbGwgb3IgcnViYmVyIGJh bmQuCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsYWJsZUFyZWE6OmhhbmRsZVdoZWVsRXZlbnQpOgorCisgICAgICAgIE5ldyBT Y3JvbGxhYmxlQXJlYSB2aXJ0dWFsIGZ1bmN0aW9uLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9s bGFibGVBcmVhLmg6CisgICAgICAgICogcGxhdGZvcm0vd2luL1BvcHVwTWVudVdpbi5oOgorCisg ICAgICAgIFJlLW5hbWUuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmlzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGVCb3gp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojppc1Njcm9sbGFibGVPclJ1YmJlcmJhbmRh YmxlKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKKyAgICAg ICAgSW1wbGVtZW50IG5ldyBTY3JvbGxhYmxlQXJlYSB2aXJ0dWFsIGZ1bmN0aW9uLCBhbmQgYWRh cHQgdG8gdGhlIHJlLW5hbWUuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjppc1Njcm9sbGFibGVPclJ1YmJlcmJhbmRh YmxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpoYXNTY3JvbGxhYmxlT3JSdWJi ZXJiYW5kYWJsZUFuY2VzdG9yKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoK KworICAgICAgICBSZS1uYW1lLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllck1vZGVs T2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllck1vZGVsT2JqZWN0Ojppc1Nj cm9sbGFibGVPclJ1YmJlcmJhbmRhYmxlQm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyTW9kZWxPYmplY3Q6OmlzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGUpOiBEZWxldGVkLgor CisgICAgICAgIEltcGxlbWVudCBTY3JvbGxhYmxlQXJlYSB2aXJ0dWFsIGZ1bmN0aW9uLgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxpc3RCb3g6OmlzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGUpOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJMaXN0Qm94Lmg6CisKKyAgICAgICAgUmUtbmFtZS4KKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3Ojpp c1Njcm9sbGFibGVPclJ1YmJlcmJhbmRhYmxlQm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clZpZXc6OmlzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGUpOiBEZWxldGVkLgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJWaWV3Lmg6CisKIDIwMTQtMDktMDQgIEVucmljYSBDYXN1Y2NpICA8 ZW5yaWNhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgUExBVEZPUk0oSU9TKSBmcm9tIFdl YkNvcmUvZWRpdGluZyAoUGFydCAyKS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJ KHJldmlzaW9uIDE3MzI3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzMzOSw2ICszMzM5LDExIEBAIGJvb2wgRnJhbWVWaWV3Ojppc1Nj cm9sbGFibGUoU2Nyb2xsYWJpbGkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorYm9vbCBGcmFtZVZp ZXc6OmlzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGUoKQoreworICAgIHJldHVybiBmcmFtZSgp LmlzTWFpbkZyYW1lKCkgPyBpc1Njcm9sbGFibGUoU2Nyb2xsYWJpbGl0eTo6U2Nyb2xsYWJsZU9y UnViYmVyYmFuZGFibGUpIDogaXNTY3JvbGxhYmxlKFNjcm9sbGFiaWxpdHk6OlNjcm9sbGFibGUp OworfQorCiBib29sIEZyYW1lVmlldzo6aGFzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGVBbmNl c3RvcigpCiB7CiAgICAgaWYgKGZyYW1lKCkuaXNNYWluRnJhbWUoKSkKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuaAkocmV2aXNpb24gMTczMjc0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNDAzLDYgKzQwMyw4IEBAIHB1YmxpYzoKICAg ICAvLyBjYWxsZXJzIHVzZSBTY3JvbGxhYmlsaXR5OjpTY3JvbGxhYmxlT3JSdWJiZXJiYW5kYWJs ZS4KICAgICBlbnVtIGNsYXNzIFNjcm9sbGFiaWxpdHkgeyBTY3JvbGxhYmxlLCBTY3JvbGxhYmxl T3JSdWJiZXJiYW5kYWJsZSB9OwogICAgIGJvb2wgaXNTY3JvbGxhYmxlKFNjcm9sbGFiaWxpdHkg ZGVmaW5pdGlvbk9mU2Nyb2xsYWJsZSA9IFNjcm9sbGFiaWxpdHk6OlNjcm9sbGFibGUpOworCisg ICAgdmlydHVhbCBib29sIGlzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGUoKSBvdmVycmlkZTsK ICAgICB2aXJ0dWFsIGJvb2wgaGFzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGVBbmNlc3Rvcigp IG92ZXJyaWRlOwogCiAgICAgZW51bSBTY3JvbGxiYXJNb2Rlc0NhbGN1bGF0aW9uU3RyYXRlZ3kg eyBSdWxlc0Zyb21XZWJDb250ZW50T25seSwgQW55UnVsZSB9OwpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcAkocmV2aXNpb24gMTczMjc0KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xODUsNiArMTg1LDkgQEAgdm9pZCBTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsUG9zaXRpb25DaGFu ZwogCiBib29sIFNjcm9sbGFibGVBcmVhOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3Jt V2hlZWxFdmVudCYgd2hlZWxFdmVudCkKIHsKKyAgICBpZiAoIWlzU2Nyb2xsYWJsZU9yUnViYmVy YmFuZGFibGUoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgcmV0dXJuIHNjcm9sbEFu aW1hdG9yKCktPmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7CiB9CiAKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAkocmV2aXNpb24gMTczMjc0KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAkod29ya2luZyBjb3B5KQpA QCAtMjA3LDYgKzIwNyw3IEBAIHB1YmxpYzoKICAgICAvLyBOb3RlIHRoYXQgdGhpcyBvbmx5IHJl dHVybnMgc2Nyb2xsYWJsZSBhcmVhcyB0aGF0IGNhbiBhY3R1YWxseSBiZSBzY3JvbGxlZC4KICAg ICB2aXJ0dWFsIFNjcm9sbGFibGVBcmVhKiBlbmNsb3NpbmdTY3JvbGxhYmxlQXJlYSgpIGNvbnN0 ID0gMDsKIAorICAgIHZpcnR1YWwgYm9vbCBpc1Njcm9sbGFibGVPclJ1YmJlcmJhbmRhYmxlKCkg PSAwOwogICAgIHZpcnR1YWwgYm9vbCBoYXNTY3JvbGxhYmxlT3JSdWJiZXJiYW5kYWJsZUFuY2Vz dG9yKCkgPSAwOwogCiAgICAgLy8gUmV0dXJucyB0aGUgYm91bmRpbmcgYm94IG9mIHRoaXMgc2Ny b2xsYWJsZSBhcmVhLCBpbiB0aGUgY29vcmRpbmF0ZSBzeXN0ZW0gb2YgdGhlIGVuY2xvc2luZyBz Y3JvbGwgdmlldy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9Qb3B1cE1lbnVX aW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vUG9wdXBNZW51 V2luLmgJKHJldmlzaW9uIDE3MzI3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9Q b3B1cE1lbnVXaW4uaAkod29ya2luZyBjb3B5KQpAQCAtOTUsNiArOTUsNyBAQCBwcml2YXRlOgog ICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRlU2Nyb2xsQ29ybmVyUmVjdChjb25zdCBJbnRSZWN0 Jikgb3ZlcnJpZGUgeyB9CiAgICAgdmlydHVhbCBib29sIGlzQWN0aXZlKCkgY29uc3Qgb3ZlcnJp ZGUgeyByZXR1cm4gdHJ1ZTsgfQogICAgIFNjcm9sbGFibGVBcmVhKiBlbmNsb3NpbmdTY3JvbGxh YmxlQXJlYSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIDA7IH0KKyAgICB2aXJ0dWFsIGJvb2wg aXNTY3JvbGxhYmxlT3JSdWJiZXJiYW5kYWJsZSgpIG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0K ICAgICB2aXJ0dWFsIGJvb2wgaGFzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGVBbmNlc3Rvcigp IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTY3JvbGxDb3Ju ZXJWaXNpYmxlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFs IEludFJlY3Qgc2Nyb2xsQ29ybmVyUmVjdCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIEludFJl Y3QoKTsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAJKHJldmlz aW9uIDE3MzI3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC04NDMsNyArODQzLDcgQEAgYm9vbCBSZW5kZXJCb3g6OmNhbkJlU2Ny b2xsZWRBbmRIYXNTY3JvbAogICAgIHJldHVybiBjYW5CZVByb2dyYW1hdGljYWxseVNjcm9sbGVk KCkgJiYgKHNjcm9sbEhlaWdodCgpICE9IGNsaWVudEhlaWdodCgpIHx8IHNjcm9sbFdpZHRoKCkg IT0gY2xpZW50V2lkdGgoKSk7CiB9CiAKLWJvb2wgUmVuZGVyQm94Ojppc1Njcm9sbGFibGVPclJ1 YmJlcmJhbmRhYmxlKCkgY29uc3QKK2Jvb2wgUmVuZGVyQm94Ojppc1Njcm9sbGFibGVPclJ1YmJl cmJhbmRhYmxlQm94KCkgY29uc3QKIHsKICAgICByZXR1cm4gY2FuQmVTY3JvbGxlZEFuZEhhc1Nj cm9sbGFibGVBcmVhKCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5o CShyZXZpc2lvbiAxNzMyNzQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmgJKHdvcmtpbmcgY29weSkKQEAgLTY2Miw3ICs2NjIsNyBAQCBwcml2YXRlOgogICAgIGJvb2wg aW5jbHVkZVZlcnRpY2FsU2Nyb2xsYmFyU2l6ZSgpIGNvbnN0OwogICAgIGJvb2wgaW5jbHVkZUhv cml6b250YWxTY3JvbGxiYXJTaXplKCkgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIGJvb2wgaXNTY3Jv bGxhYmxlT3JSdWJiZXJiYW5kYWJsZSgpIGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgYm9v bCBpc1Njcm9sbGFibGVPclJ1YmJlcmJhbmRhYmxlQm94KCkgY29uc3Qgb3ZlcnJpZGU7CiAKICAg ICAvLyBSZXR1cm5zIHRydWUgaWYgd2UgZGlkIGEgZnVsbCByZXBhaW50CiAgICAgYm9vbCByZXBh aW50TGF5ZXJSZWN0c0ZvckltYWdlKFdyYXBwZWRJbWFnZVB0ciBpbWFnZSwgY29uc3QgRmlsbExh eWVyKiBsYXllcnMsIGJvb2wgZHJhd2luZ0JhY2tncm91bmQpOwpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCShyZXZpc2lvbiAxNzMyNzUpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDU1 LDEwICszMDU1LDE1IEBAIFNjcm9sbGFibGVBcmVhKiBSZW5kZXJMYXllcjo6ZW5jbG9zaW5nU2MK ICAgICByZXR1cm4gMDsKIH0KIAorYm9vbCBSZW5kZXJMYXllcjo6aXNTY3JvbGxhYmxlT3JSdWJi ZXJiYW5kYWJsZSgpCit7CisgICAgcmV0dXJuIHJlbmRlcmVyKCkuaXNTY3JvbGxhYmxlT3JSdWJi ZXJiYW5kYWJsZUJveCgpOworfQorCiBib29sIFJlbmRlckxheWVyOjpoYXNTY3JvbGxhYmxlT3JS dWJiZXJiYW5kYWJsZUFuY2VzdG9yKCkKIHsKICAgICBmb3IgKFJlbmRlckxheWVyKiBuZXh0TGF5 ZXIgPSBwYXJlbnRMYXllckNyb3NzRnJhbWUodGhpcyk7IG5leHRMYXllcjsgbmV4dExheWVyID0g cGFyZW50TGF5ZXJDcm9zc0ZyYW1lKG5leHRMYXllcikpIHsKLSAgICAgICAgaWYgKG5leHRMYXll ci0+cmVuZGVyZXIoKS5pc1Njcm9sbGFibGVPclJ1YmJlcmJhbmRhYmxlKCkpCisgICAgICAgIGlm IChuZXh0TGF5ZXItPmlzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGUoKSkKICAgICAgICAgICAg IHJldHVybiB0cnVlOwogICAgIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmgJKHJldmlzaW9uIDE3MzI3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5oCSh3b3JraW5nIGNvcHkpCkBAIC00MzksNiArNDM5LDcgQEAgcHVibGljOgog ICAgIHZpcnR1YWwgU2Nyb2xsYmFyKiBob3Jpem9udGFsU2Nyb2xsYmFyKCkgY29uc3Qgb3ZlcnJp ZGUgeyByZXR1cm4gbV9oQmFyLmdldCgpOyB9CiAgICAgdmlydHVhbCBTY3JvbGxiYXIqIHZlcnRp Y2FsU2Nyb2xsYmFyKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV92QmFyLmdldCgpOyB9CiAg ICAgdmlydHVhbCBTY3JvbGxhYmxlQXJlYSogZW5jbG9zaW5nU2Nyb2xsYWJsZUFyZWEoKSBjb25z dCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGJvb2wgaXNTY3JvbGxhYmxlT3JSdWJiZXJiYW5kYWJs ZSgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBoYXNTY3JvbGxhYmxlT3JSdWJiZXJiYW5k YWJsZUFuY2VzdG9yKCkgb3ZlcnJpZGU7CiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkKICAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlU25hcE9mZnNldHMoKSBvdmVycmlkZTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyTW9kZWxPYmplY3QuaAkocmV2 aXNpb24gMTczMjc0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyTW9k ZWxPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtNDksNyArNDksNyBAQCBwdWJsaWM6CiAgICAg Ly8gVGhlIHF1ZXJ5IHJlY3QgaXMgZ2l2ZW4gaW4gbG9jYWwgY29vcmRpbmF0ZSBzeXN0ZW0uCiAg ICAgdmlydHVhbCBib29sIGJhY2tncm91bmRJc0tub3duVG9CZU9wYXF1ZUluUmVjdChjb25zdCBM YXlvdXRSZWN0JikgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIAotICAgIHZpcnR1YWwgYm9vbCBp c1Njcm9sbGFibGVPclJ1YmJlcmJhbmRhYmxlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAg ICB2aXJ0dWFsIGJvb2wgaXNTY3JvbGxhYmxlT3JSdWJiZXJiYW5kYWJsZUJveCgpIGNvbnN0IHsg cmV0dXJuIGZhbHNlOyB9CiAKIHByb3RlY3RlZDoKICAgICBSZW5kZXJMYXllck1vZGVsT2JqZWN0 KEVsZW1lbnQmLCBQYXNzUmVmPFJlbmRlclN0eWxlPiwgdW5zaWduZWQgYmFzZVR5cGVGbGFncyk7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCShyZXZp c2lvbiAxNzMyNzQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTc4Nyw2ICs3ODcsMTEgQEAgU2Nyb2xsYWJsZUFyZWEqIFJl bmRlckxpc3RCb3g6OmVuY2xvc2luZwogICAgIHJldHVybiAwOwogfQogCitib29sIFJlbmRlckxp c3RCb3g6OmlzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGUoKQoreworICAgIHJldHVybiBtX3ZC YXI7Cit9CisKIGJvb2wgUmVuZGVyTGlzdEJveDo6aGFzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFi bGVBbmNlc3RvcigpCiB7CiAgICAgcmV0dXJuIGVuY2xvc2luZ0xheWVyKCkgJiYgZW5jbG9zaW5n TGF5ZXIoKS0+aGFzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGVBbmNlc3RvcigpOwpJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oCShyZXZpc2lvbiAxNzMyNzQp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMzEsNiArMTMxLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgZm9yY2VV cGRhdGVTY3JvbGxiYXJzT25NYWluVGhyZWFkRm9yUGVyZm9ybWFuY2VUZXN0aW5nKCkgY29uc3Qg b3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIFNjcm9sbGFibGVBcmVhKiBlbmNsb3NpbmdTY3JvbGxh YmxlQXJlYSgpIGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgYm9vbCBpc1Njcm9sbGFibGVP clJ1YmJlcmJhbmRhYmxlKCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBib29sIGhhc1Njcm9sbGFi bGVPclJ1YmJlcmJhbmRhYmxlQW5jZXN0b3IoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIEludFJl Y3Qgc2Nyb2xsYWJsZUFyZWFCb3VuZGluZ0JveCgpIGNvbnN0IG92ZXJyaWRlOwogCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCShyZXZpc2lvbiAxNzMyNzQpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTcwOCw3ICs3MDgsNyBAQCB2b2lkIFJlbmRlclZpZXc6OmNvbXB1dGVSZWN0Rm9yUmVwYWlu dChjCiAgICAgICAgIHJlY3QgPSBMYXlvdXRSZWN0KGxheWVyKCktPnRyYW5zZm9ybSgpLT5tYXBS ZWN0KHNuYXBSZWN0VG9EZXZpY2VQaXhlbHMocmVjdCwgZG9jdW1lbnQoKS5kZXZpY2VTY2FsZUZh Y3RvcigpKSkpOwogfQogCi1ib29sIFJlbmRlclZpZXc6OmlzU2Nyb2xsYWJsZU9yUnViYmVyYmFu ZGFibGUoKSBjb25zdAorYm9vbCBSZW5kZXJWaWV3Ojppc1Njcm9sbGFibGVPclJ1YmJlcmJhbmRh YmxlQm94KCkgY29uc3QKIHsKICAgICAvLyBUaGUgbWFpbiBmcmFtZSBtaWdodCBiZSBhbGxvd2Vk IHRvIHJ1YmJlci1iYW5kIGV2ZW4gaWYgdGhlcmUgaXMgbm8gY29udGVudCB0byBzY3JvbGwgdG8u IFRoaXMgaXMgdW5pcXVlIHRvCiAgICAgLy8gdGhlIG1haW4gZnJhbWU7IHN1YmZyYW1lcyBhbmQg b3ZlcmZsb3cgYXJlYXMgaGF2ZSB0byBoYXZlIGNvbnRlbnQgdGhhdCBjYW4gYmUgc2Nyb2xsZWQg dG8gaW4gb3JkZXIgdG8gcnViYmVyLWJhbmQuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJWaWV3LmgJKHJldmlzaW9uIDE3MzI3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTI5OSw3ICsyOTksNyBAQCBwcml2YXRl OgogICAgIGZyaWVuZCBjbGFzcyBMYXlvdXRTdGF0ZU1haW50YWluZXI7CiAgICAgZnJpZW5kIGNs YXNzIExheW91dFN0YXRlRGlzYWJsZXI7CiAKLSAgICB2aXJ0dWFsIGJvb2wgaXNTY3JvbGxhYmxl T3JSdWJiZXJiYW5kYWJsZSgpIGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgYm9vbCBpc1Nj cm9sbGFibGVPclJ1YmJlcmJhbmRhYmxlQm94KCkgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICB2b2lk IHNwbGl0U2VsZWN0aW9uQmV0d2VlblN1YnRyZWVzKFJlbmRlck9iamVjdCogc3RhcnQsIGludCBz dGFydFBvcywgUmVuZGVyT2JqZWN0KiBlbmQsIGludCBlbmRQb3MsIFNlbGVjdGlvblJlcGFpbnRN b2RlIGJsb2NrUmVwYWludE1vZGUpOwogICAgIHZvaWQgY2xlYXJTdWJ0cmVlU2VsZWN0aW9uKGNv bnN0IFNlbGVjdGlvblN1YnRyZWVSb290JiwgU2VsZWN0aW9uUmVwYWludE1vZGUsIE9sZFNlbGVj dGlvbkRhdGEmKTsK