77795 2012-02-03 17:45:08 -0800 WebKit2 should dispatch wheel events to the new ScrollingTree class 2012-02-03 17:56:53 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 549283 0 andersca 2012-02-03 17:45:08 -0800 WebKit2 should dispatch wheel events to the new ScrollingTree class 549287 1 125456 andersca 2012-02-03 17:46:54 -0800 Created attachment 125456 Patch 549289 2 webkit.review.bot 2012-02-03 17:49:20 -0800 Attachment 125456 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit2/WebProcess/WebPage/EventDispatcher.h:36: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 549292 3 125456 kling 2012-02-03 17:53:12 -0800 Comment on attachment 125456 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125456&action=review Ok. > Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp:88 > + Whitespace. > Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp:-111 > -#if ENABLE(THREADED_SCROLLING) > - MutexLocker locker(m_scrollingCoordinatorsMutex); > - if (ScrollingCoordinator* scrollingCoordinator = m_scrollingCoordinators.get(pageID).get()) { > - PlatformGestureEvent platformGestureEvent = platform(gestureEvent); > - > - if (scrollingCoordinator->handleGestureEvent(platformGestureEvent)) { > - sendDidHandleEvent(pageID, gestureEvent); > - return; > - } > - } > -#endif ChangeLog is missing a blurb about the removal of this hunk. 549294 4 andersca 2012-02-03 17:56:53 -0800 Committed r106723: <http://trac.webkit.org/changeset/106723> 125456 2012-02-03 17:46:54 -0800 2012-02-03 17:53:11 -0800 Patch bug-77795-20120203174718.patch text/plain 11940 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTg5MWYxNDI0MzNjZDgy MWZhNTgzYTU5NWM5Njk0ZWYzY2UyMjdiMy4uOTY3MDUwYTVlNTFmNzM0ZjY2NzhhNjgwNDdmOTJj YzMwYTYxYTdkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEyLTAyLTAzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViS2l0MiBzaG91 bGQgZGlzcGF0Y2ggd2hlZWwgZXZlbnRzIHRvIHRoZSBuZXcgU2Nyb2xsaW5nVHJlZSBjbGFzcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc3OTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUu ZXhwLmluOgorICAgICAgICBBZGQgbmV3IHN5bWJvbHMgbmVlZGVkIGJ5IFdlYktpdDIuCisKKyAg ICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIE1ha2Ug U2Nyb2xsaW5nVHJlZS5oIHByaXZhdGUgc28gaXQgY2FuIGJlIGluY2x1ZGVkIGJ5IFdlYktpdDIu CisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvcjo6c2Nyb2xsaW5nVHJlZSk6Cisg ICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaDoKKyAgICAgICAg QWRkIGEgc2Nyb2xsaW5nIHRyZWUgZ2V0dGVyLgorCisyMDEyLTAyLTAzICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgVGhlIHNjcm9sbGluZyB0cmVlIHNo b3VsZCBiZSBhYmxlIHRvIGhhbmRsZSB3aGVlbCBldmVudHMKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3Nzk0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA5OWE2NmQ4 ZDEyMzZmZGNkZmM0MjNmNmQ5M2E4ZTc1OWM3NzY0NjE3Li45NjdlOWVkZGRjMzQ3NTVmZjFhZTY3 ODAyYTA4OGQ3OWU1ODNiNTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMDIt MDMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJL aXQyIHNob3VsZCBkaXNwYXRjaCB3aGVlbCBldmVudHMgdG8gdGhlIG5ldyBTY3JvbGxpbmdUcmVl IGNsYXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 Nzc5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl cGxhY2UgYWxsIHVzZXMgb2YgU2Nyb2xsaW5nQ29vcmRpbmF0b3Igd2l0aCBTY3JvbGxpbmdUcmVl IGluc3RlYWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6RXZlbnREaXNwYXRjaGVyOjphZGRTY3JvbGxpbmdUcmVl Rm9yUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OkV2ZW50RGlzcGF0Y2hlcjo6cmVtb3ZlU2Nyb2xs aW5nVHJlZUZvclBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpFdmVudERpc3BhdGNoZXI6OndoZWVs RXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpFdmVudERpc3BhdGNoZXI6Omdlc3R1cmVFdmVudCk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5oOgorICAgICAg ICAoV2ViQ29yZSk6CisgICAgICAgIChFdmVudERpc3BhdGNoZXIpOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW06CisgICAg ICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpUaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjp+VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEpOgorCiAyMDEyLTAyLTAz ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFtXSzIgTWFj XSBObyBuZWVkIHRvIGFsbG93IGFjY2VzcyB0byBpbnB1dCBtZXRob2RzIG9yIGtleWJvYXJkIGxh eW91dHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggMzIxODk2MTY4Mjk1NmQ5Mzc3NzY1NWIyOTJm ZjNjNGE0NjRkOWNkZi4uNWE0ODMyZjRmYTY3NjNkYmRlYzY1OTFmN2JjMTgwYmZkYThmYzk5NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dl YkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTIwNjYsOSArMjA2NiwxMiBAQCBfX1pON1dlYkNvcmUx Mk5vdGlmaWNhdGlvbjE4ZGlzcGF0Y2hDbG9zZUV2ZW50RXYKICNlbmRpZgogCiAjaWYgRU5BQkxF KFRIUkVBREVEX1NDUk9MTElORykKK19fWk43V2ViQ29yZTEzU2Nyb2xsaW5nVHJlZTIxdHJ5VG9I YW5kbGVXaGVlbEV2ZW50RVJLTlNfMThQbGF0Zm9ybVdoZWVsRXZlbnRFCitfX1pON1dlYkNvcmUx M1Njcm9sbGluZ1RyZWVEMUV2CiBfX1pON1dlYkNvcmUyMFNjcm9sbGluZ0Nvb3JkaW5hdG9yMTZo YW5kbGVXaGVlbEV2ZW50RVJLTlNfMThQbGF0Zm9ybVdoZWVsRXZlbnRFCiBfX1pON1dlYkNvcmUy MFNjcm9sbGluZ0Nvb3JkaW5hdG9yRDFFdgogX19aTjdXZWJDb3JlNFBhZ2UyMHNjcm9sbGluZ0Nv b3JkaW5hdG9yRXYKK19fWk5LN1dlYkNvcmUyMFNjcm9sbGluZ0Nvb3JkaW5hdG9yMTNzY3JvbGxp bmdUcmVlRXYKIAogI2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKIF9fWk43V2ViQ29yZTIwU2Ny b2xsaW5nQ29vcmRpbmF0b3IxOGhhbmRsZUdlc3R1cmVFdmVudEVSS05TXzIwUGxhdGZvcm1HZXN0 dXJlRXZlbnRFCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKaW5kZXggYWU3ZTIyNWIzMGEyOTRiZjgwMmY2NmRhOTU3OGRlOGIzNWJlMWUwMC4u NDIwYzBiNjNjYTMxOTA0MzAzMzc0ZjlhMGY2NmVlNTAwMjYzMmY2MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNDg5LDcgKzQ4 OSw3IEBACiAJCTFBQTg0RjA1MTQzQkE3QkQwMDUxRDE1MyAvKiBTY3JvbGxFbGFzdGljaXR5Q29u dHJvbGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g MUFBODRGMDMxNDNCQTdCRDAwNTFEMTUzIC8qIFNjcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLmgg Ki87IH07CiAJCTFBQTg3OTkwMTFDQkU4NDYwMDNDNjY0RiAvKiBQbHVnaW5TdHJhdGVneS5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBODc5OEYxMUNC RTg0NjAwM0M2NjRGIC8qIFBsdWdpblN0cmF0ZWd5LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVU RVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMUFBQUREQTMxNERCNDA5RjAwQUY2NEIzIC8qIFNj cm9sbGluZ1RyZWUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMUFBQUREQTExNERCNDA5RjAwQUY2NEIzIC8qIFNjcm9sbGluZ1RyZWUuY3BwICovOyB9 OwotCQkxQUFBRERBNDE0REI0MDlGMDBBRjY0QjMgLyogU2Nyb2xsaW5nVHJlZS5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBQUREQTIxNERCNDA5RjAw QUY2NEIzIC8qIFNjcm9sbGluZ1RyZWUuaCAqLzsgfTsKKwkJMUFBQUREQTQxNERCNDA5RjAwQUY2 NEIzIC8qIFNjcm9sbGluZ1RyZWUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDFBQUFEREEyMTREQjQwOUYwMEFGNjRCMyAvKiBTY3JvbGxpbmdUcmVlLmgg Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMUFBQURE QkUxNERDNjQwNzAwQUY2NEIzIC8qIFNjcm9sbGluZ1RyZWVTdGF0ZS5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUFBRERCQzE0REM2NDA2MDBBRjY0 QjMgLyogU2Nyb2xsaW5nVHJlZVN0YXRlLmNwcCAqLzsgfTsKIAkJMUFBQUREQkYxNERDNjQwNzAw QUY2NEIzIC8qIFNjcm9sbGluZ1RyZWVTdGF0ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBQUREQkQxNERDNjQwNjAwQUY2NEIzIC8qIFNjcm9sbGlu Z1RyZWVTdGF0ZS5oICovOyB9OwogCQkxQUFBREREQTE0REM3NEVDMDBBRjY0QjMgLyogU2Nyb2xs aW5nVHJlZVN0YXRlTWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMUFBQURERDgxNERDNzRFQzAwQUY2NEIzIC8qIFNjcm9sbGluZ1RyZWVTdGF0ZU1h Yy5tbSAqLzsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ0Nvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAppbmRleCA5YTgzZjg0Mjg3MWY4NjljNzk5ODY1MjZhYWZh YzhkN2M1Y2FiMjM1Li45NjQwMzE5YzJkYjUxNWQ3ZDM3NWMzODJlOTZmN2M4ODEwYTBmNDkzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGlu YXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29v cmRpbmF0b3IuY3BwCkBAIC03Myw2ICs3MywxMiBAQCB2b2lkIFNjcm9sbGluZ0Nvb3JkaW5hdG9y OjpwYWdlRGVzdHJveWVkKCkKICAgICBTY3JvbGxpbmdUaHJlYWQ6OmRpc3BhdGNoKGJpbmQoJlNj cm9sbGluZ1RyZWU6OmludmFsaWRhdGUsIG1fc2Nyb2xsaW5nVHJlZS5yZWxlYXNlKCkpKTsKIH0K IAorU2Nyb2xsaW5nVHJlZSogU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNjcm9sbGluZ1RyZWUoKSBj b25zdAoreworICAgIEFTU0VSVChtX3Njcm9sbGluZ1RyZWUpOworICAgIHJldHVybiBtX3Njcm9s bGluZ1RyZWUuZ2V0KCk7Cit9CisKIGJvb2wgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmNvb3JkaW5h dGVzU2Nyb2xsaW5nRm9yRnJhbWVWaWV3KEZyYW1lVmlldyogZnJhbWVWaWV3KSBjb25zdAogewog ICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAppbmRleCBhMDRjMDMwYzNkZDBlYzI5 ZDIyZGY2ZDFjODE4NGRmNDAyNTc1ODg4Li4xYjE3MDg4YWRiNzA2ZTg3YzMyNzEwNjk2MDUwNTlj NGNhNTcyYTcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdDb29yZGluYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ0Nvb3JkaW5hdG9yLmgKQEAgLTU5LDYgKzU5LDggQEAgcHVibGljOgogCiAgICAgdm9p ZCBwYWdlRGVzdHJveWVkKCk7CiAKKyAgICBTY3JvbGxpbmdUcmVlKiBzY3JvbGxpbmdUcmVlKCkg Y29uc3Q7CisKICAgICAvLyBSZXR1cm4gd2hldGhlciB0aGlzIHNjcm9sbGluZyBjb29yZGluYXRv ciBoYW5kbGVzIHNjcm9sbGluZyBmb3IgdGhlIGdpdmVuIGZyYW1lIHZpZXcuCiAgICAgYm9vbCBj b29yZGluYXRlc1Njcm9sbGluZ0ZvckZyYW1lVmlldyhGcmFtZVZpZXcqKSBjb25zdDsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hl ci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVy LmNwcAppbmRleCAzYzJlNzNlY2E2YzMxMDgxOTdmMDlkMzJhMmJmNzAyMGZlOTM5MjZkLi4wMDk0 ZmFiZGM2MjY0YzNmMjE0Yjg0ZTE2MTM4OWI0NDQwYzA0NTc3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVyLmNwcApAQCAtMzcs NiArMzcsNyBAQAogCiAjaWYgRU5BQkxFKFRIUkVBREVEX1NDUk9MTElORykKICNpbmNsdWRlIDxX ZWJDb3JlL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9TY3JvbGxp bmdUcmVlLmg+CiAjZW5kaWYKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC01MiwyMSAr NTMsMjEgQEAgRXZlbnREaXNwYXRjaGVyOjp+RXZlbnREaXNwYXRjaGVyKCkKIH0KIAogI2lmIEVO QUJMRShUSFJFQURFRF9TQ1JPTExJTkcpCi12b2lkIEV2ZW50RGlzcGF0Y2hlcjo6YWRkU2Nyb2xs aW5nQ29vcmRpbmF0b3JGb3JQYWdlKFdlYlBhZ2UqIHdlYlBhZ2UpCit2b2lkIEV2ZW50RGlzcGF0 Y2hlcjo6YWRkU2Nyb2xsaW5nVHJlZUZvclBhZ2UoV2ViUGFnZSogd2ViUGFnZSkKIHsKLSAgICBN dXRleExvY2tlciBsb2NrZXIobV9zY3JvbGxpbmdDb29yZGluYXRvcnNNdXRleCk7CisgICAgTXV0 ZXhMb2NrZXIgbG9ja2VyKG1fc2Nyb2xsaW5nVHJlZXNNdXRleCk7CiAKICAgICBBU1NFUlQod2Vi UGFnZS0+Y29yZVBhZ2UoKS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSk7Ci0gICAgQVNTRVJUKCFt X3Njcm9sbGluZ0Nvb3JkaW5hdG9ycy5jb250YWlucyh3ZWJQYWdlLT5wYWdlSUQoKSkpOwotICAg IG1fc2Nyb2xsaW5nQ29vcmRpbmF0b3JzLnNldCh3ZWJQYWdlLT5wYWdlSUQoKSwgd2ViUGFnZS0+ Y29yZVBhZ2UoKS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSk7CisgICAgQVNTRVJUKCFtX3Njcm9s bGluZ1RyZWVzLmNvbnRhaW5zKHdlYlBhZ2UtPnBhZ2VJRCgpKSk7CisgICAgbV9zY3JvbGxpbmdU cmVlcy5zZXQod2ViUGFnZS0+cGFnZUlEKCksIHdlYlBhZ2UtPmNvcmVQYWdlKCktPnNjcm9sbGlu Z0Nvb3JkaW5hdG9yKCktPnNjcm9sbGluZ1RyZWUoKSk7CiB9CiAKLXZvaWQgRXZlbnREaXNwYXRj aGVyOjpyZW1vdmVTY3JvbGxpbmdDb29yZGluYXRvckZvclBhZ2UoV2ViUGFnZSogd2ViUGFnZSkK K3ZvaWQgRXZlbnREaXNwYXRjaGVyOjpyZW1vdmVTY3JvbGxpbmdUcmVlRm9yUGFnZShXZWJQYWdl KiB3ZWJQYWdlKQogewotICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3Njcm9sbGluZ0Nvb3JkaW5h dG9yc011dGV4KTsKLSAgICBBU1NFUlQobV9zY3JvbGxpbmdDb29yZGluYXRvcnMuY29udGFpbnMo d2ViUGFnZS0+cGFnZUlEKCkpKTsKKyAgICBNdXRleExvY2tlciBsb2NrZXIobV9zY3JvbGxpbmdU cmVlc011dGV4KTsKKyAgICBBU1NFUlQobV9zY3JvbGxpbmdUcmVlcy5jb250YWlucyh3ZWJQYWdl LT5wYWdlSUQoKSkpOwogCi0gICAgbV9zY3JvbGxpbmdDb29yZGluYXRvcnMucmVtb3ZlKHdlYlBh Z2UtPnBhZ2VJRCgpKTsKKyAgICBtX3Njcm9sbGluZ1RyZWVzLnJlbW92ZSh3ZWJQYWdlLT5wYWdl SUQoKSk7CiB9CiAjZW5kaWYKIApAQCAtODEsMTEgKzgyLDExIEBAIHZvaWQgRXZlbnREaXNwYXRj aGVyOjpkaWRSZWNlaXZlTWVzc2FnZU9uQ29ubmVjdGlvbldvcmtRdWV1ZShDb3JlSVBDOjpDb25u ZWN0aW9uCiB2b2lkIEV2ZW50RGlzcGF0Y2hlcjo6d2hlZWxFdmVudChDb3JlSVBDOjpDb25uZWN0 aW9uKiwgdWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJXaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQog ewogI2lmIEVOQUJMRShUSFJFQURFRF9TQ1JPTExJTkcpCi0gICAgTXV0ZXhMb2NrZXIgbG9ja2Vy KG1fc2Nyb2xsaW5nQ29vcmRpbmF0b3JzTXV0ZXgpOwotICAgIGlmIChTY3JvbGxpbmdDb29yZGlu YXRvciogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9ycy5nZXQo cGFnZUlEKS5nZXQoKSkgeworICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3Njcm9sbGluZ1RyZWVz TXV0ZXgpOworICAgIGlmIChTY3JvbGxpbmdUcmVlKiBzY3JvbGxpbmdUcmVlID0gbV9zY3JvbGxp bmdUcmVlcy5nZXQocGFnZUlEKS5nZXQoKSkgewogICAgICAgICBQbGF0Zm9ybVdoZWVsRXZlbnQg cGxhdGZvcm1XaGVlbEV2ZW50ID0gcGxhdGZvcm0od2hlZWxFdmVudCk7Ci0KLSAgICAgICAgaWYg KHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5oYW5kbGVXaGVlbEV2ZW50KHBsYXRmb3JtV2hlZWxFdmVu dCkpIHsKKyAgICAgICAgCisgICAgICAgIGlmIChzY3JvbGxpbmdUcmVlLT50cnlUb0hhbmRsZVdo ZWVsRXZlbnQocGxhdGZvcm1XaGVlbEV2ZW50KSkgewogICAgICAgICAgICAgc2VuZERpZEhhbmRs ZUV2ZW50KHBhZ2VJRCwgd2hlZWxFdmVudCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KQEAgLTk4LDE4ICs5OSw2IEBAIHZvaWQgRXZlbnREaXNwYXRjaGVyOjp3aGVlbEV2ZW50KENv cmVJUEM6OkNvbm5lY3Rpb24qLCB1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlCiAjaWYgRU5BQkxF KEdFU1RVUkVfRVZFTlRTKQogdm9pZCBFdmVudERpc3BhdGNoZXI6Omdlc3R1cmVFdmVudChDb3Jl SVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJHZXN0dXJlRXZlbnQm IGdlc3R1cmVFdmVudCkKIHsKLSNpZiBFTkFCTEUoVEhSRUFERURfU0NST0xMSU5HKQotICAgIE11 dGV4TG9ja2VyIGxvY2tlcihtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yc011dGV4KTsKLSAgICBpZiAo U2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gbV9zY3JvbGxpbmdD b29yZGluYXRvcnMuZ2V0KHBhZ2VJRCkuZ2V0KCkpIHsKLSAgICAgICAgUGxhdGZvcm1HZXN0dXJl RXZlbnQgcGxhdGZvcm1HZXN0dXJlRXZlbnQgPSBwbGF0Zm9ybShnZXN0dXJlRXZlbnQpOwotCi0g ICAgICAgIGlmIChzY3JvbGxpbmdDb29yZGluYXRvci0+aGFuZGxlR2VzdHVyZUV2ZW50KHBsYXRm b3JtR2VzdHVyZUV2ZW50KSkgewotICAgICAgICAgICAgc2VuZERpZEhhbmRsZUV2ZW50KHBhZ2VJ RCwgZ2VzdHVyZUV2ZW50KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgIH0K LSNlbmRpZgotCiAgICAgUnVuTG9vcDo6bWFpbigpLT5kaXNwYXRjaChiaW5kKCZFdmVudERpc3Bh dGNoZXI6OmRpc3BhdGNoR2VzdHVyZUV2ZW50LCB0aGlzLCBwYWdlSUQsIGdlc3R1cmVFdmVudCkp OwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvRXZlbnREaXNwYXRjaGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv RXZlbnREaXNwYXRjaGVyLmgKaW5kZXggZjhjNDU5YWY1YWM0ZjE5Y2EwYTVmN2M4NGJjMGM2NzNi MWQwY2M3Ni4uMTViMjUzODBkN2QxMGVhOGZhMmJjNzI5MDNjYzRkYjU3Yzc3ZDdhNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9FdmVudERpc3BhdGNoZXIu aApAQCAtMzMsNyArMzMsNyBAQAogI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmdQcmltaXRpdmVzLmg+ CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKLSAgICBjbGFzcyBTY3JvbGxpbmdDb29yZGluYXRvcjsK KyAgICBjbGFzcyBTY3JvbGxpbmdUcmVlOwogfQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTU0 LDggKzU0LDggQEAgcHVibGljOgogICAgIH5FdmVudERpc3BhdGNoZXIoKTsKIAogI2lmIEVOQUJM RShUSFJFQURFRF9TQ1JPTExJTkcpCi0gICAgdm9pZCBhZGRTY3JvbGxpbmdDb29yZGluYXRvckZv clBhZ2UoV2ViUGFnZSopOwotICAgIHZvaWQgcmVtb3ZlU2Nyb2xsaW5nQ29vcmRpbmF0b3JGb3JQ YWdlKFdlYlBhZ2UqKTsKKyAgICB2b2lkIGFkZFNjcm9sbGluZ1RyZWVGb3JQYWdlKFdlYlBhZ2Uq KTsKKyAgICB2b2lkIHJlbW92ZVNjcm9sbGluZ1RyZWVGb3JQYWdlKFdlYlBhZ2UqKTsKICNlbmRp ZgogCiBwcml2YXRlOgpAQCAtODAsOCArODAsOCBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShUSFJF QURFRF9TQ1JPTExJTkcpCiAgICAgdm9pZCBzZW5kRGlkSGFuZGxlRXZlbnQodWludDY0X3QgcGFn ZUlELCBjb25zdCBXZWJFdmVudCYpOwogCi0gICAgTXV0ZXggbV9zY3JvbGxpbmdDb29yZGluYXRv cnNNdXRleDsKLSAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8V2ViQ29yZTo6U2Nyb2xsaW5n Q29vcmRpbmF0b3I+ID4gbV9zY3JvbGxpbmdDb29yZGluYXRvcnM7CisgICAgTXV0ZXggbV9zY3Jv bGxpbmdUcmVlc011dGV4OworICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxXZWJDb3JlOjpT Y3JvbGxpbmdUcmVlPiA+IG1fc2Nyb2xsaW5nVHJlZXM7CiAjZW5kaWYKIH07CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCmluZGV4IDRhY2E4MGM0YjE5ZjJlMWQ3 NGRiMWJkZGZiY2FkZjg1NWZmNmY5YmIuLjllMjg0OTMyOGI1ZDgyN2JhMTNjOGVmMDA4ZDM0MjI4 ZTkyMTViOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpA QCAtNjYsNyArNjYsNyBAQCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEoV2ViUGFnZSogd2ViUGFnZSwgYwogI2lmIEVOQUJMRShUSFJF QURFRF9TQ1JPTExJTkcpCiAgICAgcGFnZS0+c2V0dGluZ3MoKS0+c2V0U2Nyb2xsaW5nQ29vcmRp bmF0b3JFbmFibGVkKHRydWUpOwogCi0gICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkuZXZlbnREaXNw YXRjaGVyKCkuYWRkU2Nyb2xsaW5nQ29vcmRpbmF0b3JGb3JQYWdlKHdlYlBhZ2UpOworICAgIFdl YlByb2Nlc3M6OnNoYXJlZCgpLmV2ZW50RGlzcGF0Y2hlcigpLmFkZFNjcm9sbGluZ1RyZWVGb3JQ YWdlKHdlYlBhZ2UpOwogI2VuZGlmCiAKICAgICBtX3Jvb3RMYXllciA9IFtDQUxheWVyIGxheWVy XTsKQEAgLTg4LDcgKzg4LDcgQEAgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKFdlYlBhZ2UqIHdlYlBhZ2UsIGMKIFRpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhOjp+VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEoKQogewog I2lmIEVOQUJMRShUSFJFQURFRF9TQ1JPTExJTkcpCi0gICAgV2ViUHJvY2Vzczo6c2hhcmVkKCku ZXZlbnREaXNwYXRjaGVyKCkucmVtb3ZlU2Nyb2xsaW5nQ29vcmRpbmF0b3JGb3JQYWdlKG1fd2Vi UGFnZSk7CisgICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkuZXZlbnREaXNwYXRjaGVyKCkucmVtb3Zl U2Nyb2xsaW5nVHJlZUZvclBhZ2UobV93ZWJQYWdlKTsKICNlbmRpZgogCiAgICAgbV9sYXllckZs dXNoU2NoZWR1bGVyLmludmFsaWRhdGUoKTsK