77840 2012-02-05 16:31:25 -0800 The scrolling tree should be aware of any wheel event handlers on the page 2012-02-06 10:35:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca dglazkov kling levin+threading rgbbones webkit.review.bot oldest_to_newest 549631 0 andersca 2012-02-05 16:31:25 -0800 The scrolling tree should be aware of any wheel event handlers on the page 549632 1 125542 andersca 2012-02-05 16:33:27 -0800 Created attachment 125542 Patch 549633 2 125542 webkit.review.bot 2012-02-05 16:38:12 -0800 Comment on attachment 125542 Patch Attachment 125542 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11432060 549636 3 125542 kling 2012-02-05 16:42:24 -0800 Comment on attachment 125542 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125542&action=review r=me with cr build fixed. > Source/WebCore/page/scrolling/ScrollingTree.cpp:92 > + if (scrollingTreeState->changedProperties() | ScrollingTreeState::WheelEventHandlerCount) { You want & here. 549641 4 kling 2012-02-05 17:03:15 -0800 <http://trac.webkit.org/changeset/106766> 549651 5 kling 2012-02-05 17:35:11 -0800 http://trac.webkit.org/changeset/106767/trunk/Source/WebCore/dom/Document.cpp -> http://redct.info/reddit/ragefriends/requests/harpdarp.svg 549652 6 125542 rgbbones 2012-02-05 17:38:18 -0800 Comment on attachment 125542 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125542&action=review > Source/WebCore/dom/Document.cpp:5381 > + UNUSED_PARAM(document) On my machine this break build UNUSED_PARAM(document) -> UNUSED_PARAM(document); While this can got build on buildbot? 549653 7 rgbbones 2012-02-05 17:40:08 -0800 (In reply to comment #5) > http://trac.webkit.org/changeset/106767/trunk/Source/WebCore/dom/Document.cpp -> http://redct.info/reddit/ragefriends/requests/harpdarp.svg ok. I am late. 550094 8 andersca 2012-02-06 10:35:01 -0800 Committed r106766: <http://trac.webkit.org/changeset/106766> 125542 2012-02-05 16:33:27 -0800 2012-02-05 17:38:18 -0800 Patch bug-77840-20120205163353.patch text/plain 10770 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGM4MDFkZjkxOGU0YWNm MTI4Mzk4MTM2NjAxZDQzNWVlNDk4MjQzNy4uNzQxMDFlMWYxM2UwN2EyNjNhNTJhMmEyYzQxNDhj NzYxZGNjNDc3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTAyLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHNjcm9sbGlu ZyB0cmVlIHNob3VsZCBiZSBhd2FyZSBvZiBhbnkgd2hlZWwgZXZlbnQgaGFuZGxlcnMgb24gdGhl IHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3 ODQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYg dGhlcmUgYXJlIHdoZWVsIGV2ZW50IGhhbmRsZXJzIG9uIHRoZSBwYWdlLCBhbnkgd2hlZWwgZXZl bnRzIG11c3QgYmUgcmVkaXNwYXRjaGVkCisgICAgICAgIHRvIHRoZSBtYWluIHRocmVhZCBzbyB0 aGV5IGNhbiBnbyB0aHJvdWdoIHRoZSBET00gZXZlbnQgaGFuZGxpbmcuCisKKyAgICAgICAgKiBk b20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d2hlZWxFdmVudEhhbmRsZXJDb3Vu dENoYW5nZWQpOgorICAgICAgICBJbmZvcm0gdGhlIHNjcm9sbGluZyBjb29yZGluYXRvciB0aGF0 IHRoZSB3aGVlbCBldmVudCBjb3VudCBjaGFuZ2VkLgorCisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudDo6ZGlkQWRkV2hlZWxFdmVudEhhbmRsZXIpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OmRpZFJlbW92ZVdoZWVsRXZlbnRIYW5kbGVyKToKKyAgICAgICAgQ2FsbCB3aGVlbEV2ZW50 SGFuZGxlckNvdW50Q2hhbmdlZC4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nvb3JkaW5hdG9y OjpmcmFtZVZpZXdXaGVlbEV2ZW50SGFuZGxlckNvdW50Q2hhbmdlZCk6CisgICAgICAgIENhbGwg cmVjb21wdXRlV2hlZWxFdmVudEhhbmRsZXJDb3VudC4KKworICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsaW5nQ29vcmRpbmF0b3I6OnJlY29tcHV0ZVdoZWVsRXZlbnRIYW5kbGVyQ291bnQpOgorICAg ICAgICBVcGRhdGUgdGhlIHNjcm9sbGluZyB0cmVlIHN0YXRlLgorCisgICAgICAgICogcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdU cmVlOjpTY3JvbGxpbmdUcmVlKToKKyAgICAgICAgSW5pdGlhbGl6ZSBtX2hhc1doZWVsRXZlbnRI YW5kbGVycyB0byBmYWxzZS4KKworICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZTo6dHJ5 VG9IYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgSWYgbV9oYXNXaGVlbEV2ZW50SGFuZGxlcnMg aXMgdHJ1ZSwgYmFpbC4KKworICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZTo6Y29tbWl0 TmV3VHJlZVN0YXRlKToKKyAgICAgICAgVXBkYXRlIG1faGFzV2hlZWxFdmVudEhhbmRsZXJzLgor CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVN0YXRlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTdGF0ZTo6U2Nyb2xsaW5nVHJlZVN0YXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTdGF0ZTo6c2V0V2hlZWxFdmVudEhhbmRsZXJD b3VudCk6CisgICAgICAgIEFkZCBnZXR0ZXIgYW5kIHNldHRlciBmb3IgdGhlIHdoZWVsIGV2ZW50 IGhhbmRsZXIgY291bnQuCisKIDIwMTItMDItMDUgIEFuZHJlYXMgS2xpbmcgIDxhd2Vzb21la2xp bmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBtYXBwZWQgdnMgbm9uLW1hcHBlZCBhdHRy aWJ1dGUgZGlzdGluY3Rpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCBiMWU4YWM0MWQx NzM3NTViMTM2ODlkOWQ3ZjFhY2EzMTNjYjZhZDY4Li5jMDk1OTY3YTBiNjI3ZTZjYzJlNWU4ZWI0 ZmIwNGNhNTE5YzU3NDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTEzMiw2ICsxMzIs NyBAQAogI2luY2x1ZGUgIlNjcmlwdEVsZW1lbnQuaCIKICNpbmNsdWRlICJTY3JpcHRFdmVudExp c3RlbmVyLmgiCiAjaW5jbHVkZSAiU2NyaXB0UnVubmVyLmgiCisjaW5jbHVkZSAiU2Nyb2xsaW5n Q29vcmRpbmF0b3IuaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUgIlNl Y3VyaXR5UG9saWN5LmgiCiAjaW5jbHVkZSAiU2VnbWVudGVkU3RyaW5nLmgiCkBAIC01MzYwLDEy ICs1MzYxLDM1IEBAIFBhc3NSZWZQdHI8VG91Y2hMaXN0PiBEb2N1bWVudDo6Y3JlYXRlVG91Y2hM aXN0KEV4Y2VwdGlvbkNvZGUmKSBjb25zdAogfQogI2VuZGlmCiAKK3N0YXRpYyB2b2lkIHdoZWVs RXZlbnRIYW5kbGVyQ291bnRDaGFuZ2VkKERvY3VtZW50KiBkb2N1bWVudCkKK3sKKyNpZiBFTkFC TEUoVEhSRUFERURfU0NST0xMSU5HKQorICAgIFBhZ2UqIHBhZ2UgPSBkb2N1bWVudC0+cGFnZSgp OworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgU2Nyb2xsaW5nQ29vcmRp bmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gcGFnZS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3Io KTsKKyAgICBpZiAoIXNjcm9sbGluZ0Nvb3JkaW5hdG9yKQorICAgICAgICByZXR1cm47CisKKyAg ICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IGRvY3VtZW50LT52aWV3KCk7CisgICAgaWYgKCFmcmFt ZVZpZXcpCisgICAgICAgIHJldHVybjsKKworICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5mcmFt ZVZpZXdXaGVlbEV2ZW50SGFuZGxlckNvdW50Q2hhbmdlZChmcmFtZVZpZXcpOworI2Vsc2UKKyAg ICBVTlVTRURfUEFSQU0oZG9jdW1lbnQpCisjZW5kaWYKK30KKwogdm9pZCBEb2N1bWVudDo6ZGlk QWRkV2hlZWxFdmVudEhhbmRsZXIoKQogewogICAgICsrbV93aGVlbEV2ZW50SGFuZGxlckNvdW50 OwogICAgIEZyYW1lKiBtYWluRnJhbWUgPSBwYWdlKCkgPyBwYWdlKCktPm1haW5GcmFtZSgpIDog MDsKICAgICBpZiAobWFpbkZyYW1lKQogICAgICAgICBtYWluRnJhbWUtPm5vdGlmeUNocm9tZUNs aWVudFdoZWVsRXZlbnRIYW5kbGVyQ291bnRDaGFuZ2VkKCk7CisKKyAgICB3aGVlbEV2ZW50SGFu ZGxlckNvdW50Q2hhbmdlZCh0aGlzKTsKIH0KIAogdm9pZCBEb2N1bWVudDo6ZGlkUmVtb3ZlV2hl ZWxFdmVudEhhbmRsZXIoKQpAQCAtNTM3NSw2ICs1Mzk5LDggQEAgdm9pZCBEb2N1bWVudDo6ZGlk UmVtb3ZlV2hlZWxFdmVudEhhbmRsZXIoKQogICAgIEZyYW1lKiBtYWluRnJhbWUgPSBwYWdlKCkg PyBwYWdlKCktPm1haW5GcmFtZSgpIDogMDsKICAgICBpZiAobWFpbkZyYW1lKQogICAgICAgICBt YWluRnJhbWUtPm5vdGlmeUNocm9tZUNsaWVudFdoZWVsRXZlbnRIYW5kbGVyQ291bnRDaGFuZ2Vk KCk7CisKKyAgICB3aGVlbEV2ZW50SGFuZGxlckNvdW50Q2hhbmdlZCh0aGlzKTsKIH0KIAogYm9v bCBEb2N1bWVudDo6dmlzdWFsVXBkYXRlc0FsbG93ZWQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCmluZGV4 IGFiYWZiMzZkNzNmY2NmZTA5MDNiNDQ1NDZhOWU1ZjkzN2IxMmU2MmQuLjY2YzQyZDE1YzkwZDIw NjRlNmQ3ZTE3YTcxYmI0MjBiNWNhMjk0ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAKQEAgLTEwMyw2ICsxMDMs MTQgQEAgdm9pZCBTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVWaWV3TGF5b3V0VXBkYXRlZChG cmFtZVZpZXcqIGZyYW1lVmlldykKICAgICBzY2hlZHVsZVRyZWVTdGF0ZUNvbW1pdCgpOwogfQog Cit2b2lkIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpmcmFtZVZpZXdXaGVlbEV2ZW50SGFuZGxlckNv dW50Q2hhbmdlZChGcmFtZVZpZXcqKQoreworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Cisg ICAgQVNTRVJUKG1fcGFnZSk7CisKKyAgICByZWNvbXB1dGVXaGVlbEV2ZW50SGFuZGxlckNvdW50 KCk7Cit9CisKIHZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZU1haW5GcmFtZVNjcm9s bFBvc2l0aW9uKGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbikKIHsKICAgICBBU1NFUlQo aXNNYWluVGhyZWFkKCkpOwpAQCAtMTE5LDYgKzEyNywxOCBAQCB2b2lkIFNjcm9sbGluZ0Nvb3Jk aW5hdG9yOjp1cGRhdGVNYWluRnJhbWVTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQb2ludCYgc2Ny b2xsUAogICAgIGZyYW1lVmlldy0+c2V0Q29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVkZ2Uo dHJ1ZSk7CiB9CiAKK3ZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnJlY29tcHV0ZVdoZWVsRXZl bnRIYW5kbGVyQ291bnQoKQoreworICAgIHVuc2lnbmVkIHdoZWVsRXZlbnRIYW5kbGVyQ291bnQg PSAwOworICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5tYWluRnJhbWUoKTsgZnJhbWU7 IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJhdmVyc2VOZXh0KCkpIHsKKyAgICAgICAgaWYgKGZy YW1lLT5kb2N1bWVudCgpKQorICAgICAgICAgICAgd2hlZWxFdmVudEhhbmRsZXJDb3VudCArPSBm cmFtZS0+ZG9jdW1lbnQoKS0+d2hlZWxFdmVudEhhbmRsZXJDb3VudCgpOworICAgIH0KKworICAg IG1fc2Nyb2xsaW5nVHJlZVN0YXRlLT5zZXRXaGVlbEV2ZW50SGFuZGxlckNvdW50KHdoZWVsRXZl bnRIYW5kbGVyQ291bnQpOworICAgIHNjaGVkdWxlVHJlZVN0YXRlQ29tbWl0KCk7Cit9CisKIHZv aWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNjaGVkdWxlVHJlZVN0YXRlQ29tbWl0KCkKIHsKICAg ICBpZiAobV9zY3JvbGxpbmdUcmVlU3RhdGVDb21taXR0ZXJUaW1lci5pc0FjdGl2ZSgpKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9y LmgKaW5kZXggYmQ2NTVjMmYwNGQ0ZTJkZjc2ZDQyNjUyY2ZiYWU2ZWVjMmMwOGJiNy4uZWI1OTdi OGIwYzViNTgwZjYzYWJjYjRiMDQ5ZjllYzEyOGJiMDdkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCkBAIC02Nyw2ICs2 NywxMCBAQCBwdWJsaWM6CiAgICAgLy8gU2hvdWxkIGJlIGNhbGxlZCB3aGVuZXZlciB0aGUgZ2l2 ZW4gZnJhbWUgdmlldyBoYXMgYmVlbiBsYWlkIG91dC4KICAgICB2b2lkIGZyYW1lVmlld0xheW91 dFVwZGF0ZWQoRnJhbWVWaWV3Kik7CiAKKyAgICAvLyBTaG91bGQgYmUgY2FsbGVkIHdoZW5ldmVy IGEgd2hlZWwgZXZlbnQgaGFuZGxlciBpcyBhZGRlZCBvciByZW1vdmVkIGluIHRoZSAKKyAgICAv LyBmcmFtZSB2aWV3J3MgdW5kZXJseWluZyBkb2N1bWVudC4KKyAgICB2b2lkIGZyYW1lVmlld1do ZWVsRXZlbnRIYW5kbGVyQ291bnRDaGFuZ2VkKEZyYW1lVmlldyopOworCiAgICAgLy8gU2hvdWxk IGJlIGNhbGxlZCB3aGVuZXZlciB0aGUgc2Nyb2xsIGxheWVyIGZvciB0aGUgZ2l2ZW4gZnJhbWUg dmlldyBjaGFuZ2VzLgogICAgIHZvaWQgZnJhbWVWaWV3U2Nyb2xsTGF5ZXJEaWRDaGFuZ2UoRnJh bWVWaWV3KiwgY29uc3QgR3JhcGhpY3NMYXllciopOwogCkBAIC04Miw2ICs4Niw4IEBAIHB1Ymxp YzoKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgU2Nyb2xsaW5nQ29vcmRpbmF0b3IoUGFnZSopOwog CisgICAgdm9pZCByZWNvbXB1dGVXaGVlbEV2ZW50SGFuZGxlckNvdW50KCk7CisKICAgICB2b2lk IHNjaGVkdWxlVHJlZVN0YXRlQ29tbWl0KCk7CiAgICAgdm9pZCBzY3JvbGxpbmdUcmVlU3RhdGVD b21taXR0ZXJUaW1lckZpcmVkKFRpbWVyPFNjcm9sbGluZ0Nvb3JkaW5hdG9yPiopOwogICAgIHZv aWQgY29tbWl0VHJlZVN0YXRlSWZOZWVkZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKaW5kZXggNjQzYWVhNzY1Zjk2NzQ1NTA5YjBmODg4 ZGRhZGYxN2U1NjI4YzI4Zi4uZjFmZTQyNGFjOGFlZmI2MmViMWI3N2FlY2YwMzA4MTU1OGM1MDQy MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5j cHAKQEAgLTQ1LDYgKzQ1LDcgQEAgUGFzc1JlZlB0cjxTY3JvbGxpbmdUcmVlPiBTY3JvbGxpbmdU cmVlOjpjcmVhdGUoU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0MKIFNjcm9sbGluZ1Ry ZWU6OlNjcm9sbGluZ1RyZWUoU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5h dG9yKQogICAgIDogbV9zY3JvbGxpbmdDb29yZGluYXRvcihzY3JvbGxpbmdDb29yZGluYXRvcikK ICAgICAsIG1fcm9vdE5vZGUoU2Nyb2xsaW5nVHJlZU5vZGU6OmNyZWF0ZSh0aGlzKSkKKyAgICAs IG1faGFzV2hlZWxFdmVudEhhbmRsZXJzKGZhbHNlKQogewogfQogCkBAIC01NSw3ICs1NiwxMyBA QCBTY3JvbGxpbmdUcmVlOjp+U2Nyb2xsaW5nVHJlZSgpCiAKIGJvb2wgU2Nyb2xsaW5nVHJlZTo6 dHJ5VG9IYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVu dCkKIHsKLSAgICAvLyBGSVhNRTogQ2hlY2sgZm9yIHdoZWVsIGV2ZW50IGhhbmRsZXJzLgorICAg IHsKKyAgICAgICAgTXV0ZXhMb2NrZXIgbG9jayhtX211dGV4KTsKKworICAgICAgICBpZiAobV9o YXNXaGVlbEV2ZW50SGFuZGxlcnMpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQor CiAgICAgLy8gRklYTUU6IENoZWNrIGlmIHdlJ3JlIG92ZXIgYSBzdWJmcmFtZSBvciBvdmVyZmxv dyBkaXYuCiAKICAgICBTY3JvbGxpbmdUaHJlYWQ6OmRpc3BhdGNoKGJpbmQoJlNjcm9sbGluZ1Ry ZWU6OmhhbmRsZVdoZWVsRXZlbnQsIHRoaXMsIHdoZWVsRXZlbnQpKTsKQEAgLTgyLDYgKzg5LDEy IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZTo6Y29tbWl0TmV3VHJlZVN0YXRlKFBhc3NPd25QdHI8U2Ny b2xsaW5nVHJlZVN0YXRlPiBzY3JvbGxpbmdUCiB7CiAgICAgQVNTRVJUKFNjcm9sbGluZ1RocmVh ZDo6aXNDdXJyZW50VGhyZWFkKCkpOwogCisgICAgaWYgKHNjcm9sbGluZ1RyZWVTdGF0ZS0+Y2hh bmdlZFByb3BlcnRpZXMoKSB8IFNjcm9sbGluZ1RyZWVTdGF0ZTo6V2hlZWxFdmVudEhhbmRsZXJD b3VudCkgeworICAgICAgICBNdXRleExvY2tlciBsb2NrKG1fbXV0ZXgpOworCisgICAgICAgIG1f aGFzV2hlZWxFdmVudEhhbmRsZXJzID0gc2Nyb2xsaW5nVHJlZVN0YXRlLT53aGVlbEV2ZW50SGFu ZGxlckNvdW50KCk7CisgICAgfQorCiAgICAgbV9yb290Tm9kZS0+dXBkYXRlKHNjcm9sbGluZ1Ry ZWVTdGF0ZS5nZXQoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWUuaAppbmRleCBmNmQxZWU1OTMwYTRmZjE4YTFkYWFiODNkN2M4ZWU0YjBiZjcx NjFmLi4zODdiODg0ZGQ2YzVmYTE2ZmJlNGUwMzNmNWE1ZmQ0OTAzNzdiNjY4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCkBAIC02OCw4ICs2OCwx MCBAQCBwcml2YXRlOgogICAgIGV4cGxpY2l0IFNjcm9sbGluZ1RyZWUoU2Nyb2xsaW5nQ29vcmRp bmF0b3IqKTsKIAogICAgIFJlZlB0cjxTY3JvbGxpbmdDb29yZGluYXRvcj4gbV9zY3JvbGxpbmdD b29yZGluYXRvcjsKLQogICAgIE93blB0cjxTY3JvbGxpbmdUcmVlTm9kZT4gbV9yb290Tm9kZTsK KworICAgIE11dGV4IG1fbXV0ZXg7CisgICAgYm9vbCBtX2hhc1doZWVsRXZlbnRIYW5kbGVyczsK IH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU3RhdGUuY3BwCmluZGV4IGUyMjdlZmJmNTZhYTkx ZmY3Njg2YTYzNGU1OGJkN2U3NTI1YzQ1ZDQuLjkxNTBlODUyNzkyNzI4MTI5ZDYzYzAzYjlkMjlh MjYyZGUxMmIyZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWVTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nVHJlZVN0YXRlLmNwcApAQCAtMzcsNiArMzcsNyBAQCBQYXNzT3duUHRyPFNjcm9s bGluZ1RyZWVTdGF0ZT4gU2Nyb2xsaW5nVHJlZVN0YXRlOjpjcmVhdGUoKQogCiBTY3JvbGxpbmdU cmVlU3RhdGU6OlNjcm9sbGluZ1RyZWVTdGF0ZSgpCiAgICAgOiBtX2NoYW5nZWRQcm9wZXJ0aWVz KDApCisgICAgLCBtX3doZWVsRXZlbnRIYW5kbGVyQ291bnQoMCkKIHsKIH0KIApAQCAtNjIsNiAr NjMsMTUgQEAgdm9pZCBTY3JvbGxpbmdUcmVlU3RhdGU6OnNldENvbnRlbnRzU2l6ZShjb25zdCBJ bnRTaXplJiBjb250ZW50c1NpemUpCiAgICAgbV9jaGFuZ2VkUHJvcGVydGllcyB8PSBDb250ZW50 c1NpemU7CiB9CiAKK3ZvaWQgU2Nyb2xsaW5nVHJlZVN0YXRlOjpzZXRXaGVlbEV2ZW50SGFuZGxl ckNvdW50KHVuc2lnbmVkIHdoZWVsRXZlbnRIYW5kbGVyQ291bnQpCit7CisgICAgaWYgKG1fd2hl ZWxFdmVudEhhbmRsZXJDb3VudCA9PSB3aGVlbEV2ZW50SGFuZGxlckNvdW50KQorICAgICAgICBy ZXR1cm47CisKKyAgICBtX3doZWVsRXZlbnRIYW5kbGVyQ291bnQgPSB3aGVlbEV2ZW50SGFuZGxl ckNvdW50OworICAgIG1fY2hhbmdlZFByb3BlcnRpZXMgfD0gV2hlZWxFdmVudEhhbmRsZXJDb3Vu dDsKK30KKwogUGFzc093blB0cjxTY3JvbGxpbmdUcmVlU3RhdGU+IFNjcm9sbGluZ1RyZWVTdGF0 ZTo6Y29tbWl0KCkKIHsKICAgICBPd25QdHI8U2Nyb2xsaW5nVHJlZVN0YXRlPiB0cmVlU3RhdGUg PSBhZG9wdFB0cihuZXcgU2Nyb2xsaW5nVHJlZVN0YXRlKCp0aGlzKSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU3RhdGUuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTdGF0ZS5oCmluZGV4IGExYzFj YmNiZDZlZmRjNzBlODc5ZjgxZjRkYTU5NjgzNDMxNzljYWUuLjljZDZkZTFhZjEzYTIxNDcyZjU4 NDU0NzNhOGVlODdlMWM3NWFhMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWVTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWVTdGF0ZS5oCkBAIC01MCw3ICs1MCw4IEBAIHB1YmxpYzoKICAg ICBlbnVtIENoYW5nZWRQcm9wZXJ0eSB7CiAgICAgICAgIFZpZXdwb3J0UmVjdCA9IDEgPDwgMCwK ICAgICAgICAgQ29udGVudHNTaXplID0gMSA8PCAxLAotICAgICAgICBTY3JvbGxMYXllciA9IDEg PDwgMiwKKyAgICAgICAgV2hlZWxFdmVudEhhbmRsZXJDb3VudCA9IDEgPDwgMiwKKyAgICAgICAg U2Nyb2xsTGF5ZXIgPSAxIDw8IDMsCiAgICAgfTsKIAogICAgIGJvb2wgaGFzQ2hhbmdlZFByb3Bl cnRpZXMoKSBjb25zdCB7IHJldHVybiBtX2NoYW5nZWRQcm9wZXJ0aWVzOyB9CkBAIC02Miw2ICs2 Myw5IEBAIHB1YmxpYzoKICAgICBjb25zdCBJbnRTaXplJiBjb250ZW50c1NpemUoKSBjb25zdCB7 IHJldHVybiBtX2NvbnRlbnRzU2l6ZTsgfQogICAgIHZvaWQgc2V0Q29udGVudHNTaXplKGNvbnN0 IEludFNpemUmKTsKIAorICAgIHVuc2lnbmVkIHdoZWVsRXZlbnRIYW5kbGVyQ291bnQoKSBjb25z dCB7IHJldHVybiBtX3doZWVsRXZlbnRIYW5kbGVyQ291bnQ7IH0KKyAgICB2b2lkIHNldFdoZWVs RXZlbnRIYW5kbGVyQ291bnQodW5zaWduZWQpOworCiAgICAgUGxhdGZvcm1MYXllciogcGxhdGZv cm1TY3JvbGxMYXllcigpIGNvbnN0OwogICAgIHZvaWQgc2V0U2Nyb2xsTGF5ZXIoY29uc3QgR3Jh cGhpY3NMYXllciopOwogCkBAIC03Niw2ICs4MCw4IEBAIHByaXZhdGU6CiAgICAgSW50UmVjdCBt X3ZpZXdwb3J0UmVjdDsKICAgICBJbnRTaXplIG1fY29udGVudHNTaXplOwogCisgICAgdW5zaWdu ZWQgbV93aGVlbEV2ZW50SGFuZGxlckNvdW50OworCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIFJl dGFpblB0cjxQbGF0Zm9ybUxheWVyPiBtX3BsYXRmb3JtU2Nyb2xsTGF5ZXI7CiAjZW5kaWYK