145821 2015-06-09 15:57:03 -0700 Change the PluginProcessManager data fetching function to take a completion handler 2015-06-09 16:10:15 -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 1100826 0 andersca 2015-06-09 15:57:03 -0700 Change the PluginProcessManager data fetching function to take a completion handler 1100829 1 254610 andersca 2015-06-09 15:59:43 -0700 Created attachment 254610 Patch 1100831 2 commit-queue 2015-06-09 16:02:01 -0700 Attachment 254610 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp:111: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp:98: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h:82: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h:167: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h:65: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 5 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1100837 3 andersca 2015-06-09 16:10:15 -0700 Committed r185390: <http://trac.webkit.org/changeset/185390> 254610 2015-06-09 15:59:43 -0700 2015-06-09 16:01:29 -0700 Patch bug-145821-20150609155916.patch text/plain 10949 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1Mzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjYxZDg3OWI0NWUzZmZl ZjNjZjY5YWY2MzE3MGYyOGM3MzAxMzBkOS4uNmVjOGQ4MWE5NzM5MDVjNGFhMWU5Njc4MjMwNDEw OGJhMmU1NDlmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE1LTA2LTA5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2hhbmdlIHRoZSBQ bHVnaW5Qcm9jZXNzTWFuYWdlciBkYXRhIGZldGNoaW5nIGZ1bmN0aW9uIHRvIHRha2UgYSBjb21w bGV0aW9uIGhhbmRsZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0NTgyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwOgorICAg ICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6ZmV0Y2hXZWJzaXRlRGF0YSk6Cisg ICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3NNYW5hZ2VyOjpnZXRTaXRlc1dpdGhEYXRhKTog RGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdl ci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OmdlbmVyYXRlQ2FsbGJhY2tJRCk6CisgICAgICAgIChXZWJLaXQ6 OlBsdWdpblByb2Nlc3NQcm94eTo6flBsdWdpblByb2Nlc3NQcm94eSk6CisgICAgICAgIChXZWJL aXQ6OlBsdWdpblByb2Nlc3NQcm94eTo6ZmV0Y2hXZWJzaXRlRGF0YSk6CisgICAgICAgIChXZWJL aXQ6OlBsdWdpblByb2Nlc3NQcm94eTo6cGx1Z2luUHJvY2Vzc0NyYXNoZWRPckZhaWxlZFRvTGF1 bmNoKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVu Y2hpbmcpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzUHJveHk6OmRpZEdldFNpdGVz V2l0aERhdGEpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzUHJveHk6OmdldFNpdGVz V2l0aERhdGEpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblBy b2Nlc3NQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1dlYlBsdWdpblNpdGVE YXRhTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpblNpdGVEYXRhTWFuYWdl cjo6R2V0U2l0ZXNXaXRoRGF0YVN0YXRlOjpnZXRTaXRlc1dpdGhEYXRhRm9yTmV4dFBsdWdpbik6 CisKKzIwMTUtMDYtMDkgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwog ICAgICAgICBBZGQgY29kZSB0byBrZWVwIHRyYWNrIG9mIHBsdWctaW4gZGF0YSBob3N0IG5hbWVz IGluIHdlYnNpdGUgZGF0YSByZWNvcmRzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDU4MTgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwCmluZGV4IGNiNjFkMzYy OGU3MjllZTI1ZTliYWI5NTNjYjQyOWMxMTg2NjYwNDAuLjliYThmOGY3YzBiYTUwNjhhM2Q3ZTI4 Y2FlNzhlZDYxMTY2ZWE0YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5jcHAKQEAgLTk1LDEwICs5NSwxMSBA QCB2b2lkIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpyZW1vdmVQbHVnaW5Qcm9jZXNzUHJveHkoUGx1 Z2luUHJvY2Vzc1Byb3h5KiBwbHVnaW5QcgogICAgIG1fcGx1Z2luUHJvY2Vzc2VzLnJlbW92ZSh2 ZWN0b3JJbmRleCk7CiB9CiAKLXZvaWQgUGx1Z2luUHJvY2Vzc01hbmFnZXI6OmdldFNpdGVzV2l0 aERhdGEoY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luLCBXZWJQbHVnaW5TaXRlRGF0YU1h bmFnZXIqIHdlYlBsdWdpblNpdGVEYXRhTWFuYWdlciwgdWludDY0X3QgY2FsbGJhY2tJRCkKK3Zv aWQgUGx1Z2luUHJvY2Vzc01hbmFnZXI6OmZldGNoV2Vic2l0ZURhdGEoY29uc3QgUGx1Z2luTW9k dWxlSW5mbyYgcGx1Z2luLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKFZlY3RvcjxTdHJpbmc+KT4gY29t cGxldGlvbkhhbmRsZXIpCiB7CiAgICAgUGx1Z2luUHJvY2Vzc1Byb3h5KiBwbHVnaW5Qcm9jZXNz ID0gZ2V0T3JDcmVhdGVQbHVnaW5Qcm9jZXNzKHBsdWdpblByb2Nlc3NUb2tlbihwbHVnaW4sIFBs dWdpblByb2Nlc3NUeXBlTm9ybWFsLCBQbHVnaW5Qcm9jZXNzU2FuZGJveFBvbGljeU5vcm1hbCkp OwotICAgIHBsdWdpblByb2Nlc3MtPmdldFNpdGVzV2l0aERhdGEod2ViUGx1Z2luU2l0ZURhdGFN YW5hZ2VyLCBjYWxsYmFja0lEKTsKKworICAgIHBsdWdpblByb2Nlc3MtPmZldGNoV2Vic2l0ZURh dGEoV1RGOjptb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKIHZvaWQgUGx1Z2luUHJvY2Vz c01hbmFnZXI6OmNsZWFyU2l0ZURhdGEoY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luLCBX ZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIqIHdlYlBsdWdpblNpdGVEYXRhTWFuYWdlciwgY29uc3Qg VmVjdG9yPFN0cmluZz4mIHNpdGVzLCB1aW50NjRfdCBmbGFncywgdWludDY0X3QgbWF4QWdlSW5T ZWNvbmRzLCB1aW50NjRfdCBjYWxsYmFja0lEKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmgKaW5kZXggZjI5MTFjMzZj YjI3NmIxNzQxZjYyNjA1Mzk3ZDVkZDFkMWNlODQyYy4uNDEzY2JlMzBjYzkwYzljNmRkNThkMTYz YzNhYzlkODlhMDhlYTY5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5oCkBAIC02Miw3ICs2Miw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIGdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uKHVpbnQ2NF90IHBsdWdpblBy b2Nlc3NUb2tlbiwgUGFzc1JlZlB0cjxNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXRQbHVn aW5Qcm9jZXNzQ29ubmVjdGlvbjo6RGVsYXllZFJlcGx5Pik7CiAgICAgdm9pZCByZW1vdmVQbHVn aW5Qcm9jZXNzUHJveHkoUGx1Z2luUHJvY2Vzc1Byb3h5Kik7CiAKLSAgICB2b2lkIGdldFNpdGVz V2l0aERhdGEoY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYsIFdlYlBsdWdpblNpdGVEYXRhTWFuYWdl ciosIHVpbnQ2NF90IGNhbGxiYWNrSUQpOworICAgIHZvaWQgZmV0Y2hXZWJzaXRlRGF0YShjb25z dCBQbHVnaW5Nb2R1bGVJbmZvJiwgc3RkOjpmdW5jdGlvbjx2b2lkIChWZWN0b3I8U3RyaW5nPik+ IGNvbXBsZXRpb25IYW5kbGVyKTsKICAgICB2b2lkIGNsZWFyU2l0ZURhdGEoY29uc3QgUGx1Z2lu TW9kdWxlSW5mbyYsIFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlciosIGNvbnN0IFZlY3RvcjxTdHJp bmc+JiBzaXRlcywgdWludDY0X3QgZmxhZ3MsIHVpbnQ2NF90IG1heEFnZUluU2Vjb25kcywgdWlu dDY0X3QgY2FsbGJhY2tJRCk7CiAKICNpZiBQTEFURk9STShDT0NPQSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJveHkuY3BwCmlu ZGV4IGQ1YzllZDc5NDBmMDk3Mzk0NWFhYWJiZTMzNWQ0MGRkNmY2N2YwYmIuLjAyOWY0ZmNjYzRi ZjAyMDU4M2U3YzZjZTUzYWYwM2E0MTc0MTRjZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmNwcApAQCAtNDksNiAr NDksMTMgQEAgc3RhdGljIGNvbnN0IGRvdWJsZSBzbmFwc2hvdHRpbmdNaW5pbXVtTGlmZXRpbWUg PSAzMDsKIHN0YXRpYyBjb25zdCBkb3VibGUgc2h1dGRvd25UaW1lb3V0ID0gMSAqIDYwOwogc3Rh dGljIGNvbnN0IGRvdWJsZSBzbmFwc2hvdHRpbmdTaHV0ZG93blRpbWVvdXQgPSAxNTsKIAorc3Rh dGljIHVpbnQ2NF90IGdlbmVyYXRlQ2FsbGJhY2tJRCgpCit7CisgICAgc3RhdGljIHVpbnQ2NF90 IGNhbGxiYWNrSUQ7CisKKyAgICByZXR1cm4gKytjYWxsYmFja0lEOworfQorCiBQYXNzUmVmUHRy PFBsdWdpblByb2Nlc3NQcm94eT4gUGx1Z2luUHJvY2Vzc1Byb3h5OjpjcmVhdGUoUGx1Z2luUHJv Y2Vzc01hbmFnZXIqIFBsdWdpblByb2Nlc3NNYW5hZ2VyLCBjb25zdCBQbHVnaW5Qcm9jZXNzQXR0 cmlidXRlcyYgcGx1Z2luUHJvY2Vzc0F0dHJpYnV0ZXMsIHVpbnQ2NF90IHBsdWdpblByb2Nlc3NU b2tlbikKIHsKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBsdWdpblByb2Nlc3NQcm94eShQbHVn aW5Qcm9jZXNzTWFuYWdlciwgcGx1Z2luUHJvY2Vzc0F0dHJpYnV0ZXMsIHBsdWdpblByb2Nlc3NU b2tlbikpOwpAQCAtNzAsNiArNzcsOCBAQCBQbHVnaW5Qcm9jZXNzUHJveHk6OlBsdWdpblByb2Nl c3NQcm94eShQbHVnaW5Qcm9jZXNzTWFuYWdlciogUGx1Z2luUHJvY2Vzc01hbmFnZQogCiBQbHVn aW5Qcm9jZXNzUHJveHk6On5QbHVnaW5Qcm9jZXNzUHJveHkoKQogeworICAgIEFTU0VSVChtX3Bl bmRpbmdGZXRjaFdlYnNpdGVEYXRhUmVxdWVzdHMuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlQobV9w ZW5kaW5nRmV0Y2hXZWJzaXRlRGF0YUNhbGxiYWNrcy5pc0VtcHR5KCkpOwogfQogCiB2b2lkIFBs dWdpblByb2Nlc3NQcm94eTo6Z2V0TGF1bmNoT3B0aW9ucyhQcm9jZXNzTGF1bmNoZXI6OkxhdW5j aE9wdGlvbnMmIGxhdW5jaE9wdGlvbnMpCkBAIC05OSwxNyArMTA4LDE2IEBAIHZvaWQgUGx1Z2lu UHJvY2Vzc1Byb3h5OjpnZXRQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbihQYXNzUmVmUHRyPE1lc3Nh Z2VzOjpXZWJQcm9jCiAgICAgbV9jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpQbHVnaW5Qcm9j ZXNzOjpDcmVhdGVXZWJQcm9jZXNzQ29ubmVjdGlvbigpLCAwLCBJUEM6OkRpc3BhdGNoTWVzc2Fn ZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7CiB9CiAKLXZvaWQgUGx1Z2luUHJvY2Vzc1By b3h5OjpnZXRTaXRlc1dpdGhEYXRhKFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlciogd2ViUGx1Z2lu U2l0ZURhdGFNYW5hZ2VyLCB1aW50NjRfdCBjYWxsYmFja0lEKQordm9pZCBQbHVnaW5Qcm9jZXNz UHJveHk6OmZldGNoV2Vic2l0ZURhdGEoc3RkOjpmdW5jdGlvbjx2b2lkIChWZWN0b3I8U3RyaW5n Pik+IGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIEFTU0VSVCghbV9wZW5kaW5nR2V0U2l0ZXNS ZXBsaWVzLmNvbnRhaW5zKGNhbGxiYWNrSUQpKTsKLSAgICBtX3BlbmRpbmdHZXRTaXRlc1JlcGxp ZXMuc2V0KGNhbGxiYWNrSUQsIHdlYlBsdWdpblNpdGVEYXRhTWFuYWdlcik7CisgICAgdWludDY0 X3QgY2FsbGJhY2tJRCA9IGdlbmVyYXRlQ2FsbGJhY2tJRCgpOworICAgIG1fcGVuZGluZ0ZldGNo V2Vic2l0ZURhdGFDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIFdURjo6bW92ZShjb21wbGV0aW9u SGFuZGxlcikpOwogCiAgICAgaWYgKHN0YXRlKCkgPT0gU3RhdGU6OkxhdW5jaGluZykgewotICAg ICAgICBtX3BlbmRpbmdHZXRTaXRlc1JlcXVlc3RzLmFwcGVuZChjYWxsYmFja0lEKTsKKyAgICAg ICAgbV9wZW5kaW5nRmV0Y2hXZWJzaXRlRGF0YVJlcXVlc3RzLmFwcGVuZChjYWxsYmFja0lEKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIC8vIEFzayB0aGUgcGx1Zy1pbiBwcm9jZXNz IGZvciB0aGUgc2l0ZXMgd2l0aCBkYXRhLgogICAgIG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdl czo6UGx1Z2luUHJvY2Vzczo6R2V0U2l0ZXNXaXRoRGF0YShjYWxsYmFja0lEKSwgMCk7CiB9CiAK QEAgLTE0Nyw4ICsxNTUsMTEgQEAgdm9pZCBQbHVnaW5Qcm9jZXNzUHJveHk6OnBsdWdpblByb2Nl c3NDcmFzaGVkT3JGYWlsZWRUb0xhdW5jaCgpCiAjZW5kaWYKICAgICB9CiAKLSAgICB3aGlsZSAo IW1fcGVuZGluZ0dldFNpdGVzUmVwbGllcy5pc0VtcHR5KCkpCi0gICAgICAgIGRpZEdldFNpdGVz V2l0aERhdGEoVmVjdG9yPFN0cmluZz4oKSwgbV9wZW5kaW5nR2V0U2l0ZXNSZXBsaWVzLmJlZ2lu KCktPmtleSk7CisgICAgbV9wZW5kaW5nRmV0Y2hXZWJzaXRlRGF0YVJlcXVlc3RzLmNsZWFyKCk7 CisKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGNhbGxiYWNrIDogbV9wZW5kaW5nRmV0Y2hXZWJzaXRl RGF0YUNhbGxiYWNrcy52YWx1ZXMoKSkKKyAgICAgICAgY2FsbGJhY2soeyB9KTsKKyAgICBtX3Bl bmRpbmdGZXRjaFdlYnNpdGVEYXRhQ2FsbGJhY2tzLmNsZWFyKCk7CiAKICAgICB3aGlsZSAoIW1f cGVuZGluZ0NsZWFyU2l0ZURhdGFSZXBsaWVzLmlzRW1wdHkoKSkKICAgICAgICAgZGlkQ2xlYXJT aXRlRGF0YShtX3BlbmRpbmdDbGVhclNpdGVEYXRhUmVwbGllcy5iZWdpbigpLT5rZXkpOwpAQCAt MjEzLDEwICsyMjQsOSBAQCB2b2lkIFBsdWdpblByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNo aW5nKFByb2Nlc3NMYXVuY2hlciosIElQQzo6Q29ubmVjdGlvbjo6SQogICAgIG1fY29ubmVjdGlv bi0+c2VuZChNZXNzYWdlczo6UGx1Z2luUHJvY2Vzczo6U2V0UU9TKHBsdWdpblByb2Nlc3NMYXRl bmN5UU9TKCksIHBsdWdpblByb2Nlc3NUaHJvdWdocHV0UU9TKCkpLCAwKTsKICNlbmRpZgogCi0g ICAgLy8gU2VuZCBhbGwgb3VyIHBlbmRpbmcgcmVxdWVzdHMuCi0gICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBtX3BlbmRpbmdHZXRTaXRlc1JlcXVlc3RzLnNpemUoKTsgKytpKQotICAgICAgICBt X2Nvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OlBsdWdpblByb2Nlc3M6OkdldFNpdGVzV2l0aERh dGEobV9wZW5kaW5nR2V0U2l0ZXNSZXF1ZXN0c1tpXSksIDApOwotICAgIG1fcGVuZGluZ0dldFNp dGVzUmVxdWVzdHMuY2xlYXIoKTsKKyAgICBmb3IgKGF1dG8gY2FsbGJhY2tJRCA6IG1fcGVuZGlu Z0ZldGNoV2Vic2l0ZURhdGFSZXF1ZXN0cykKKyAgICAgICAgbV9jb25uZWN0aW9uLT5zZW5kKE1l c3NhZ2VzOjpQbHVnaW5Qcm9jZXNzOjpHZXRTaXRlc1dpdGhEYXRhKGNhbGxiYWNrSUQpLCAwKTsK KyAgICBtX3BlbmRpbmdGZXRjaFdlYnNpdGVEYXRhUmVxdWVzdHMuY2xlYXIoKTsKIAogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9wZW5kaW5nQ2xlYXJTaXRlRGF0YVJlcXVlc3RzLnNpemUo KTsgKytpKSB7CiAgICAgICAgIGNvbnN0IENsZWFyU2l0ZURhdGFSZXF1ZXN0JiByZXF1ZXN0ID0g bV9wZW5kaW5nQ2xlYXJTaXRlRGF0YVJlcXVlc3RzW2ldOwpAQCAtMjUzLDEwICsyNjMsOCBAQCB2 b2lkIFBsdWdpblByb2Nlc3NQcm94eTo6ZGlkQ3JlYXRlV2ViUHJvY2Vzc0Nvbm5lY3Rpb24oY29u c3QgSVBDOjpBdHRhY2htZW50JiBjbwogCiB2b2lkIFBsdWdpblByb2Nlc3NQcm94eTo6ZGlkR2V0 U2l0ZXNXaXRoRGF0YShjb25zdCBWZWN0b3I8U3RyaW5nPiYgc2l0ZXMsIHVpbnQ2NF90IGNhbGxi YWNrSUQpCiB7Ci0gICAgUmVmUHRyPFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlcj4gd2ViUGx1Z2lu U2l0ZURhdGFNYW5hZ2VyID0gbV9wZW5kaW5nR2V0U2l0ZXNSZXBsaWVzLnRha2UoY2FsbGJhY2tJ RCk7Ci0gICAgQVNTRVJUKHdlYlBsdWdpblNpdGVEYXRhTWFuYWdlcik7Ci0KLSAgICB3ZWJQbHVn aW5TaXRlRGF0YU1hbmFnZXItPmRpZEdldFNpdGVzV2l0aERhdGFGb3JTaW5nbGVQbHVnaW4oc2l0 ZXMsIGNhbGxiYWNrSUQpOworICAgIGF1dG8gY2FsbGJhY2sgPSBtX3BlbmRpbmdGZXRjaFdlYnNp dGVEYXRhQ2FsbGJhY2tzLnRha2UoY2FsbGJhY2tJRCk7CisgICAgY2FsbGJhY2soc2l0ZXMpOwog fQogCiB2b2lkIFBsdWdpblByb2Nlc3NQcm94eTo6ZGlkQ2xlYXJTaXRlRGF0YSh1aW50NjRfdCBj YWxsYmFja0lEKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMv UGx1Z2luUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9Q bHVnaW5Qcm9jZXNzUHJveHkuaAppbmRleCA2MzVkOGIyZjI5NDA3ZjJiZjAwODUxNjY3ZDE3M2Qy ZTY2YTI5OWZlLi4yZDMyNTZkZDZkNmVmMjAxODQxYzExODVlMTYwODNiNmVlY2JhNzBlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJv eHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNz UHJveHkuaApAQCAtNzgsOSArNzgsOCBAQCBwdWJsaWM6CiAgICAgLy8gQXNrcyB0aGUgcGx1Zy1p biBwcm9jZXNzIHRvIGNyZWF0ZSBhIG5ldyBjb25uZWN0aW9uIHRvIGEgd2ViIHByb2Nlc3MuIFRo ZSBjb25uZWN0aW9uIGlkZW50aWZpZXIgd2lsbCBiZQogICAgIC8vIGVuY29kZWQgaW4gdGhlIGdp dmVuIGFyZ3VtZW50IGVuY29kZXIgYW5kIHNlbnQgYmFjayB0byB0aGUgY29ubmVjdGlvbiBvZiB0 aGUgZ2l2ZW4gd2ViIHByb2Nlc3MuCiAgICAgdm9pZCBnZXRQbHVnaW5Qcm9jZXNzQ29ubmVjdGlv bihQYXNzUmVmUHRyPE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkdldFBsdWdpblByb2Nlc3ND b25uZWN0aW9uOjpEZWxheWVkUmVwbHk+KTsKLSAgICAKLSAgICAvLyBBc2tzIHRoZSBwbHVnLWlu IHByb2Nlc3MgdG8gZ2V0IGEgbGlzdCBvZiBkb21haW5zIGZvciB3aGljaCB0aGUgcGx1Zy1pbiBo YXMgZGF0YSBzdG9yZWQuCi0gICAgdm9pZCBnZXRTaXRlc1dpdGhEYXRhKFdlYlBsdWdpblNpdGVE YXRhTWFuYWdlciosIHVpbnQ2NF90IGNhbGxiYWNrSUQpOworCisgICAgdm9pZCBmZXRjaFdlYnNp dGVEYXRhKHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPFN0cmluZz4pPiBjb21wbGV0aW9uSGFu ZGxlcik7CiAKICAgICAvLyBBc2tzIHRoZSBwbHVnLWluIHByb2Nlc3MgdG8gY2xlYXIgdGhlIGRh dGEgZm9yIHRoZSBnaXZlbiBzaXRlcy4KICAgICB2b2lkIGNsZWFyU2l0ZURhdGEoV2ViUGx1Z2lu U2l0ZURhdGFNYW5hZ2VyKiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHNpdGVzLCB1aW50NjRfdCBm bGFncywgdWludDY0X3QgbWF4QWdlSW5TZWNvbmRzLCB1aW50NjRfdCBjYWxsYmFja0lEKTsKQEAg LTE2NCw4ICsxNjMsOCBAQCBwcml2YXRlOgogCiAgICAgRGVxdWU8UmVmUHRyPE1lc3NhZ2VzOjpX ZWJQcm9jZXNzUHJveHk6OkdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uOjpEZWxheWVkUmVwbHk+ PiBtX3BlbmRpbmdDb25uZWN0aW9uUmVwbGllczsKIAotICAgIFZlY3Rvcjx1aW50NjRfdD4gbV9w ZW5kaW5nR2V0U2l0ZXNSZXF1ZXN0czsKLSAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8V2Vi UGx1Z2luU2l0ZURhdGFNYW5hZ2VyPj4gbV9wZW5kaW5nR2V0U2l0ZXNSZXBsaWVzOworICAgIFZl Y3Rvcjx1aW50NjRfdD4gbV9wZW5kaW5nRmV0Y2hXZWJzaXRlRGF0YVJlcXVlc3RzOworICAgIEhh c2hNYXA8dWludDY0X3QsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPFN0cmluZz4pPj4gbV9w ZW5kaW5nRmV0Y2hXZWJzaXRlRGF0YUNhbGxiYWNrczsKIAogICAgIHN0cnVjdCBDbGVhclNpdGVE YXRhUmVxdWVzdCB7CiAgICAgICAgIFZlY3RvcjxTdHJpbmc+IHNpdGVzOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2Vy LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1dlYlBsdWdpblNpdGVEYXRh TWFuYWdlci5jcHAKaW5kZXggYmM5YTUwMjEzOTU4MDgyYWFlMTU5NTIwNWYzY2I2YjUzNWU2Yjdh ZC4uYzk1Nzk4MGQxZmI4MGE4N2M5NWFhNmQ4ZWI4YmE2MDk3Njk2MWZhYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2Vy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9XZWJQbHVnaW5TaXRl RGF0YU1hbmFnZXIuY3BwCkBAIC01Niw3ICs1NiwxMiBAQCBwdWJsaWM6CiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6c2luZ2xl dG9uKCkuZ2V0U2l0ZXNXaXRoRGF0YShtX3BsdWdpbnMubGFzdCgpLCBtX3dlYlBsdWdpblNpdGVE YXRhTWFuYWdlciwgbV9jYWxsYmFja0lEKTsKKyAgICAgICAgUmVmUHRyPFdlYlBsdWdpblNpdGVE YXRhTWFuYWdlcj4gd2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyID0gbV93ZWJQbHVnaW5TaXRlRGF0 YU1hbmFnZXI7CisgICAgICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBtX2NhbGxiYWNrSUQ7Cisg ICAgICAgIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpzaW5nbGV0b24oKS5mZXRjaFdlYnNpdGVEYXRh KG1fcGx1Z2lucy5sYXN0KCksIFt3ZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIsIGNhbGxiYWNrSURd KFZlY3RvcjxTdHJpbmc+IHNpdGVzKSB7CisgICAgICAgICAgICB3ZWJQbHVnaW5TaXRlRGF0YU1h bmFnZXItPmRpZEdldFNpdGVzV2l0aERhdGFGb3JTaW5nbGVQbHVnaW4oc2l0ZXMsIGNhbGxiYWNr SUQpOworICAgICAgICB9KTsKKwogICAgICAgICBtX3BsdWdpbnMucmVtb3ZlTGFzdCgpOwogICAg IH0KIAo=