145862 2015-06-10 16:35:06 -0700 WKWebsiteDataStore should handle removing plug-in data 2015-06-10 17:28:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 1101158 0 andersca 2015-06-10 16:35:06 -0700 WKWebsiteDataStore should handle removing plug-in data 1101160 1 254689 andersca 2015-06-10 16:36:01 -0700 Created attachment 254689 Patch 1101162 2 commit-queue 2015-06-10 16:38:49 -0700 Attachment 254689 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp:126: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp:105: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h:83: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h:176: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h:66: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 5 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 1101176 3 andersca 2015-06-10 17:28:10 -0700 Committed r185439: <http://trac.webkit.org/changeset/185439> 254689 2015-06-10 16:36:01 -0700 2015-06-10 17:15:19 -0700 Patch bug-145862-20150610163533.patch text/plain 15261 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDhjZjBlZDU3ZTIyODM1 MzgwNGE5YmU4ODIzNDUwNTk4MDZhOWRlNy4uYWVkZDliODRkZDQ0ZmMwYmNkN2Y1YmE5YTdkMDU0 ODVkYTAzNDUyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTA2LTEwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgV0tXZWJzaXRlRGF0 YVN0b3JlIHNob3VsZCBoYW5kbGUgcmVtb3ZpbmcgcGx1Zy1pbiBkYXRhCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU4NjIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsdWdpblByb2Nlc3MvUGx1Z2lu UHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3M6OmRlbGV0ZVdlYnNp dGVEYXRhKToKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MuaDoKKyAgICAg ICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MubWVzc2FnZXMuaW46CisgICAgICAgICog VUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6ZGVsZXRlV2Vic2l0ZURhdGEpOgorICAgICAgICAq IFVJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmg6CisgICAgICAgICogVUlQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UGx1Z2luUHJvY2Vzc1Byb3h5Ojp+UGx1Z2luUHJvY2Vzc1Byb3h5KToKKyAgICAgICAgKFdlYktp dDo6UGx1Z2luUHJvY2Vzc1Byb3h5OjpkZWxldGVXZWJzaXRlRGF0YSk6CisgICAgICAgIChXZWJL aXQ6OlBsdWdpblByb2Nlc3NQcm94eTo6cGx1Z2luUHJvY2Vzc0NyYXNoZWRPckZhaWxlZFRvTGF1 bmNoKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVu Y2hpbmcpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzUHJveHk6OmRpZERlbGV0ZVdl YnNpdGVEYXRhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJv eHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJveHkubWVz c2FnZXMuaW46CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3Rv cmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKToK KwogMjAxNS0wNi0wOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAg ICAgICAgIFN1cHBvcnQgZmV0Y2hpbmcgd2Vic2l0ZSBkYXRhCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmNwcAppbmRleCBlMzNkZTAwMGJiZTFlYjNlMzgy YWJmODhmNzU0YWRjM2Y3MTE5MTczLi5jN2JiYzA1OWRmNDVlNTc4YmYwYjhhMjk2MzBlZDRlNGZi NDBjYTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblBy b2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vz cy5jcHAKQEAgLTIxNCw2ICsyMTQsMjEgQEAgdm9pZCBQbHVnaW5Qcm9jZXNzOjpjbGVhclNpdGVE YXRhKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBzaXRlcywgdWludDY0X3QgZmxhZ3MsIHUKICAgICBw YXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpQbHVnaW5Qcm9jZXNzUHJv eHk6OkRpZENsZWFyU2l0ZURhdGEoY2FsbGJhY2tJRCksIDApOwogfQogCit2b2lkIFBsdWdpblBy b2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhKHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVf cG9pbnQgbW9kaWZpZWRTaW5jZSwgdWludDY0X3QgY2FsbGJhY2tJRCkKK3sKKyAgICBpZiAoYXV0 byogbW9kdWxlID0gbmV0c2NhcGVQbHVnaW5Nb2R1bGUoKSkgeworICAgICAgICBhdXRvIGN1cnJl bnRUaW1lID0gc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6bm93KCk7CisKKyAgICAgICAgaWYg KGN1cnJlbnRUaW1lID4gbW9kaWZpZWRTaW5jZSkgeworICAgICAgICAgICAgdWludDY0X3QgbWF4 aW11bUFnZSA9IHN0ZDo6Y2hyb25vOjpkdXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjpzZWNvbmRz PihjdXJyZW50VGltZSAtIG1vZGlmaWVkU2luY2UpLmNvdW50KCk7CisKKyAgICAgICAgICAgIG1v ZHVsZS0+Y2xlYXJTaXRlRGF0YShTdHJpbmcoKSwgTlBfQ0xFQVJfQUxMLCBtYXhpbXVtQWdlKTsK KyAgICAgICAgfQorICAgIH0KKworICAgIHBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQo TWVzc2FnZXM6OlBsdWdpblByb2Nlc3NQcm94eTo6RGlkRGVsZXRlV2Vic2l0ZURhdGEoY2FsbGJh Y2tJRCksIDApOworfQorCiB2b2lkIFBsdWdpblByb2Nlc3M6OnNldE1pbmltdW1MaWZldGltZShk b3VibGUgbGlmZXRpbWUpCiB7CiAgICAgaWYgKGxpZmV0aW1lIDw9IDAuMCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5oIGIvU291cmNlL1dl YktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmgKaW5kZXggODg0NGIwYWQ5MDk3YmU5 MWFlYTYyMTRlZDJhODUzMTdkMTM5ZDUzNi4uZjVhNDZlMWVlOGRkMGU5ZTNjNjA2YzA1NzVjYjBi MGVkOWY3NmIxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVn aW5Qcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9j ZXNzLmgKQEAgLTk4LDkgKzk4LDExIEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRSZWNlaXZlUGx1 Z2luUHJvY2Vzc01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpNZXNzYWdlRGVjb2RlciYp OwogICAgIHZvaWQgaW5pdGlhbGl6ZVBsdWdpblByb2Nlc3MoUGx1Z2luUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycyYmKTsKICAgICB2b2lkIGNyZWF0ZVdlYlByb2Nlc3NDb25uZWN0aW9uKCk7CisK ICAgICB2b2lkIGdldFNpdGVzV2l0aERhdGEodWludDY0X3QgY2FsbGJhY2tJRCk7CiAgICAgdm9p ZCBjbGVhclNpdGVEYXRhKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBzaXRlcywgdWludDY0X3QgZmxh Z3MsIHVpbnQ2NF90IG1heEFnZUluU2Vjb25kcywgdWludDY0X3QgY2FsbGJhY2tJRCk7Ci0gICAg CisgICAgdm9pZCBkZWxldGVXZWJzaXRlRGF0YShzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0 aW1lX3BvaW50IG1vZGlmaWVkU2luY2UsIHVpbnQ2NF90IGNhbGxiYWNrSUQpOworCiAgICAgLy8g QXVkaW9IYXJkd2FyZUxpc3RlbmVyQ2xpZW50CiAgICAgdmlydHVhbCB2b2lkIGF1ZGlvSGFyZHdh cmVEaWRCZWNvbWVBY3RpdmUoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgYXVkaW9IYXJk d2FyZURpZEJlY29tZUluYWN0aXZlKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2Vi S2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MubWVzc2FnZXMuaW4KaW5kZXggNjU1YjFl ZTE0NjViMTM3MDdkOTIxMzFiNTVkNzhmODkxNzgxMmEzNi4uMGY3NzFiYzRkNjc0MWFiZDc3OWMy ZTRiNmM0ZWMyMWFhMThhODQ3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGx1Z2luUHJv Y2Vzcy9QbHVnaW5Qcm9jZXNzLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsdWdp blByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5tZXNzYWdlcy5pbgpAQCAtMzksNiArMzksOCBAQCBtZXNz YWdlcyAtPiBQbHVnaW5Qcm9jZXNzIExlZ2FjeVJlY2VpdmVyIHsKICAgICAjIGEgRGlkQ2xlYXJT aXRlRGF0YSBtZXNzYWdlIHdoZW4gZG9uZS4KICAgICBDbGVhclNpdGVEYXRhKFZlY3RvcjxTdHJp bmc+IHNpdGVzLCB1aW50NjRfdCBmbGFncywgdWludDY0X3QgbWF4QWdlSW5TZWNvbmRzLCB1aW50 NjRfdCBjYWxsYmFja0lEKQogCisgICAgRGVsZXRlV2Vic2l0ZURhdGEoc3RkOjpjaHJvbm86OnN5 c3RlbV9jbG9jazo6dGltZV9wb2ludCBtb2RpZmllZFNpbmNlLCB1aW50NjRfdCBjYWxsYmFja0lE KQorCiAgICAgU2V0UHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZChib29sIGZsYWcpCiAjaWYgUExB VEZPUk0oQ09DT0EpCiAgICAgU2V0UU9TKGludCBsYXRlbmN5UU9TLCBpbnQgdGhyb3VnaHB1dFFP UykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblBy b2Nlc3NNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blByb2Nlc3NNYW5hZ2VyLmNwcAppbmRleCA5YmE4ZjhmN2MwYmE1MDY4YTNkN2UyOGNhZTc4ZWQ2 MTE2NmVhNGFlLi5iNDA5MWZhYjg0NjkyZTUwMmE3MmMzZThjNTFmMzcyMzE1ODkwYWRlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFu YWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJv Y2Vzc01hbmFnZXIuY3BwCkBAIC0xMDIsNiArMTAyLDEzIEBAIHZvaWQgUGx1Z2luUHJvY2Vzc01h bmFnZXI6OmZldGNoV2Vic2l0ZURhdGEoY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luLCBz dGQ6CiAgICAgcGx1Z2luUHJvY2Vzcy0+ZmV0Y2hXZWJzaXRlRGF0YShXVEY6Om1vdmUoY29tcGxl dGlvbkhhbmRsZXIpKTsKIH0KIAordm9pZCBQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6ZGVsZXRlV2Vi c2l0ZURhdGEoY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luLCBzdGQ6OmNocm9ubzo6c3lz dGVtX2Nsb2NrOjp0aW1lX3BvaW50IG1vZGlmaWVkU2luY2UsIHN0ZDo6ZnVuY3Rpb248dm9pZCAo KT4gY29tcGxldGlvbkhhbmRsZXIpCit7CisgICAgUGx1Z2luUHJvY2Vzc1Byb3h5KiBwbHVnaW5Q cm9jZXNzID0gZ2V0T3JDcmVhdGVQbHVnaW5Qcm9jZXNzKHBsdWdpblByb2Nlc3NUb2tlbihwbHVn aW4sIFBsdWdpblByb2Nlc3NUeXBlTm9ybWFsLCBQbHVnaW5Qcm9jZXNzU2FuZGJveFBvbGljeU5v cm1hbCkpOworCisgICAgcGx1Z2luUHJvY2Vzcy0+ZGVsZXRlV2Vic2l0ZURhdGEobW9kaWZpZWRT aW5jZSwgV1RGOjptb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Cit9CisKIHZvaWQgUGx1Z2luUHJv Y2Vzc01hbmFnZXI6OmNsZWFyU2l0ZURhdGEoY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2lu LCBXZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIqIHdlYlBsdWdpblNpdGVEYXRhTWFuYWdlciwgY29u c3QgVmVjdG9yPFN0cmluZz4mIHNpdGVzLCB1aW50NjRfdCBmbGFncywgdWludDY0X3QgbWF4QWdl SW5TZWNvbmRzLCB1aW50NjRfdCBjYWxsYmFja0lEKQogewogICAgIFBsdWdpblByb2Nlc3NQcm94 eSogcGx1Z2luUHJvY2VzcyA9IGdldE9yQ3JlYXRlUGx1Z2luUHJvY2VzcyhwbHVnaW5Qcm9jZXNz VG9rZW4ocGx1Z2luLCBQbHVnaW5Qcm9jZXNzVHlwZU5vcm1hbCwgUGx1Z2luUHJvY2Vzc1NhbmRi b3hQb2xpY3lOb3JtYWwpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5oCmluZGV4IDQxM2NiZTMwY2M5MGM5YzZkZDU4 ZDE2M2MzYWM5ZDg5YTA4ZWE2OWEuLjdmZGRkN2M4ZWRkMGFjZWE2M2U2NGVjY2I4ZjRjZjNlNzI0 MjNjNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blByb2Nlc3NNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMv UGx1Z2luUHJvY2Vzc01hbmFnZXIuaApAQCAtNjMsNiArNjMsNyBAQCBwdWJsaWM6CiAgICAgdm9p ZCByZW1vdmVQbHVnaW5Qcm9jZXNzUHJveHkoUGx1Z2luUHJvY2Vzc1Byb3h5Kik7CiAKICAgICB2 b2lkIGZldGNoV2Vic2l0ZURhdGEoY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYsIHN0ZDo6ZnVuY3Rp b248dm9pZCAoVmVjdG9yPFN0cmluZz4pPiBjb21wbGV0aW9uSGFuZGxlcik7CisgICAgdm9pZCBk ZWxldGVXZWJzaXRlRGF0YShjb25zdCBQbHVnaW5Nb2R1bGVJbmZvJiwgc3RkOjpjaHJvbm86OnN5 c3RlbV9jbG9jazo6dGltZV9wb2ludCBtb2RpZmllZFNpbmNlLCBzdGQ6OmZ1bmN0aW9uPHZvaWQg KCk+IGNvbXBsZXRpb25IYW5kbGVyKTsKICAgICB2b2lkIGNsZWFyU2l0ZURhdGEoY29uc3QgUGx1 Z2luTW9kdWxlSW5mbyYsIFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlciosIGNvbnN0IFZlY3RvcjxT dHJpbmc+JiBzaXRlcywgdWludDY0X3QgZmxhZ3MsIHVpbnQ2NF90IG1heEFnZUluU2Vjb25kcywg dWludDY0X3QgY2FsbGJhY2tJRCk7CiAKICNpZiBQTEFURk9STShDT0NPQSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJveHkuY3Bw CmluZGV4IDAyOWY0ZmNjYzRiZjAyMDU4M2U3YzZjZTUzYWYwM2E0MTc0MTRjZmIuLjliMDUxYmQ5 ZTFiY2MxYjg3ODZkMTdmMWM2YmMwZDhjNzMyMmIzYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmNwcApAQCAtNzks NiArNzksOCBAQCBQbHVnaW5Qcm9jZXNzUHJveHk6On5QbHVnaW5Qcm9jZXNzUHJveHkoKQogewog ICAgIEFTU0VSVChtX3BlbmRpbmdGZXRjaFdlYnNpdGVEYXRhUmVxdWVzdHMuaXNFbXB0eSgpKTsK ICAgICBBU1NFUlQobV9wZW5kaW5nRmV0Y2hXZWJzaXRlRGF0YUNhbGxiYWNrcy5pc0VtcHR5KCkp OworICAgIEFTU0VSVChtX3BlbmRpbmdEZWxldGVXZWJzaXRlRGF0YVJlcXVlc3RzLmlzRW1wdHko KSk7CisgICAgQVNTRVJUKG1fcGVuZGluZ0RlbGV0ZVdlYnNpdGVEYXRhQ2FsbGJhY2tzLmlzRW1w dHkoKSk7CiB9CiAKIHZvaWQgUGx1Z2luUHJvY2Vzc1Byb3h5OjpnZXRMYXVuY2hPcHRpb25zKFBy b2Nlc3NMYXVuY2hlcjo6TGF1bmNoT3B0aW9ucyYgbGF1bmNoT3B0aW9ucykKQEAgLTEyMSw2ICsx MjMsMTkgQEAgdm9pZCBQbHVnaW5Qcm9jZXNzUHJveHk6OmZldGNoV2Vic2l0ZURhdGEoc3RkOjpm dW5jdGlvbjx2b2lkIChWZWN0b3I8U3RyaW5nPik+IGMKICAgICBtX2Nvbm5lY3Rpb24tPnNlbmQo TWVzc2FnZXM6OlBsdWdpblByb2Nlc3M6OkdldFNpdGVzV2l0aERhdGEoY2FsbGJhY2tJRCksIDAp OwogfQogCit2b2lkIFBsdWdpblByb2Nlc3NQcm94eTo6ZGVsZXRlV2Vic2l0ZURhdGEoc3RkOjpj aHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCBtb2RpZmllZFNpbmNlLCBzdGQ6OmZ1bmN0 aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKQoreworICAgIHVpbnQ2NF90IGNhbGxiYWNr SUQgPSBnZW5lcmF0ZUNhbGxiYWNrSUQoKTsKKyAgICBtX3BlbmRpbmdEZWxldGVXZWJzaXRlRGF0 YUNhbGxiYWNrcy5zZXQoY2FsbGJhY2tJRCwgV1RGOjptb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7 CisKKyAgICBpZiAoc3RhdGUoKSA9PSBTdGF0ZTo6TGF1bmNoaW5nKSB7CisgICAgICAgIG1fcGVu ZGluZ0RlbGV0ZVdlYnNpdGVEYXRhUmVxdWVzdHMuYXBwZW5kKHsgbW9kaWZpZWRTaW5jZSwgY2Fs bGJhY2tJRCB9KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIG1fY29ubmVjdGlvbi0+ c2VuZChNZXNzYWdlczo6UGx1Z2luUHJvY2Vzczo6RGVsZXRlV2Vic2l0ZURhdGEobW9kaWZpZWRT aW5jZSwgY2FsbGJhY2tJRCksIDApOworfQorCiB2b2lkIFBsdWdpblByb2Nlc3NQcm94eTo6Y2xl YXJTaXRlRGF0YShXZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIqIHdlYlBsdWdpblNpdGVEYXRhTWFu YWdlciwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHNpdGVzLCB1aW50NjRfdCBmbGFncywgdWludDY0 X3QgbWF4QWdlSW5TZWNvbmRzLCB1aW50NjRfdCBjYWxsYmFja0lEKQogewogICAgIEFTU0VSVCgh bV9wZW5kaW5nQ2xlYXJTaXRlRGF0YVJlcGxpZXMuY29udGFpbnMoY2FsbGJhY2tJRCkpOwpAQCAt MTU2LDExICsxNzEsMTUgQEAgdm9pZCBQbHVnaW5Qcm9jZXNzUHJveHk6OnBsdWdpblByb2Nlc3ND cmFzaGVkT3JGYWlsZWRUb0xhdW5jaCgpCiAgICAgfQogCiAgICAgbV9wZW5kaW5nRmV0Y2hXZWJz aXRlRGF0YVJlcXVlc3RzLmNsZWFyKCk7Ci0KICAgICBmb3IgKGNvbnN0IGF1dG8mIGNhbGxiYWNr IDogbV9wZW5kaW5nRmV0Y2hXZWJzaXRlRGF0YUNhbGxiYWNrcy52YWx1ZXMoKSkKICAgICAgICAg Y2FsbGJhY2soeyB9KTsKICAgICBtX3BlbmRpbmdGZXRjaFdlYnNpdGVEYXRhQ2FsbGJhY2tzLmNs ZWFyKCk7CiAKKyAgICBtX3BlbmRpbmdEZWxldGVXZWJzaXRlRGF0YVJlcXVlc3RzLmNsZWFyKCk7 CisgICAgZm9yIChjb25zdCBhdXRvJiBjYWxsYmFjayA6IG1fcGVuZGluZ0RlbGV0ZVdlYnNpdGVE YXRhQ2FsbGJhY2tzLnZhbHVlcygpKQorICAgICAgICBjYWxsYmFjaygpOworICAgIG1fcGVuZGlu Z0RlbGV0ZVdlYnNpdGVEYXRhUmVxdWVzdHMuY2xlYXIoKTsKKwogICAgIHdoaWxlICghbV9wZW5k aW5nQ2xlYXJTaXRlRGF0YVJlcGxpZXMuaXNFbXB0eSgpKQogICAgICAgICBkaWRDbGVhclNpdGVE YXRhKG1fcGVuZGluZ0NsZWFyU2l0ZURhdGFSZXBsaWVzLmJlZ2luKCktPmtleSk7CiAKQEAgLTIy OCw2ICsyNDcsMTAgQEAgdm9pZCBQbHVnaW5Qcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGlu ZyhQcm9jZXNzTGF1bmNoZXIqLCBJUEM6OkNvbm5lY3Rpb246OkkKICAgICAgICAgbV9jb25uZWN0 aW9uLT5zZW5kKE1lc3NhZ2VzOjpQbHVnaW5Qcm9jZXNzOjpHZXRTaXRlc1dpdGhEYXRhKGNhbGxi YWNrSUQpLCAwKTsKICAgICBtX3BlbmRpbmdGZXRjaFdlYnNpdGVEYXRhUmVxdWVzdHMuY2xlYXIo KTsKIAorICAgIGZvciAoYXV0byYgZGVsZXRlV2Vic2l0ZURhdGFSZXF1ZXN0IDogbV9wZW5kaW5n RGVsZXRlV2Vic2l0ZURhdGFSZXF1ZXN0cykKKyAgICAgICAgbV9jb25uZWN0aW9uLT5zZW5kKE1l c3NhZ2VzOjpQbHVnaW5Qcm9jZXNzOjpEZWxldGVXZWJzaXRlRGF0YShkZWxldGVXZWJzaXRlRGF0 YVJlcXVlc3QubW9kaWZpZWRTaW5jZSwgZGVsZXRlV2Vic2l0ZURhdGFSZXF1ZXN0LmNhbGxiYWNr SUQpLCAwKTsKKyAgICBtX3BlbmRpbmdEZWxldGVXZWJzaXRlRGF0YVJlcXVlc3RzLmNsZWFyKCk7 CisKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcGVuZGluZ0NsZWFyU2l0ZURhdGFSZXF1 ZXN0cy5zaXplKCk7ICsraSkgewogICAgICAgICBjb25zdCBDbGVhclNpdGVEYXRhUmVxdWVzdCYg cmVxdWVzdCA9IG1fcGVuZGluZ0NsZWFyU2l0ZURhdGFSZXF1ZXN0c1tpXTsKICAgICAgICAgbV9j b25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpQbHVnaW5Qcm9jZXNzOjpDbGVhclNpdGVEYXRhKHJl cXVlc3Quc2l0ZXMsIHJlcXVlc3QuZmxhZ3MsIHJlcXVlc3QubWF4QWdlSW5TZWNvbmRzLCByZXF1 ZXN0LmNhbGxiYWNrSUQpLCAwKTsKQEAgLTI3NSw2ICsyOTgsMTIgQEAgdm9pZCBQbHVnaW5Qcm9j ZXNzUHJveHk6OmRpZENsZWFyU2l0ZURhdGEodWludDY0X3QgY2FsbGJhY2tJRCkKICAgICB3ZWJQ bHVnaW5TaXRlRGF0YU1hbmFnZXItPmRpZENsZWFyU2l0ZURhdGFGb3JTaW5nbGVQbHVnaW4oY2Fs bGJhY2tJRCk7CiB9CiAKK3ZvaWQgUGx1Z2luUHJvY2Vzc1Byb3h5OjpkaWREZWxldGVXZWJzaXRl RGF0YSh1aW50NjRfdCBjYWxsYmFja0lEKQoreworICAgIGF1dG8gY2FsbGJhY2sgPSBtX3BlbmRp bmdEZWxldGVXZWJzaXRlRGF0YUNhbGxiYWNrcy50YWtlKGNhbGxiYWNrSUQpOworICAgIGNhbGxi YWNrKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gRU5BQkxFKE5F VFNDQVBFX1BMVUdJTl9BUEkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5oCmluZGV4IDJkMzI1NmRkNmQ2ZWYyMDE4NDFjMTE4 NWUxNjA4M2I2ZWVjYmE3MGUuLmNjZWM3MGQ4NGI3M2FhMzJiMWIyNWM0ZDE5MjQ2ZmM2ZDdmMTlj MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblBy b2Nlc3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blByb2Nlc3NQcm94eS5oCkBAIC04MCw2ICs4MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGdldFBs dWdpblByb2Nlc3NDb25uZWN0aW9uKFBhc3NSZWZQdHI8TWVzc2FnZXM6OldlYlByb2Nlc3NQcm94 eTo6R2V0UGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb246OkRlbGF5ZWRSZXBseT4pOwogCiAgICAgdm9p ZCBmZXRjaFdlYnNpdGVEYXRhKHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPFN0cmluZz4pPiBj b21wbGV0aW9uSGFuZGxlcik7CisgICAgdm9pZCBkZWxldGVXZWJzaXRlRGF0YShzdGQ6OmNocm9u bzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50IG1vZGlmaWVkU2luY2UsIHN0ZDo6ZnVuY3Rpb248 dm9pZCAoKT4gY29tcGxldGlvbkhhbmRsZXIpOwogCiAgICAgLy8gQXNrcyB0aGUgcGx1Zy1pbiBw cm9jZXNzIHRvIGNsZWFyIHRoZSBkYXRhIGZvciB0aGUgZ2l2ZW4gc2l0ZXMuCiAgICAgdm9pZCBj bGVhclNpdGVEYXRhKFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlciosIGNvbnN0IFZlY3RvcjxTdHJp bmc+JiBzaXRlcywgdWludDY0X3QgZmxhZ3MsIHVpbnQ2NF90IG1heEFnZUluU2Vjb25kcywgdWlu dDY0X3QgY2FsbGJhY2tJRCk7CkBAIC0xMjgsNiArMTI5LDcgQEAgcHJpdmF0ZToKICAgICB2b2lk IGRpZENyZWF0ZVdlYlByb2Nlc3NDb25uZWN0aW9uKGNvbnN0IElQQzo6QXR0YWNobWVudCYsIGJv b2wgc3VwcG9ydHNBc3luY2hyb25vdXNQbHVnaW5Jbml0aWFsaXphdGlvbik7CiAgICAgdm9pZCBk aWRHZXRTaXRlc1dpdGhEYXRhKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBzaXRlcywgdWludDY0X3Qg Y2FsbGJhY2tJRCk7CiAgICAgdm9pZCBkaWRDbGVhclNpdGVEYXRhKHVpbnQ2NF90IGNhbGxiYWNr SUQpOworICAgIHZvaWQgZGlkRGVsZXRlV2Vic2l0ZURhdGEodWludDY0X3QgY2FsbGJhY2tJRCk7 CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBib29sIGdldFBsdWdpblByb2Nlc3NTZXJpYWxO dW1iZXIoUHJvY2Vzc1NlcmlhbE51bWJlciYpOwpAQCAtMTY2LDYgKzE2OCwxMyBAQCBwcml2YXRl OgogICAgIFZlY3Rvcjx1aW50NjRfdD4gbV9wZW5kaW5nRmV0Y2hXZWJzaXRlRGF0YVJlcXVlc3Rz OwogICAgIEhhc2hNYXA8dWludDY0X3QsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPFN0cmlu Zz4pPj4gbV9wZW5kaW5nRmV0Y2hXZWJzaXRlRGF0YUNhbGxiYWNrczsKIAorICAgIHN0cnVjdCBE ZWxldGVXZWJzaXRlRGF0YVJlcXVlc3QgeworICAgICAgICBzdGQ6OmNocm9ubzo6c3lzdGVtX2Ns b2NrOjp0aW1lX3BvaW50IG1vZGlmaWVkU2luY2U7CisgICAgICAgIHVpbnQ2NF90IGNhbGxiYWNr SUQ7CisgICAgfTsKKyAgICBWZWN0b3I8RGVsZXRlV2Vic2l0ZURhdGFSZXF1ZXN0PiBtX3BlbmRp bmdEZWxldGVXZWJzaXRlRGF0YVJlcXVlc3RzOworICAgIEhhc2hNYXA8dWludDY0X3QsIHN0ZDo6 ZnVuY3Rpb248dm9pZCAoKT4+IG1fcGVuZGluZ0RlbGV0ZVdlYnNpdGVEYXRhQ2FsbGJhY2tzOwor CiAgICAgc3RydWN0IENsZWFyU2l0ZURhdGFSZXF1ZXN0IHsKICAgICAgICAgVmVjdG9yPFN0cmlu Zz4gc2l0ZXM7CiAgICAgICAgIHVpbnQ2NF90IGZsYWdzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5Lm1lc3Nh Z2VzLmluCmluZGV4IDA2OGM0MGY0ZTNjZTA1NzMxZWVmMTFhN2ViNzdlMGIxNjUyY2Y4Y2UuLmQ5 YjBmZGM5YTIxYTljYTNiZmY4YjlhYjhhOTI2ZTdkZWRmNDg1OTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5tZXNzYWdlcy5p bgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJv eHkubWVzc2FnZXMuaW4KQEAgLTI3LDYgKzI3LDcgQEAgbWVzc2FnZXMgLT4gUGx1Z2luUHJvY2Vz c1Byb3h5IHsKIAogICAgIERpZEdldFNpdGVzV2l0aERhdGEoVmVjdG9yPFN0cmluZz4gc2l0ZXMs IHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAgICAgRGlkQ2xlYXJTaXRlRGF0YSh1aW50NjRfdCBjYWxs YmFja0lEKQorICAgIERpZERlbGV0ZVdlYnNpdGVEYXRhKHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAK ICNpZiBQTEFURk9STShDT0NPQSkKICAgICBTZXRNb2RhbFdpbmRvd0lzU2hvd2luZyhib29sIG1v ZGFsV2luZG93SXNTaG93aW5nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmluZGV4IDYwZmFkNDM2YTE4NzM2 ZTE0MmZkNzQ2NGU4NTFkNjYwNDdjYjIyMTkuLmFjOGEyMzg3YTM4MzM3ZTZhMGY5NWVmMDQ2NTU1 YzNiYTViMzhjZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAgLTYyMSw2ICs2MjEsNTUgQEAgdm9p ZCBXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKFdlYnNpdGVEYXRhVHlwZXMgZGF0YVR5cGVz LCBzdGQ6OmNocm9ubzo6c3lzdGUKICAgICAgICAgfSk7CiAgICAgfQogCisjaWYgRU5BQkxFKE5F VFNDQVBFX1BMVUdJTl9BUEkpCisgICAgaWYgKGRhdGFUeXBlcyAmIFdlYnNpdGVEYXRhVHlwZVBs dWdJbkRhdGEgJiYgaXNQZXJzaXN0ZW50KCkpIHsKKyAgICAgICAgY2xhc3MgU3RhdGUgeworICAg ICAgICBwdWJsaWM6CisgICAgICAgICAgICBzdGF0aWMgdm9pZCBkZWxldGVEYXRhKFJlZjxDYWxs YmFja0FnZ3JlZ2F0b3I+JiYgY2FsbGJhY2tBZ2dyZWdhdG9yLCBWZWN0b3I8UGx1Z2luTW9kdWxl SW5mbz4mJiBwbHVnaW5zLCBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50IG1v ZGlmaWVkU2luY2UpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgbmV3IFN0YXRlKFdU Rjo6bW92ZShjYWxsYmFja0FnZ3JlZ2F0b3IpLCBXVEY6Om1vdmUocGx1Z2lucyksIG1vZGlmaWVk U2luY2UpOworICAgICAgICAgICAgfQorCisgICAgICAgIHByaXZhdGU6CisgICAgICAgICAgICBT dGF0ZShSZWY8Q2FsbGJhY2tBZ2dyZWdhdG9yPiYmIGNhbGxiYWNrQWdncmVnYXRvciwgVmVjdG9y PFBsdWdpbk1vZHVsZUluZm8+JiYgcGx1Z2lucywgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6 dGltZV9wb2ludCBtb2RpZmllZFNpbmNlKQorICAgICAgICAgICAgICAgIDogbV9jYWxsYmFja0Fn Z3JlZ2F0b3IoV1RGOjptb3ZlKGNhbGxiYWNrQWdncmVnYXRvcikpCisgICAgICAgICAgICAgICAg LCBtX3BsdWdpbnMoV1RGOjptb3ZlKHBsdWdpbnMpKQorICAgICAgICAgICAgICAgICwgbV9tb2Rp ZmllZFNpbmNlKG1vZGlmaWVkU2luY2UpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg bV9jYWxsYmFja0FnZ3JlZ2F0b3ItPmFkZFBlbmRpbmdDYWxsYmFjaygpOworCisgICAgICAgICAg ICAgICAgZGVsZXRlV2Vic2l0ZURhdGFGb3JOZXh0UGx1Z2luKCk7CisgICAgICAgICAgICB9CisK KyAgICAgICAgICAgIH5TdGF0ZSgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgQVNT RVJUKG1fcGx1Z2lucy5pc0VtcHR5KCkpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICB2 b2lkIGRlbGV0ZVdlYnNpdGVEYXRhRm9yTmV4dFBsdWdpbigpCisgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgaWYgKG1fcGx1Z2lucy5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICAg ICAgbV9jYWxsYmFja0FnZ3JlZ2F0b3ItPnJlbW92ZVBlbmRpbmdDYWxsYmFjaygpOworCisgICAg ICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzOworICAgICAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgYXV0byBwbHVnaW4gPSBtX3Bs dWdpbnMudGFrZUxhc3QoKTsKKyAgICAgICAgICAgICAgICBQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6 c2luZ2xldG9uKCkuZGVsZXRlV2Vic2l0ZURhdGEocGx1Z2luLCBtX21vZGlmaWVkU2luY2UsIFt0 aGlzXSB7CisgICAgICAgICAgICAgICAgICAgIGRlbGV0ZVdlYnNpdGVEYXRhRm9yTmV4dFBsdWdp bigpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBS ZWY8Q2FsbGJhY2tBZ2dyZWdhdG9yPiBtX2NhbGxiYWNrQWdncmVnYXRvcjsKKyAgICAgICAgICAg IFZlY3RvcjxQbHVnaW5Nb2R1bGVJbmZvPiBtX3BsdWdpbnM7CisgICAgICAgICAgICBzdGQ6OmNo cm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50IG1fbW9kaWZpZWRTaW5jZTsKKyAgICAgICAg fTsKKworICAgICAgICBTdGF0ZTo6ZGVsZXRlRGF0YSgqY2FsbGJhY2tBZ2dyZWdhdG9yLCBwbHVn aW5zKCksIG1vZGlmaWVkU2luY2UpOworICAgIH0KKyNlbmRpZgorCiAgICAgLy8gVGhlcmUncyBh IGNoYW5jZSB0aGF0IHdlIGRvbid0IGhhdmUgYW55IHBlbmRpbmcgY2FsbGJhY2tzLiBJZiBzbywg d2Ugd2FudCB0byBkaXNwYXRjaCB0aGUgY29tcGxldGlvbiBoYW5kbGVyIHJpZ2h0IGF3YXkuCiAg ICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5jYWxsSWZOZWVkZWQoKTsKIH0K