176565 2017-09-07 15:19:30 -0700 Make DragControllerAction an enum class 2017-09-27 12:48:00 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen aestes commit-queue webkit-bug-importer oldest_to_newest 1346574 0 achristensen 2017-09-07 15:19:30 -0700 Make DragControllerAction an enum class 1346575 1 320188 achristensen 2017-09-07 15:19:49 -0700 Created attachment 320188 Patch 1346630 2 achristensen 2017-09-07 16:16:21 -0700 http://trac.webkit.org/r221770 1353658 3 webkit-bug-importer 2017-09-27 12:48:00 -0700 <rdar://problem/34694046> 320188 2017-09-07 15:19:49 -0700 2017-09-07 16:16:16 -0700 Patch bug-176565-20170907151948.patch text/plain 12693 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjE3NjMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA5LTA3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBEcmFnQ29u dHJvbGxlckFjdGlvbiBhbiBlbnVtIGNsYXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY1NjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9EcmFnQ29udHJvbGxlckFjdGlvbi5oOgorICAg ICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkcmFnRW50ZXJlZCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZHJhZ1VwZGF0ZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmRyYWdFeGl0ZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnBl cmZvcm1EcmFnT3BlcmF0aW9uKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBlcmZvcm1EcmFnQ29udHJvbGxlckFj dGlvbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwogMjAxNy0wOS0wNyAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFs bG93IG1vZGVybiBkZWNvZGluZyBvZiBlbnVtcyBhbmQgT3B0aW9uU2V0cwpJbmRleDogU291cmNl L1dlYktpdC9TaGFyZWQvRHJhZ0NvbnRyb2xsZXJBY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L1NoYXJlZC9EcmFnQ29udHJvbGxlckFjdGlvbi5oCShyZXZpc2lvbiAyMjE3MDEp CisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9EcmFnQ29udHJvbGxlckFjdGlvbi5oCSh3b3JraW5n IGNvcHkpCkBAIC0yMywxOCArMjMsMjkgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KICAqLwogCi0jaWZuZGVmIERyYWdDb250cm9sbGVyQWN0aW9uX2gKLSNkZWZpbmUgRHJh Z0NvbnRyb2xsZXJBY3Rpb25faAorI3ByYWdtYSBvbmNlCiAKIG5hbWVzcGFjZSBXZWJLaXQgewog Ci1lbnVtIERyYWdDb250cm9sbGVyQWN0aW9uIHsKLSAgICBEcmFnQ29udHJvbGxlckFjdGlvbkVu dGVyZWQsCi0gICAgRHJhZ0NvbnRyb2xsZXJBY3Rpb25VcGRhdGVkLAotICAgIERyYWdDb250cm9s bGVyQWN0aW9uRXhpdGVkLAotICAgIERyYWdDb250cm9sbGVyQWN0aW9uUGVyZm9ybURyYWdPcGVy YXRpb24KK2VudW0gY2xhc3MgRHJhZ0NvbnRyb2xsZXJBY3Rpb24geworICAgIEVudGVyZWQsCisg ICAgVXBkYXRlZCwKKyAgICBFeGl0ZWQsCisgICAgUGVyZm9ybURyYWdPcGVyYXRpb24KIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCi0jZW5kaWYgLy8gRHJhZ0NvbnRyb2xsZXJBY3Rpb25f aAorbmFtZXNwYWNlIFdURiB7CisKK3RlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0 OjpEcmFnQ29udHJvbGxlckFjdGlvbj4geworICAgIHVzaW5nIHZhbHVlcyA9IEVudW1WYWx1ZXM8 CisgICAgICAgIFdlYktpdDo6RHJhZ0NvbnRyb2xsZXJBY3Rpb24sCisgICAgICAgIFdlYktpdDo6 RHJhZ0NvbnRyb2xsZXJBY3Rpb246OkVudGVyZWQsCisgICAgICAgIFdlYktpdDo6RHJhZ0NvbnRy b2xsZXJBY3Rpb246OlVwZGF0ZWQsCisgICAgICAgIFdlYktpdDo6RHJhZ0NvbnRyb2xsZXJBY3Rp b246OkV4aXRlZCwKKyAgICAgICAgV2ViS2l0OjpEcmFnQ29udHJvbGxlckFjdGlvbjo6UGVyZm9y bURyYWdPcGVyYXRpb24KKyAgICA+OworfTsKKworfSAvLyBuYW1lc3BhY2UgV1RGCkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDIyMTc0MykK KysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE3MDksMjYgKzE3MDksMjYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRyYWdFbnRlcmVk KERyYWdEYXRhJgogewogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5z aW9uSGFuZGxlOwogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5IHNhbmRib3hFeHRl bnNpb25IYW5kbGVFbXB0eUFycmF5OwotICAgIHBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihE cmFnQ29udHJvbGxlckFjdGlvbkVudGVyZWQsIGRyYWdEYXRhLCBkcmFnU3RvcmFnZU5hbWUsIHNh bmRib3hFeHRlbnNpb25IYW5kbGUsIHNhbmRib3hFeHRlbnNpb25IYW5kbGVFbXB0eUFycmF5KTsK KyAgICBwZXJmb3JtRHJhZ0NvbnRyb2xsZXJBY3Rpb24oRHJhZ0NvbnRyb2xsZXJBY3Rpb246OkVu dGVyZWQsIGRyYWdEYXRhLCBkcmFnU3RvcmFnZU5hbWUsIHNhbmRib3hFeHRlbnNpb25IYW5kbGUs IHNhbmRib3hFeHRlbnNpb25IYW5kbGVFbXB0eUFycmF5KTsKIH0KIAogdm9pZCBXZWJQYWdlUHJv eHk6OmRyYWdVcGRhdGVkKERyYWdEYXRhJiBkcmFnRGF0YSwgY29uc3QgU3RyaW5nJiBkcmFnU3Rv cmFnZU5hbWUpCiB7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIHNhbmRib3hFeHRlbnNp b25IYW5kbGU7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkgc2FuZGJveEV4dGVu c2lvbkhhbmRsZUVtcHR5QXJyYXk7Ci0gICAgcGVyZm9ybURyYWdDb250cm9sbGVyQWN0aW9uKERy YWdDb250cm9sbGVyQWN0aW9uVXBkYXRlZCwgZHJhZ0RhdGEsIGRyYWdTdG9yYWdlTmFtZSwgc2Fu ZGJveEV4dGVuc2lvbkhhbmRsZSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZUVtcHR5QXJyYXkpOwor ICAgIHBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxlckFjdGlvbjo6VXBk YXRlZCwgZHJhZ0RhdGEsIGRyYWdTdG9yYWdlTmFtZSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSwg c2FuZGJveEV4dGVuc2lvbkhhbmRsZUVtcHR5QXJyYXkpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94 eTo6ZHJhZ0V4aXRlZChEcmFnRGF0YSYgZHJhZ0RhdGEsIGNvbnN0IFN0cmluZyYgZHJhZ1N0b3Jh Z2VOYW1lKQogewogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9u SGFuZGxlOwogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5IHNhbmRib3hFeHRlbnNp b25IYW5kbGVFbXB0eUFycmF5OwotICAgIHBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFn Q29udHJvbGxlckFjdGlvbkV4aXRlZCwgZHJhZ0RhdGEsIGRyYWdTdG9yYWdlTmFtZSwgc2FuZGJv eEV4dGVuc2lvbkhhbmRsZSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZUVtcHR5QXJyYXkpOworICAg IHBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxlckFjdGlvbjo6RXhpdGVk LCBkcmFnRGF0YSwgZHJhZ1N0b3JhZ2VOYW1lLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBzYW5k Ym94RXh0ZW5zaW9uSGFuZGxlRW1wdHlBcnJheSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpw ZXJmb3JtRHJhZ09wZXJhdGlvbihEcmFnRGF0YSYgZHJhZ0RhdGEsIGNvbnN0IFN0cmluZyYgZHJh Z1N0b3JhZ2VOYW1lLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmIHNhbmRib3hFeHRl bnNpb25IYW5kbGUsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5JiBzYW5kYm94 RXh0ZW5zaW9uc0ZvclVwbG9hZCkKIHsKLSAgICBwZXJmb3JtRHJhZ0NvbnRyb2xsZXJBY3Rpb24o RHJhZ0NvbnRyb2xsZXJBY3Rpb25QZXJmb3JtRHJhZ09wZXJhdGlvbiwgZHJhZ0RhdGEsIGRyYWdT dG9yYWdlTmFtZSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSwgc2FuZGJveEV4dGVuc2lvbnNGb3JV cGxvYWQpOworICAgIHBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxlckFj dGlvbjo6UGVyZm9ybURyYWdPcGVyYXRpb24sIGRyYWdEYXRhLCBkcmFnU3RvcmFnZU5hbWUsIHNh bmRib3hFeHRlbnNpb25IYW5kbGUsIHNhbmRib3hFeHRlbnNpb25zRm9yVXBsb2FkKTsKIH0KIAog dm9pZCBXZWJQYWdlUHJveHk6OnBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJv bGxlckFjdGlvbiBhY3Rpb24sIERyYWdEYXRhJiBkcmFnRGF0YSwgY29uc3QgU3RyaW5nJiBkcmFn U3RvcmFnZU5hbWUsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVu c2lvbkhhbmRsZSwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkmIHNhbmRib3hF eHRlbnNpb25zRm9yVXBsb2FkKQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDIyMTc0MykKKysrIFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNTc4LDcgKzM1 NzgsNyBAQCBib29sIFdlYlBhZ2U6OmhhbmRsZUVkaXRpbmdLZXlib2FyZEV2ZW50CiAjaWYgRU5B QkxFKERSQUdfU1VQUE9SVCkKIAogI2lmIFBMQVRGT1JNKEdUSykKLXZvaWQgV2ViUGFnZTo6cGVy Zm9ybURyYWdDb250cm9sbGVyQWN0aW9uKHVpbnQ2NF90IGFjdGlvbiwgY29uc3QgSW50UG9pbnQm IGNsaWVudFBvc2l0aW9uLCBjb25zdCBJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIHVpbnQ2NF90 IGRyYWdnaW5nU291cmNlT3BlcmF0aW9uTWFzaywgV2ViU2VsZWN0aW9uRGF0YSYmIHNlbGVjdGlv biwgdWludDMyX3QgZmxhZ3MpCit2b2lkIFdlYlBhZ2U6OnBlcmZvcm1EcmFnQ29udHJvbGxlckFj dGlvbihEcmFnQ29udHJvbGxlckFjdGlvbiBhY3Rpb24sIGNvbnN0IEludFBvaW50JiBjbGllbnRQ b3NpdGlvbiwgY29uc3QgSW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCB1aW50NjRfdCBkcmFnZ2lu Z1NvdXJjZU9wZXJhdGlvbk1hc2ssIFdlYlNlbGVjdGlvbkRhdGEmJiBzZWxlY3Rpb24sIHVpbnQz Ml90IGZsYWdzKQogewogICAgIGlmICghbV9wYWdlKSB7CiAgICAgICAgIHNlbmQoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6RGlkUGVyZm9ybURyYWdDb250cm9sbGVyQWN0aW9uKERyYWdPcGVyYXRp b25Ob25lLCBmYWxzZSwgMCwgeyB9KSk7CkBAIC0zNTg3LDMxICszNTg3LDI5IEBAIHZvaWQgV2Vi UGFnZTo6cGVyZm9ybURyYWdDb250cm9sbGVyQWN0aW8KIAogICAgIERyYWdEYXRhIGRyYWdEYXRh KHNlbGVjdGlvbi5zZWxlY3Rpb25EYXRhLnB0cigpLCBjbGllbnRQb3NpdGlvbiwgZ2xvYmFsUG9z aXRpb24sIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KGRyYWdnaW5nU291cmNlT3BlcmF0aW9u TWFzayksIHN0YXRpY19jYXN0PERyYWdBcHBsaWNhdGlvbkZsYWdzPihmbGFncykpOwogICAgIHN3 aXRjaCAoYWN0aW9uKSB7Ci0gICAgY2FzZSBEcmFnQ29udHJvbGxlckFjdGlvbkVudGVyZWQ6IHsK KyAgICBjYXNlIERyYWdDb250cm9sbGVyQWN0aW9uOjpFbnRlcmVkOiB7CiAgICAgICAgIERyYWdP cGVyYXRpb24gcmVzb2x2ZWREcmFnT3BlcmF0aW9uID0gbV9wYWdlLT5kcmFnQ29udHJvbGxlcigp LmRyYWdFbnRlcmVkKGRyYWdEYXRhKTsKICAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRQZXJmb3JtRHJhZ0NvbnRyb2xsZXJBY3Rpb24ocmVzb2x2ZWREcmFnT3BlcmF0aW9u LCBtX3BhZ2UtPmRyYWdDb250cm9sbGVyKCkubW91c2VJc092ZXJGaWxlSW5wdXQoKSwgbV9wYWdl LT5kcmFnQ29udHJvbGxlcigpLm51bWJlck9mSXRlbXNUb0JlQWNjZXB0ZWQoKSwgeyB9KSk7Ci0g ICAgICAgIGJyZWFrOworICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGNhc2UgRHJhZ0NvbnRy b2xsZXJBY3Rpb25VcGRhdGVkOiB7CisgICAgY2FzZSBEcmFnQ29udHJvbGxlckFjdGlvbjo6VXBk YXRlZDogewogICAgICAgICBEcmFnT3BlcmF0aW9uIHJlc29sdmVkRHJhZ09wZXJhdGlvbiA9IG1f cGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS5kcmFnRW50ZXJlZChkcmFnRGF0YSk7CiAgICAgICAgIHNl bmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUGVyZm9ybURyYWdDb250cm9sbGVyQWN0aW9u KHJlc29sdmVkRHJhZ09wZXJhdGlvbiwgbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLm1vdXNlSXNP dmVyRmlsZUlucHV0KCksIG1fcGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS5udW1iZXJPZkl0ZW1zVG9C ZUFjY2VwdGVkKCksIHsgfSkpOwotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwogICAg IH0KLSAgICBjYXNlIERyYWdDb250cm9sbGVyQWN0aW9uRXhpdGVkOgorICAgIGNhc2UgRHJhZ0Nv bnRyb2xsZXJBY3Rpb246OkV4aXRlZDoKICAgICAgICAgbV9wYWdlLT5kcmFnQ29udHJvbGxlcigp LmRyYWdFeGl0ZWQoZHJhZ0RhdGEpOwotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwog Ci0gICAgY2FzZSBEcmFnQ29udHJvbGxlckFjdGlvblBlcmZvcm1EcmFnT3BlcmF0aW9uOiB7Cisg ICAgY2FzZSBEcmFnQ29udHJvbGxlckFjdGlvbjo6UGVyZm9ybURyYWdPcGVyYXRpb246IHsKICAg ICAgICAgbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLnBlcmZvcm1EcmFnT3BlcmF0aW9uKGRyYWdE YXRhKTsKLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVybjsKICAgICB9Ci0KLSAgICBkZWZh dWx0OgotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CisgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CiB9CiAjZWxzZQotdm9pZCBXZWJQYWdlOjpwZXJmb3JtRHJhZ0NvbnRyb2xs ZXJBY3Rpb24odWludDY0X3QgYWN0aW9uLCBjb25zdCBXZWJDb3JlOjpEcmFnRGF0YSYgZHJhZ0Rh dGEsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lvbkhhbmRs ZSwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkmIHNhbmRib3hFeHRlbnNpb25z SGFuZGxlQXJyYXkpCit2b2lkIFdlYlBhZ2U6OnBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihE cmFnQ29udHJvbGxlckFjdGlvbiBhY3Rpb24sIGNvbnN0IFdlYkNvcmU6OkRyYWdEYXRhJiBkcmFn RGF0YSwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBzYW5kYm94RXh0ZW5zaW9uSGFu ZGxlLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSYgc2FuZGJveEV4dGVuc2lv bnNIYW5kbGVBcnJheSkKIHsKICAgICBpZiAoIW1fcGFnZSkgewogICAgICAgICBzZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OkRpZFBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnT3Bl cmF0aW9uTm9uZSwgZmFsc2UsIDAsIHsgfSkpOwpAQCAtMzYxOSwyMyArMzYxNywyMiBAQCB2b2lk IFdlYlBhZ2U6OnBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvCiAgICAgfQogCiAgICAgc3dpdGNo IChhY3Rpb24pIHsKLSAgICBjYXNlIERyYWdDb250cm9sbGVyQWN0aW9uRW50ZXJlZDogeworICAg IGNhc2UgRHJhZ0NvbnRyb2xsZXJBY3Rpb246OkVudGVyZWQ6IHsKICAgICAgICAgRHJhZ09wZXJh dGlvbiByZXNvbHZlZERyYWdPcGVyYXRpb24gPSBtX3BhZ2UtPmRyYWdDb250cm9sbGVyKCkuZHJh Z0VudGVyZWQoZHJhZ0RhdGEpOwogICAgICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRpZFBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihyZXNvbHZlZERyYWdPcGVyYXRpb24sIG1f cGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS5tb3VzZUlzT3ZlckZpbGVJbnB1dCgpLCBtX3BhZ2UtPmRy YWdDb250cm9sbGVyKCkubnVtYmVyT2ZJdGVtc1RvQmVBY2NlcHRlZCgpLCBtX3BhZ2UtPmRyYWdD YXJldENvbnRyb2xsZXIoKS5jYXJldFJlY3RJblJvb3RWaWV3Q29vcmRpbmF0ZXMoKSkpOwotICAg ICAgICBicmVhazsKLQorICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGNhc2UgRHJhZ0NvbnRy b2xsZXJBY3Rpb25VcGRhdGVkOiB7CisgICAgY2FzZSBEcmFnQ29udHJvbGxlckFjdGlvbjo6VXBk YXRlZDogewogICAgICAgICBEcmFnT3BlcmF0aW9uIHJlc29sdmVkRHJhZ09wZXJhdGlvbiA9IG1f cGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS5kcmFnVXBkYXRlZChkcmFnRGF0YSk7CiAgICAgICAgIHNl bmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUGVyZm9ybURyYWdDb250cm9sbGVyQWN0aW9u KHJlc29sdmVkRHJhZ09wZXJhdGlvbiwgbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLm1vdXNlSXNP dmVyRmlsZUlucHV0KCksIG1fcGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS5udW1iZXJPZkl0ZW1zVG9C ZUFjY2VwdGVkKCksIG1fcGFnZS0+ZHJhZ0NhcmV0Q29udHJvbGxlcigpLmNhcmV0UmVjdEluUm9v dFZpZXdDb29yZGluYXRlcygpKSk7Ci0gICAgICAgIGJyZWFrOworICAgICAgICByZXR1cm47CiAg ICAgfQotICAgIGNhc2UgRHJhZ0NvbnRyb2xsZXJBY3Rpb25FeGl0ZWQ6CisgICAgY2FzZSBEcmFn Q29udHJvbGxlckFjdGlvbjo6RXhpdGVkOgogICAgICAgICBtX3BhZ2UtPmRyYWdDb250cm9sbGVy KCkuZHJhZ0V4aXRlZChkcmFnRGF0YSk7CiAgICAgICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6RGlkUGVyZm9ybURyYWdDb250cm9sbGVyQWN0aW9uKERyYWdPcGVyYXRpb25Ob25lLCBm YWxzZSwgMCwgeyB9KSk7Ci0gICAgICAgIGJyZWFrOworICAgICAgICByZXR1cm47CiAgICAgICAg IAotICAgIGNhc2UgRHJhZ0NvbnRyb2xsZXJBY3Rpb25QZXJmb3JtRHJhZ09wZXJhdGlvbjogewor ICAgIGNhc2UgRHJhZ0NvbnRyb2xsZXJBY3Rpb246OlBlcmZvcm1EcmFnT3BlcmF0aW9uOiB7CiAg ICAgICAgIEFTU0VSVCghbV9wZW5kaW5nRHJvcFNhbmRib3hFeHRlbnNpb24pOwogCiAgICAgICAg IG1fcGVuZGluZ0Ryb3BTYW5kYm94RXh0ZW5zaW9uID0gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRl KHNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwpAQCAtMzY1NiwxMiArMzY1MywxMCBAQCB2b2lkIFdl YlBhZ2U6OnBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvCiAjZWxzZQogICAgICAgICBVTlVTRURf UEFSQU0oaGFuZGxlZCk7CiAjZW5kaWYKLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVybjsK ICAgICB9Ci0KLSAgICBkZWZhdWx0OgotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICB9CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAjZW5kaWYKIApJbmRleDogU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gMjIxNzAxKQor KysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCSh3b3JraW5nIGNv cHkpCkBAIC0xOTIsNyArMTkyLDYgQEAgY2xhc3MgV2ViVW5kb1N0ZXA7CiBjbGFzcyBXZWJVc2Vy Q29udGVudENvbnRyb2xsZXI7CiBjbGFzcyBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOwogY2xhc3Mg V2ViV2hlZWxFdmVudDsKLWVudW0gRmluZE9wdGlvbnMgOiB1aW50MTZfdDsKIHN0cnVjdCBBc3Np c3RlZE5vZGVJbmZvcm1hdGlvbjsKIHN0cnVjdCBBdHRyaWJ1dGVkU3RyaW5nOwogc3RydWN0IEJh Y2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZTsKQEAgLTIwNiw2ICsyMDUsOSBAQCBzdHJ1Y3QgV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVyczsKIHN0cnVjdCBXZWJQcmVmZXJlbmNlc1N0b3JlOwogc3RydWN0 IFdlYlNlbGVjdGlvbkRhdGE7CiAKK2VudW0gY2xhc3MgRHJhZ0NvbnRyb2xsZXJBY3Rpb247Citl bnVtIEZpbmRPcHRpb25zIDogdWludDE2X3Q7CisKIHR5cGVkZWYgdWludDMyX3QgU25hcHNob3RP cHRpb25zOwogdHlwZWRlZiB1aW50MzJfdCBXS0V2ZW50TW9kaWZpZXJzOwogCkBAIC03MzQsOSAr NzM2LDkgQEAgcHVibGljOgogCiAjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKICNpZiBQTEFURk9S TShHVEspCi0gICAgdm9pZCBwZXJmb3JtRHJhZ0NvbnRyb2xsZXJBY3Rpb24odWludDY0X3QgYWN0 aW9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgY2xpZW50UG9zaXRpb24sIGNvbnN0IFdlYkNv cmU6OkludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgdWludDY0X3QgZHJhZ2dpbmdTb3VyY2VPcGVy YXRpb25NYXNrLCBXZWJTZWxlY3Rpb25EYXRhJiYsIHVpbnQzMl90IGZsYWdzKTsKKyAgICB2b2lk IHBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxlckFjdGlvbiwgY29uc3Qg V2ViQ29yZTo6SW50UG9pbnQmIGNsaWVudFBvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2lu dCYgZ2xvYmFsUG9zaXRpb24sIHVpbnQ2NF90IGRyYWdnaW5nU291cmNlT3BlcmF0aW9uTWFzaywg V2ViU2VsZWN0aW9uRGF0YSYmLCB1aW50MzJfdCBmbGFncyk7CiAjZWxzZQotICAgIHZvaWQgcGVy Zm9ybURyYWdDb250cm9sbGVyQWN0aW9uKHVpbnQ2NF90IGFjdGlvbiwgY29uc3QgV2ViQ29yZTo6 RHJhZ0RhdGEmLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmLCBjb25zdCBTYW5kYm94 RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSYpOworICAgIHZvaWQgcGVyZm9ybURyYWdDb250cm9sbGVy QWN0aW9uKERyYWdDb250cm9sbGVyQWN0aW9uLCBjb25zdCBXZWJDb3JlOjpEcmFnRGF0YSYsIGNv bnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246Okhh bmRsZUFycmF5Jik7CiAjZW5kaWYKICAgICB2b2lkIGRyYWdFbmRlZChXZWJDb3JlOjpJbnRQb2lu dCBjbGllbnRQb3NpdGlvbiwgV2ViQ29yZTo6SW50UG9pbnQgZ2xvYmFsUG9zaXRpb24sIHVpbnQ2 NF90IG9wZXJhdGlvbik7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMjIxNzAxKQorKysgU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkod29ya2lu ZyBjb3B5KQpAQCAtMjQwLDEwICsyNDAsMTAgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lS ZWNlaXZlciB7CiAKICAgICAjIERyYWcgYW5kIGRyb3AuCiAjaWYgUExBVEZPUk0oR1RLKSAmJiBF TkFCTEUoRFJBR19TVVBQT1JUKQotICAgIFBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbih1aW50 NjRfdCBhY3Rpb24sIFdlYkNvcmU6OkludFBvaW50IGNsaWVudFBvc2l0aW9uLCBXZWJDb3JlOjpJ bnRQb2ludCBnbG9iYWxQb3NpdGlvbiwgdWludDY0X3QgZHJhZ2dpbmdTb3VyY2VPcGVyYXRpb25N YXNrLCBzdHJ1Y3QgV2ViS2l0OjpXZWJTZWxlY3Rpb25EYXRhIHNlbGVjdGlvbiwgdWludDMyX3Qg ZmxhZ3MpCisgICAgUGVyZm9ybURyYWdDb250cm9sbGVyQWN0aW9uKGVudW0gV2ViS2l0OjpEcmFn Q29udHJvbGxlckFjdGlvbiBhY3Rpb24sIFdlYkNvcmU6OkludFBvaW50IGNsaWVudFBvc2l0aW9u LCBXZWJDb3JlOjpJbnRQb2ludCBnbG9iYWxQb3NpdGlvbiwgdWludDY0X3QgZHJhZ2dpbmdTb3Vy Y2VPcGVyYXRpb25NYXNrLCBzdHJ1Y3QgV2ViS2l0OjpXZWJTZWxlY3Rpb25EYXRhIHNlbGVjdGlv biwgdWludDMyX3QgZmxhZ3MpCiAjZW5kaWYKICNpZiAhUExBVEZPUk0oR1RLKSAmJiBFTkFCTEUo RFJBR19TVVBQT1JUKQotICAgIFBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbih1aW50NjRfdCBh Y3Rpb24sIFdlYkNvcmU6OkRyYWdEYXRhIGRyYWdEYXRhLCBXZWJLaXQ6OlNhbmRib3hFeHRlbnNp b246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBXZWJLaXQ6OlNhbmRib3hFeHRlbnNp b246OkhhbmRsZUFycmF5IHNhbmRib3hFeHRlbnNpb25zRm9yVXBsb2FkKQorICAgIFBlcmZvcm1E cmFnQ29udHJvbGxlckFjdGlvbihlbnVtIFdlYktpdDo6RHJhZ0NvbnRyb2xsZXJBY3Rpb24gYWN0 aW9uLCBXZWJDb3JlOjpEcmFnRGF0YSBkcmFnRGF0YSwgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9u OjpIYW5kbGUgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSwgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9u OjpIYW5kbGVBcnJheSBzYW5kYm94RXh0ZW5zaW9uc0ZvclVwbG9hZCkKICNlbmRpZgogI2lmIEVO QUJMRShEUkFHX1NVUFBPUlQpCiAgICAgRGlkU3RhcnREcmFnKCkK