74639 2011-12-15 12:30:35 -0800 Add ScrollingCoordinator class and ENABLE_THREADED_SCROLLING define 2012-01-24 21:36:51 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca jamesr levin+threading webkit.review.bot oldest_to_newest 522138 0 andersca 2011-12-15 12:30:35 -0800 Add ScrollingCoordinator class and ENABLE_THREADED_SCROLLING define 522142 1 119483 andersca 2011-12-15 12:33:57 -0800 Created attachment 119483 Patch 522148 2 119483 kling 2011-12-15 12:40:39 -0800 Comment on attachment 119483 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119483&action=review > Source/JavaScriptCore/wtf/Platform.h:1067 > +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) > +#define ENABLE_THREADED_SCROLLING 1 > +#endif Even with the very restrictive conditionals, I think an e-mail to webkit-dev is in order before landing a new ENABLE() flag. 522157 3 andersca 2011-12-15 12:45:07 -0800 Committed r102975: <http://trac.webkit.org/changeset/102975> 522193 4 119483 levin 2011-12-15 13:22:56 -0800 Comment on attachment 119483 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119483&action=review > Source/WebCore/page/Page.cpp:91 > +#endif I thought for include's we just put them in the normal include flow and let the ifdef in the header be enough. > Source/WebCore/page/ScrollingCoordinator.h:33 > +#include <wtf/Threading.h> Nothing from Threading.h is used yet but I guess that is in another patch soon. > Source/WebCore/page/ScrollingCoordinator.h:38 > +class PlatformWheelEvent; Not used yet "PlatformWheelEvent" but I guess it is coming. 541994 5 jamesr 2012-01-24 21:36:51 -0800 (In reply to comment #2) > (From update of attachment 119483 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=119483&action=review > > > Source/JavaScriptCore/wtf/Platform.h:1067 > > +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) > > +#define ENABLE_THREADED_SCROLLING 1 > > +#endif > > Even with the very restrictive conditionals, I think an e-mail to webkit-dev is in order before landing a new ENABLE() flag. Any particular reason this email didn't happen? 119483 2011-12-15 12:33:57 -0800 2011-12-15 13:22:56 -0800 Patch bug-74639-20111215123356.patch text/plain 14123 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyOTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 MTM1MzJjNGQyMDE3ODI1ZGIwMTc4MGFlMDMxY2JiZGUwOWNmYTQ3Li4wN2M1NmJiYTY3MjEwYTZi ZmQ1MWQ0ZWE2NzkyMzkwOTAzZDQ0NzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNiBAQAogMjAxMS0xMi0xNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCisgICAgICAgIEFkZCBTY3JvbGxpbmdDb29yZGluYXRvciBjbGFzcyBhbmQgRU5BQkxF X1RIUkVBREVEX1NDUk9MTElORyBkZWZpbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc0NjM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIEVOQUJMRV9USFJFQURFRF9TQ1JPTExJTkcgI2RlZmluZS4K KworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCisyMDExLTEyLTE1ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgRXZlbnREaXNwYXRjaGVyIHNob3Vs ZCBoYW5kbGUgd2hlZWwgZXZlbnRzIG9uIHRoZSBjb25uZWN0aW9uIHF1ZXVlCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDYyNwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggOGRiMDIwNDUyMjgzMmJiOGQzMTAzNjJmZWU5ZjVhY2MyYzJmM2EyMi4uMTcwYzhlYTYzOWFh MzQ4ZTc5NmY2ODMzNmEyYmRkYzJmNjc3ZTJlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBA CisyMDExLTEyLTE1ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAg ICAgICAgQWRkIFNjcm9sbGluZ0Nvb3JkaW5hdG9yIGNsYXNzIGFuZCBFTkFCTEVfVEhSRUFERURf U0NST0xMSU5HIGRlZmluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzQ2MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgYSBTY3JvbGxpbmdDb29yZGluYXRvciBjbGFzcyBhbmQgbWFrZSBpdCBhIG1l bWJlciBvZiBQYWdlLiBUZWFyIGl0IGRvd24KKyAgICAgICAgd2hlbiB0aGUgcGFnZSBnb2VzIGF3 YXkuCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAg ICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OlBhZ2UpOgorICAg ICAgICAoV2ViQ29yZTo6UGFnZTo6flBhZ2UpOgorICAgICAgICAqIHBhZ2UvUGFnZS5oOgorICAg ICAgICAoV2ViQ29yZTo6UGFnZTo6c2Nyb2xsaW5nQ29vcmRpbmF0b3IpOgorICAgICAgICAqIHBh Z2UvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ0Nvb3JkaW5hdG9yOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5n Q29vcmRpbmF0b3I6OlNjcm9sbGluZ0Nvb3JkaW5hdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ0Nvb3JkaW5hdG9yOjp+U2Nyb2xsaW5nQ29vcmRpbmF0b3IpOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnBhZ2VEZXN0cm95ZWQpOgorICAgICAgICAqIHBh Z2UvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaDogQWRkZWQuCisKIDIwMTEtMTItMTUgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHIxMDI4MjkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRm b3JtLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgKaW5kZXggODIwN2Vh ODY1N2E4N2Y0NGY2NDg4NDE5YjIyNGNiZDdmY2M1Y2ViMS4uOTU4ODc0OGQ1YjA4OTYzNWE3OWNi Zjg2ODVkMDlkYjE4ZWE0MjYyYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0 Zi9QbGF0Zm9ybS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaApA QCAtMTA2Miw2ICsxMDYyLDEwIEBACiAjZGVmaW5lIEVOQUJMRV9QTFVHSU5fUEFDS0FHRV9TSU1Q TEVfSEFTSCAxCiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgIWRlZmluZWQoQlVJTERJ TkdfT05fTEVPUEFSRCkgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKSAmJiAh ZGVmaW5lZChCVUlMRElOR19PTl9MSU9OKQorI2RlZmluZSBFTkFCTEVfVEhSRUFERURfU0NST0xM SU5HIDEKKyNlbmRpZgorCiAvKiBTZXQgdXAgYSBkZWZpbmUgZm9yIGEgY29tbW9uIGVycm9yIHRo YXQgaXMgaW50ZW5kZWQgdG8gY2F1c2UgYSBidWlsZCBlcnJvciAtLSB0aHVzIHRoZSBzcGFjZSBh ZnRlciBFcnJvci4gKi8KICNkZWZpbmUgV1RGX1BMQVRGT1JNX0NGTkVUV09SSyBFcnJvciBVU0Vf bWFjcm9fc2hvdWxkX2JlX3VzZWRfd2l0aF9DRk5FVFdPUksKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDhlMTY2ZTA2NjBjOWY1 NzcwMDU5N2IyNzUyZWY1MzRjZjI2ZWMxNzQuLjVhZjMxOTk4MGU4Zjc1MjY1OTkyNTExOWNmYjRh YzU2Mzg5ZTlmZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKQEAgLTM3Miw2ICszNzIsOCBAQAogCQkxQTJFNkU1OTBDQzU1MjEzMDA0 QTIwNjIgLyogU1FMVmFsdWUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMUEyRTZFNTcwQ0M1NTIxMzAwNEEyMDYyIC8qIFNRTFZhbHVlLmNwcCAqLzsg fTsKIAkJMUEyRTZFNUEwQ0M1NTIxMzAwNEEyMDYyIC8qIFNRTFZhbHVlLmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTJFNkU1ODBDQzU1MjEzMDA0QTIw NjIgLyogU1FMVmFsdWUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCAp OyB9OyB9OwogCQkxQTJFNkU3QTBDQzU1NkQ1MDA0QTIwNjIgLyogU1FMaXRlQXV0aG9yaXplci5j cHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTJFNkU3 ODBDQzU1NkQ1MDA0QTIwNjIgLyogU1FMaXRlQXV0aG9yaXplci5jcHAgKi87IH07CisJCTFBMkY5 RDc5MTQ5NjhDNzQwMDY1QUM2MyAvKiBTY3JvbGxpbmdDb29yZGluYXRvci5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTJGOUQ3NzE0OTY4Qzc0MDA2 NUFDNjMgLyogU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwICovOyB9OworCQkxQTJGOUQ3QTE0OTY4 Qzc0MDA2NUFDNjMgLyogU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMkY5RDc4MTQ5NjhDNzQwMDY1QUM2MyAvKiBT Y3JvbGxpbmdDb29yZGluYXRvci5oICovOyB9OwogCQkxQTM0MTdDOTBDRUNGRjI1MDA0OUNCREUg LyogSlNDdXN0b21Wb2lkQ2FsbGJhY2suaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDFBMzQxN0M3MENFQ0ZGMjUwMDQ5Q0JERSAvKiBKU0N1c3RvbVZvaWRD YWxsYmFjay5oICovOyB9OwogCQkxQTM0MTdDQTBDRUNGRjI1MDA0OUNCREUgLyogSlNDdXN0b21W b2lkQ2FsbGJhY2suY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMUEzNDE3QzgwQ0VDRkYyNTAwNDlDQkRFIC8qIEpTQ3VzdG9tVm9pZENhbGxiYWNrLmNw cCAqLzsgfTsKIAkJMUE0OTRCRkEwQTEyMkY0NDAwRkRBRkMxIC8qIEpTSFRNTEVsZW1lbnQuY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE0OTRCRjgw QTEyMkY0NDAwRkRBRkMxIC8qIEpTSFRNTEVsZW1lbnQuY3BwICovOyB9OwpAQCAtNzQ4Miw2ICs3 NDg0LDggQEAKIAkJMUEyRTZFNTcwQ0M1NTIxMzAwNEEyMDYyIC8qIFNRTFZhbHVlLmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IFNRTFZhbHVlLmNwcDsgcGF0aCA9IHNx bC9TUUxWYWx1ZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBMkU2RTU4MEND NTUyMTMwMDRBMjA2MiAvKiBTUUxWYWx1ZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5h bWUgPSBTUUxWYWx1ZS5oOyBwYXRoID0gc3FsL1NRTFZhbHVlLmg7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCTFBMkU2RTc4MENDNTU2RDUwMDRBMjA2MiAvKiBTUUxpdGVBdXRob3JpemVy LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IFNRTGl0ZUF1dGhvcml6 ZXIuY3BwOyBwYXRoID0gc3FsL1NRTGl0ZUF1dGhvcml6ZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OworCQkxQTJGOUQ3NzE0OTY4Qzc0MDA2NUFDNjMgLyogU2Nyb2xsaW5nQ29vcmRp bmF0b3IuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQTJGOUQ3ODE0 OTY4Qzc0MDA2NUFDNjMgLyogU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJMUEzNDE3QzcwQ0VDRkYyNTAwNDlDQkRFIC8qIEpTQ3VzdG9tVm9pZENh bGxiYWNrLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTQ3VzdG9tVm9pZENh bGxiYWNrLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBMzQxN0M4MENFQ0ZGMjUw MDQ5Q0JERSAvKiBKU0N1c3RvbVZvaWRDYWxsYmFjay5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBKU0N1c3RvbVZvaWRDYWxsYmFjay5jcHA7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTFBNDk0QkJCMEExMjJEQ0QwMEZEQUZDMSAvKiBIVE1MRWxlbWVudC5p ZGwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gSFRNTEVsZW1lbnQuaWRsOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwpAQCAtMTU3MjQsNiArMTU3MjgsOCBAQAogCQkJCUJDRUMwMUJBMEMyNzRE QUMwMDlGNEVDOSAvKiBTY3JlZW4uY3BwICovLAogCQkJCUJDRUMwMUJCMEMyNzREQUMwMDlGNEVD OSAvKiBTY3JlZW4uaCAqLywKIAkJCQlCQ0VDMDFCQzBDMjc0REFDMDA5RjRFQzkgLyogU2NyZWVu LmlkbCAqLywKKwkJCQkxQTJGOUQ3NzE0OTY4Qzc0MDA2NUFDNjMgLyogU2Nyb2xsaW5nQ29vcmRp bmF0b3IuY3BwICovLAorCQkJCTFBMkY5RDc4MTQ5NjhDNzQwMDY1QUM2MyAvKiBTY3JvbGxpbmdD b29yZGluYXRvci5oICovLAogCQkJCUJDRDBFMEY3MEU5NzJDMzUwMDI2NURFQSAvKiBTZWN1cml0 eU9yaWdpbi5jcHAgKi8sCiAJCQkJQkNEMEUwRjgwRTk3MkMzNTAwMjY1REVBIC8qIFNlY3VyaXR5 T3JpZ2luLmggKi8sCiAJCQkJQkNEMEUwRjkwRTk3MkMzNTAwMjY1REVBIC8qIFNlY3VyaXR5T3Jp Z2luSGFzaC5oICovLApAQCAtMjQ4NjQsNiArMjQ4NzAsNyBAQAogCQkJCTQ5RUNFQjZDMTQ5OTc5 MEQwMENERDNBNCAvKiBGRUxpZ2h0aW5nTkVPTi5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNDlFQ0VC NkUxNDk5NzkwRDAwQ0REM0E0IC8qIEZpbHRlck9wZXJhdGlvbi5oIGluIEhlYWRlcnMgKi8sCiAJ CQkJNDlFQ0VCNzAxNDk5NzkwRDAwQ0REM0E0IC8qIEZpbHRlck9wZXJhdGlvbnMuaCBpbiBIZWFk ZXJzICovLAorCQkJCTFBMkY5RDdBMTQ5NjhDNzQwMDY1QUM2MyAvKiBTY3JvbGxpbmdDb29yZGlu YXRvci5oIGluIEhlYWRlcnMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0 cHJvY2Vzc2luZyA9IDA7CiAJCX07CkBAIC0yNzc1Niw2ICsyNzc2Myw3IEBACiAJCQkJNDlFQ0VC NkIxNDk5NzkwRDAwQ0REM0E0IC8qIEZFTGlnaHRpbmdORU9OLmNwcCBpbiBTb3VyY2VzICovLAog CQkJCTQ5RUNFQjZEMTQ5OTc5MEQwMENERDNBNCAvKiBGaWx0ZXJPcGVyYXRpb24uY3BwIGluIFNv dXJjZXMgKi8sCiAJCQkJNDlFQ0VCNkYxNDk5NzkwRDAwQ0REM0E0IC8qIEZpbHRlck9wZXJhdGlv bnMuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJMUEyRjlENzkxNDk2OEM3NDAwNjVBQzYzIC8qIFNj cm9sbGluZ0Nvb3JkaW5hdG9yLmNwcCBpbiBTb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlG b3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5k ZXggNzcyMDBmZTIyNzRjODMyOGU1NzBlNzAzZjg1ZWIwMTM1NzJkMjBiNi4uMTQ1ODE4MDQxZDc0 OWI3MTE2ZWI3NmJmMWJiMDUzZjEwMmM0OTFiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC04Niw2 ICs4NiwxMCBAQAogI2luY2x1ZGUgIlVzZXJNZWRpYUNsaWVudC5oIgogI2VuZGlmCiAKKyNpZiBF TkFCTEUoVEhSRUFERURfU0NST0xMSU5HKQorI2luY2x1ZGUgIlNjcm9sbGluZ0Nvb3JkaW5hdG9y LmgiCisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGF0aWMgSGFzaFNldDxQYWdl Kj4qIGFsbFBhZ2VzOwpAQCAtMTQ4LDYgKzE1Miw5IEBAIFBhZ2U6OlBhZ2UoUGFnZUNsaWVudHMm IHBhZ2VDbGllbnRzKQogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiAgICAgLCBtX3VzZXJNZWRp YUNsaWVudChwYWdlQ2xpZW50cy51c2VyTWVkaWFDbGllbnQpCiAjZW5kaWYKKyNpZiBFTkFCTEUo VEhSRUFERURfU0NST0xMSU5HKQorICAgICwgbV9zY3JvbGxpbmdDb29yZGluYXRvcihTY3JvbGxp bmdDb29yZGluYXRvcjo6Y3JlYXRlKHRoaXMpKQorI2VuZGlmCiAgICAgLCBtX3NldHRpbmdzKGFk b3B0UHRyKG5ldyBTZXR0aW5ncyh0aGlzKSkpCiAgICAgLCBtX3Byb2dyZXNzKGFkb3B0UHRyKG5l dyBQcm9ncmVzc1RyYWNrZXIpKQogICAgICwgbV9iYWNrRm9yd2FyZENvbnRyb2xsZXIoYWRvcHRQ dHIobmV3IEJhY2tGb3J3YXJkQ29udHJvbGxlcih0aGlzLCBwYWdlQ2xpZW50cy5iYWNrRm9yd2Fy ZENsaWVudCkpKQpAQCAtMjE5LDYgKzIyNiwxMCBAQCBQYWdlOjp+UGFnZSgpCiAgICAgICAgIG1f dXNlck1lZGlhQ2xpZW50LT5wYWdlRGVzdHJveWVkKCk7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShU SFJFQURFRF9TQ1JPTExJTkcpCisgICAgbV9zY3JvbGxpbmdDb29yZGluYXRvci0+cGFnZURlc3Ry b3llZCgpOworI2VuZGlmCisKICAgICBiYWNrRm9yd2FyZCgpLT5jbG9zZSgpOwogCiAjaWZuZGVm IE5ERUJVRwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2UuaAppbmRleCA0OTgwMWI1NWY5MDU5N2YxYjBmNjE5YzZmYmI3YjYz M2FiZjYxYTVmLi5mOTQzOGIzMmVhZTgzYWU5NTNlMjQ1ODhmNjFkNTJhMDljZWRjYzJiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2UuaApAQCAtODEsNiArODEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xh c3MgUmVuZGVyVGhlbWU7CiAgICAgY2xhc3MgVmlzaWJsZVNlbGVjdGlvbjsKICAgICBjbGFzcyBT Y3JvbGxhYmxlQXJlYTsKKyAgICBjbGFzcyBTY3JvbGxpbmdDb29yZGluYXRvcjsKICAgICBjbGFz cyBTZXR0aW5nczsKICAgICBjbGFzcyBTcGVlY2hJbnB1dDsKICAgICBjbGFzcyBTcGVlY2hJbnB1 dENsaWVudDsKQEAgLTE5NSw2ICsxOTYsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjaWYgRU5B QkxFKE1FRElBX1NUUkVBTSkKICAgICAgICAgVXNlck1lZGlhQ2xpZW50KiB1c2VyTWVkaWFDbGll bnQoKSBjb25zdCB7IHJldHVybiBtX3VzZXJNZWRpYUNsaWVudDsgfQogI2VuZGlmCisjaWYgRU5B QkxFKFRIUkVBREVEX1NDUk9MTElORykKKyAgICAgICAgU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNj cm9sbGluZ0Nvb3JkaW5hdG9yKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxpbmdDb29yZGluYXRv ci5nZXQoKTsgfQorI2VuZGlmCiAgICAgICAgIFNldHRpbmdzKiBzZXR0aW5ncygpIGNvbnN0IHsg cmV0dXJuIG1fc2V0dGluZ3MuZ2V0KCk7IH0KICAgICAgICAgUHJvZ3Jlc3NUcmFja2VyKiBwcm9n cmVzcygpIGNvbnN0IHsgcmV0dXJuIG1fcHJvZ3Jlc3MuZ2V0KCk7IH0KICAgICAgICAgQmFja0Zv cndhcmRDb250cm9sbGVyKiBiYWNrRm9yd2FyZCgpIGNvbnN0IHsgcmV0dXJuIG1fYmFja0Zvcndh cmRDb250cm9sbGVyLmdldCgpOyB9CkBAIC0zODgsNiArMzkyLDkgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiAgICAgICAgIFVzZXJNZWRpYUNsaWVudCog bV91c2VyTWVkaWFDbGllbnQ7CiAjZW5kaWYKKyNpZiBFTkFCTEUoVEhSRUFERURfU0NST0xMSU5H KQorICAgICAgICBSZWZQdHI8U2Nyb2xsaW5nQ29vcmRpbmF0b3I+IG1fc2Nyb2xsaW5nQ29vcmRp bmF0b3I7CisjZW5kaWYKICAgICAgICAgT3duUHRyPFNldHRpbmdzPiBtX3NldHRpbmdzOwogICAg ICAgICBPd25QdHI8UHJvZ3Jlc3NUcmFja2VyPiBtX3Byb2dyZXNzOwogICAgICAgICAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDg1 Y2E4YTRhZDA0ZGFhYTQwNTE1Yjk3Zjk4MWZhNjBlNzUzZDQ0YQotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCkBAIC0wLDAgKzEs NTggQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICog MS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9y bSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisg KiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0 aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQ TEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVT UyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAor ICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1Mg Rk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQg U0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFO WSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisg KiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQ Uk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBV U0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VW RVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICog Q09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiU2Nyb2xs aW5nQ29vcmRpbmF0b3IuaCIKKworI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CisKKyNpZiBF TkFCTEUoVEhSRUFERURfU0NST0xMSU5HKQorCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK1Bhc3NS ZWZQdHI8U2Nyb2xsaW5nQ29vcmRpbmF0b3I+IFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpjcmVhdGUo UGFnZSogcGFnZSkKK3sKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFNjcm9sbGluZ0Nvb3JkaW5h dG9yKHBhZ2UpKTsKK30KKworU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OlNjcm9sbGluZ0Nvb3JkaW5h dG9yKFBhZ2UqIHBhZ2UpCisgICAgOiBtX3BhZ2UocGFnZSkKK3sKK30KKworU2Nyb2xsaW5nQ29v cmRpbmF0b3I6On5TY3JvbGxpbmdDb29yZGluYXRvcigpCit7CisgICAgQVNTRVJUKCFtX3BhZ2Up OworfQorCit2b2lkIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpwYWdlRGVzdHJveWVkKCkKK3sKKyAg ICBBU1NFUlQobV9wYWdlKTsKKyAgICBtX3BhZ2UgPSAwOworfQorCit9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCisKKyNlbmRpZiAvLyBFTkFCTEUoVEhSRUFERURfU0NST0xMSU5HKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TY3JvbGxpbmdDb29yZGluYXRvci5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9TY3JvbGxpbmdDb29yZGluYXRvci5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE1MmU5ZjZlMzNi YTgxNGQ0ZGMyZDMzMjZiNGIzYzRjZTc0ZDQ0NzcKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKQEAgLTAsMCArMSw1OCBAQAorLyoK KyAqIENvcHlyaWdodCAoQykgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmli dXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFO RCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJ RUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1Q TElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJU SUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBM RSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVF TlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQg QU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwg U1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgorICovCisKKyNpZm5kZWYgU2Nyb2xsaW5nQ29vcmRpbmF0b3JfaAorI2RlZmluZSBTY3JvbGxp bmdDb29yZGluYXRvcl9oCisKKyNpZiBFTkFCTEUoVEhSRUFERURfU0NST0xMSU5HKQorCisjaW5j bHVkZSA8d3RmL0ZvcndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvVGhyZWFkU2FmZVJlZkNvdW50ZWQu aD4KKyNpbmNsdWRlIDx3dGYvVGhyZWFkaW5nLmg+CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKwor Y2xhc3MgUGFnZTsKK2NsYXNzIFBsYXRmb3JtV2hlZWxFdmVudDsKKworY2xhc3MgU2Nyb2xsaW5n Q29vcmRpbmF0b3IgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8U2Nyb2xsaW5nQ29vcmRp bmF0b3I+IHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxTY3JvbGxpbmdDb29yZGlu YXRvcj4gY3JlYXRlKFBhZ2UqKTsKKyAgICB+U2Nyb2xsaW5nQ29vcmRpbmF0b3IoKTsKKworICAg IHZvaWQgcGFnZURlc3Ryb3llZCgpOworCitwcml2YXRlOgorICAgIGV4cGxpY2l0IFNjcm9sbGlu Z0Nvb3JkaW5hdG9yKFBhZ2UqKTsKKworcHJpdmF0ZToKKyAgICBQYWdlKiBtX3BhZ2U7Cit9Owor Cit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZiAvLyBFTkFCTEUoVEhSRUFERURfU0NS T0xMSU5HKQorCisjZW5kaWYgLy8gU2Nyb2xsaW5nQ29vcmRpbmF0b3JfaAo=