95232 2012-08-28 12:37:16 -0700 [Mac] Add testRunner.dumpWebNotificationCallbacks() to DRT 2012-08-30 15:10:57 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.8 RESOLVED WONTFIX InRadar P2 Normal --- 79492 95249 95505 77969 1 jonlee jonlee ap jberlin webkit-bug-importer webkit.review.bot oldest_to_newest 706624 0 jonlee 2012-08-28 12:37:16 -0700 With this flag set, test output will include events that mimic what would happen on the platform level, such as a user clicking on a notification, or the platform showing a notification. 706626 1 webkit-bug-importer 2012-08-28 12:37:32 -0700 <rdar://problem/12190776> 707836 2 161308 jonlee 2012-08-29 14:00:21 -0700 Created attachment 161308 Patch 708871 3 161308 ap 2012-08-30 11:35:52 -0700 Comment on attachment 161308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161308&action=review > Tools/DumpRenderTree/mac/UIDelegate.mm:294 > + printf("REQUESTED WEB NOTIFICATION PERMISSION FOR %s\n", [[origin stringValue] UTF8String]); Should this be guarded by gTestRunner->dumpWebNotificationCallbacks? 708872 4 161308 jonlee 2012-08-30 11:36:29 -0700 Comment on attachment 161308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161308&action=review >> Tools/DumpRenderTree/mac/UIDelegate.mm:294 >> + printf("REQUESTED WEB NOTIFICATION PERMISSION FOR %s\n", [[origin stringValue] UTF8String]); > > Should this be guarded by gTestRunner->dumpWebNotificationCallbacks? Yes! Thank you. 708914 5 jonlee 2012-08-30 12:45:49 -0700 Committed r127171: <http://trac.webkit.org/changeset/127171> 709070 6 webkit.review.bot 2012-08-30 15:01:26 -0700 Re-opened since this is blocked by 95505 709077 7 jonlee 2012-08-30 15:10:57 -0700 ap did not feel that this additional output added value for tests, and that the javascript events should suffice. rolling out in bug 95505. 161308 2012-08-29 14:00:21 -0700 2012-08-30 11:36:29 -0700 Patch bug-95232-20120829140011.patch text/plain 9987 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMTFmMDM1OGRi NDk3NDUzYWUyMWNiMzM3M2FkYzJmMzBkMTIzZDkxZC4uODAwZDIyMTY5MGRhZTRmOTlmMjk0MzAx ODMzY2M1OWU2ZTc0M2RjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDEy LTA4LTI5ICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAorICAgICAgICBbTWFjXSBBZGQg dGVzdFJ1bm5lci5kdW1wV2ViTm90aWZpY2F0aW9uQ2FsbGJhY2tzKCkgdG8gRFJUCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTIzMgorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMTIxOTA3NzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBXZWJLaXQuZXhwOiBFeHBvcnQgV2ViTm90aWZpY2F0aW9uIGNs YXNzLgorCisyMDEyLTA4LTI5ICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKwogICAgICAg ICBbTWFjXSBBZGQgaWNvblVSTCB0byBXZWJOb3RpZmljYXRpb24KICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MjQ5CiAgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8xMjE5MjA2MD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYktpdC5leHAg Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJLaXQuZXhwCmluZGV4IDA0OTAwODAwZjUzNmNkZTQyZTM2 NmRjNDQ3ZjRhYWRlNjdjYjE3NjEuLjJiYjIzZWFkMTUyZDQxMjQ0OGMwNWM2NGNiZWUyNzcyMjY2 MDQxMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYktpdC5leHAKKysrIGIvU291 cmNlL1dlYktpdC9tYWMvV2ViS2l0LmV4cApAQCAtMjUsNiArMjUsNyBAQAogLm9iamNfY2xhc3Nf bmFtZV9XZWJKYXZhU2NyaXB0VGV4dElucHV0UGFuZWwKIC5vYmpjX2NsYXNzX25hbWVfV2ViS2V5 R2VuZXJhdG9yCiAub2JqY19jbGFzc19uYW1lX1dlYktpdFN0YXRpc3RpY3MKKy5vYmpjX2NsYXNz X25hbWVfV2ViTm90aWZpY2F0aW9uCiAub2JqY19jbGFzc19uYW1lX1dlYlBhbmVsQXV0aGVudGlj YXRpb25IYW5kbGVyCiAub2JqY19jbGFzc19uYW1lX1dlYlBsdWdpbkRhdGFiYXNlCiAub2JqY19j bGFzc19uYW1lX1dlYlByZWZlcmVuY2VzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggOWE0NDY5ZjZlNjBhMWM1MGQ4MzViOWFlMjQxNzBlNGJmNzE4 N2MxMi4uNzZhMTNlZjExMTFhNjUyMzIyZDcyYzM4MzU0MWNhNTU5MmZlMzExOCAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBA CiAyMDEyLTA4LTI5ICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAorICAgICAgICBbTWFj XSBBZGQgdGVzdFJ1bm5lci5kdW1wV2ViTm90aWZpY2F0aW9uQ2FsbGJhY2tzKCkgdG8gRFJUCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTIzMgorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMTIxOTA3NzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFkZGl0aW9uYWwgb3V0cHV0IHdoZW4gcnVubmlu ZyB0ZXN0LCBpZiB0ZXN0UnVubmVyLmR1bXBXZWJOb3RpZmljYXRpb25DYWxsYmFja3MoKSBpcyBj YWxsZWQuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9UZXN0UnVubmVyLmNwcDoKKyAgICAg ICAgKFRlc3RSdW5uZXI6OlRlc3RSdW5uZXIpOgorICAgICAgICAoZHVtcFdlYk5vdGlmaWNhdGlv bkNhbGxiYWNrc0NhbGxiYWNrKToKKyAgICAgICAgKFRlc3RSdW5uZXI6OnN0YXRpY0Z1bmN0aW9u cyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5lci5oOgorICAgICAgICAoVGVz dFJ1bm5lcik6CisgICAgICAgIChUZXN0UnVubmVyOjpkdW1wV2ViTm90aWZpY2F0aW9uQ2FsbGJh Y2tzKToKKyAgICAgICAgKFRlc3RSdW5uZXI6OnNldER1bXBXZWJOb3RpZmljYXRpb25DYWxsYmFj a3MpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9Nb2NrV2ViTm90aWZpY2F0aW9uUHJv dmlkZXIubW06CisgICAgICAgICgtW1dlYk5vdGlmaWNhdGlvbiBfZHJ0X2Rlc2NyaXB0aW9uU3Vp dGFibGVGb3JUZXN0UmVzdWx0XSk6CisgICAgICAgICgtW01vY2tXZWJOb3RpZmljYXRpb25Qcm92 aWRlciB3ZWJWaWV3OmRpZFNob3dOb3RpZmljYXRpb246XSk6CisgICAgICAgICgtW01vY2tXZWJO b3RpZmljYXRpb25Qcm92aWRlciB3ZWJWaWV3OmRpZENsaWNrTm90aWZpY2F0aW9uOl0pOgorICAg ICAgICAoLVtNb2NrV2ViTm90aWZpY2F0aW9uUHJvdmlkZXIgd2ViVmlldzpkaWRDbG9zZU5vdGlm aWNhdGlvbnM6XSk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL1VJRGVsZWdhdGUubW06 CisgICAgICAgICgtW1VJRGVsZWdhdGUgd2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOb3RpZmljYXRp b25SZXF1ZXN0RnJvbU9yaWdpbjpsaXN0ZW5lcjpdKToKKworMjAxMi0wOC0yOSAgSm9uIExlZSAg PGpvbmxlZUBhcHBsZS5jb20+CisKICAgICAgICAgW01hY10gQmFzaWMgRFJUIHN1cHBvcnQgZm9y IHdlYiBub3RpZmljYXRpb25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03OTQ5MgogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTAzNTc2Mzk+CmRpZmYg LS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0UnVubmVyLmNwcCBiL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL1Rlc3RSdW5uZXIuY3BwCmluZGV4IGQ1ZTc5OWQ4ZmQxMzRhYjBkYjlkOWQ2MDc0 ZDBiZjFlOWEwOGQyM2YuLmU2ZjliOTA5NGUyMDRmNTk0ODI3ZjgwMDAzMDc0ODhhMGIwZjkyNDEg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuY3BwCisrKyBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuY3BwCkBAIC02OSw2ICs2OSw3IEBAIFRlc3RS dW5uZXI6OlRlc3RSdW5uZXIoY29uc3Qgc3RkOjpzdHJpbmcmIHRlc3RQYXRoT3JVUkwsIGNvbnN0 IHN0ZDo6c3RyaW5nJiBleHBlCiAgICAgLCBtX2R1bXBJY29uQ2hhbmdlcyhmYWxzZSkKICAgICAs IG1fZHVtcFZpc2l0ZWRMaW5rc0NhbGxiYWNrKGZhbHNlKQogICAgICwgbV9kdW1wV2lsbENhY2hl UmVzcG9uc2UoZmFsc2UpCisgICAgLCBtX2R1bXBXZWJOb3RpZmljYXRpb25DYWxsYmFja3MoZmFs c2UpCiAgICAgLCBtX2dlbmVyYXRlUGl4ZWxSZXN1bHRzKHRydWUpCiAgICAgLCBtX2NhbGxDbG9z ZU9uV2ViVmlld3ModHJ1ZSkKICAgICAsIG1fY2FuT3BlbldpbmRvd3MoZmFsc2UpCkBAIC0yNTgs NiArMjU5LDEzIEBAIHN0YXRpYyBKU1ZhbHVlUmVmIGR1bXBXaWxsQ2FjaGVSZXNwb25zZUNhbGxi YWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlCiAgICAgcmV0dXJuIEpTVmFsdWVN YWtlVW5kZWZpbmVkKGNvbnRleHQpOwogfQogCitzdGF0aWMgSlNWYWx1ZVJlZiBkdW1wV2ViTm90 aWZpY2F0aW9uQ2FsbGJhY2tzQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0 UmVmIGZ1bmN0aW9uLCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBzaXplX3QgYXJndW1lbnRDb3Vu dCwgY29uc3QgSlNWYWx1ZVJlZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQor eworICAgIFRlc3RSdW5uZXIqIGNvbnRyb2xsZXIgPSBzdGF0aWNfY2FzdDxUZXN0UnVubmVyKj4o SlNPYmplY3RHZXRQcml2YXRlKHRoaXNPYmplY3QpKTsKKyAgICBjb250cm9sbGVyLT5zZXREdW1w V2ViTm90aWZpY2F0aW9uQ2FsbGJhY2tzKHRydWUpOworICAgIHJldHVybiBKU1ZhbHVlTWFrZVVu ZGVmaW5lZChjb250ZXh0KTsKK30KKwogc3RhdGljIEpTVmFsdWVSZWYgcGF0aFRvTG9jYWxSZXNv dXJjZUNhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwg SlNPYmplY3RSZWYgdGhpc09iamVjdCwgc2l6ZV90IGFyZ3VtZW50Q291bnQsIGNvbnN0IEpTVmFs dWVSZWYgYXJndW1lbnRzW10sIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKIHsKICAgICBpZiAoYXJn dW1lbnRDb3VudCA8IDEpCkBAIC0yMzMzLDYgKzIzNDEsNyBAQCBKU1N0YXRpY0Z1bmN0aW9uKiBU ZXN0UnVubmVyOjpzdGF0aWNGdW5jdGlvbnMoKQogICAgICAgICB7ICJkdW1wVGl0bGVDaGFuZ2Vz IiwgZHVtcFRpdGxlQ2hhbmdlc0NhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5 IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgImR1bXBJY29u Q2hhbmdlcyIsIGR1bXBJY29uQ2hhbmdlc0NhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJl YWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgImR1 bXBXaWxsQ2FjaGVSZXNwb25zZSIsIGR1bXBXaWxsQ2FjaGVSZXNwb25zZUNhbGxiYWNrLCBrSlNQ cm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRl IH0sCisgICAgICAgIHsgImR1bXBXZWJOb3RpZmljYXRpb25DYWxsYmFja3MiLCBkdW1wV2ViTm90 aWZpY2F0aW9uQ2FsbGJhY2tzQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkg fCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAiZWxlbWVudERv ZXNBdXRvQ29tcGxldGVGb3JFbGVtZW50V2l0aElkIiwgZWxlbWVudERvZXNBdXRvQ29tcGxldGVG b3JFbGVtZW50V2l0aElkQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBr SlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAiZW5jb2RlSG9zdE5h bWUiLCBlbmNvZGVIb3N0TmFtZUNhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5 IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgImV2YWx1YXRl SW5XZWJJbnNwZWN0b3IiLCBldmFsdWF0ZUluV2ViSW5zcGVjdG9yQ2FsbGJhY2ssIGtKU1Byb3Bl cnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwK ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuaCBiL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuaAppbmRleCBiNjYzN2M2YWZkMTM4MTc2MDhkMTFjN2Ez MGRkMGVjYWFlMjQ3M2E0Li5kZjViYjRjZTE4ODc2MjI0MGU5NGRjNGZjZGM4ODdmYTU4ZGI5ZTQz IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0UnVubmVyLmgKKysrIGIvVG9v bHMvRHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5lci5oCkBAIC0yMjEsNyArMjIxLDEwIEBAIHB1Ymxp YzoKICAgICAKICAgICBib29sIGR1bXBXaWxsQ2FjaGVSZXNwb25zZSgpIGNvbnN0IHsgcmV0dXJu IG1fZHVtcFdpbGxDYWNoZVJlc3BvbnNlOyB9CiAgICAgdm9pZCBzZXREdW1wV2lsbENhY2hlUmVz cG9uc2UoYm9vbCBkdW1wV2lsbENhY2hlUmVzcG9uc2UpIHsgbV9kdW1wV2lsbENhY2hlUmVzcG9u c2UgPSBkdW1wV2lsbENhY2hlUmVzcG9uc2U7IH0KLSAgICAKKworICAgIGJvb2wgZHVtcFdlYk5v dGlmaWNhdGlvbkNhbGxiYWNrcygpIGNvbnN0IHsgcmV0dXJuIG1fZHVtcFdlYk5vdGlmaWNhdGlv bkNhbGxiYWNrczt9CisgICAgdm9pZCBzZXREdW1wV2ViTm90aWZpY2F0aW9uQ2FsbGJhY2tzKGJv b2wgZHVtcFdlYk5vdGlmaWNhdGlvbkNhbGxiYWNrcykgeyBtX2R1bXBXZWJOb3RpZmljYXRpb25D YWxsYmFja3MgPSBkdW1wV2ViTm90aWZpY2F0aW9uQ2FsbGJhY2tzOyB9CisKICAgICBib29sIGNh bGxDbG9zZU9uV2ViVmlld3MoKSBjb25zdCB7IHJldHVybiBtX2NhbGxDbG9zZU9uV2ViVmlld3M7 IH0KICAgICB2b2lkIHNldENhbGxDbG9zZU9uV2ViVmlld3MoYm9vbCBjYWxsQ2xvc2VPbldlYlZp ZXdzKSB7IG1fY2FsbENsb3NlT25XZWJWaWV3cyA9IGNhbGxDbG9zZU9uV2ViVmlld3M7IH0KIApA QCAtMzk3LDYgKzQwMCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2R1bXBJY29uQ2hhbmdlczsK ICAgICBib29sIG1fZHVtcFZpc2l0ZWRMaW5rc0NhbGxiYWNrOwogICAgIGJvb2wgbV9kdW1wV2ls bENhY2hlUmVzcG9uc2U7CisgICAgYm9vbCBtX2R1bXBXZWJOb3RpZmljYXRpb25DYWxsYmFja3M7 CiAgICAgYm9vbCBtX2dlbmVyYXRlUGl4ZWxSZXN1bHRzOwogICAgIGJvb2wgbV9jYWxsQ2xvc2VP bldlYlZpZXdzOwogICAgIGJvb2wgbV9jYW5PcGVuV2luZG93czsKZGlmZiAtLWdpdCBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9Nb2NrV2ViTm90aWZpY2F0aW9uUHJvdmlkZXIubW0gYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9tYWMvTW9ja1dlYk5vdGlmaWNhdGlvblByb3ZpZGVyLm1tCmluZGV4 IDJiNjkzZmRhMmViOWIxNzg2MzgzNjg5NjJiNzBjNDJiYTg3NzliOGIuLjIwMWRkMmYxYTE1ZmY3 Y2FiYzBhMTdlODExMDMwMzEzOGMzMjUwMzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL21hYy9Nb2NrV2ViTm90aWZpY2F0aW9uUHJvdmlkZXIubW0KKysrIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvbWFjL01vY2tXZWJOb3RpZmljYXRpb25Qcm92aWRlci5tbQpAQCAtMjYsOSArMjYs MjUgQEAKICAqIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAorI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJN b2NrV2ViTm90aWZpY2F0aW9uUHJvdmlkZXIuaCIKKworI2ltcG9ydCAiRHVtcFJlbmRlclRyZWUu aCIKKyNpbXBvcnQgIlRlc3RSdW5uZXIuaCIKKyNpbXBvcnQgPFdlYktpdC9XZWJOb3RpZmljYXRp b24uaD4KICNpbXBvcnQgPFdlYktpdC9XZWJTZWN1cml0eU9yaWdpblByaXZhdGUuaD4KIAorQGlu dGVyZmFjZSBXZWJOb3RpZmljYXRpb24gKERSVEV4dHJhcykKKy0gKE5TU3RyaW5nICopX2RydF9k ZXNjcmlwdGlvblN1aXRhYmxlRm9yVGVzdFJlc3VsdDsKK0BlbmQKKworQGltcGxlbWVudGF0aW9u IFdlYk5vdGlmaWNhdGlvbiAoRFJURXh0cmFzKQorLSAoTlNTdHJpbmcgKilfZHJ0X2Rlc2NyaXB0 aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0Cit7CisgICAgcmV0dXJuIFtOU1N0cmluZyBzdHJpbmdX aXRoRm9ybWF0OkAie3RpdGxlOiBcIiVAXCIsIGJvZHk6IFwiJUBcIiwgdGFnOiBcIiVAXCIsIGlj b25VUkw6ICVAfSIsIFtzZWxmIHRpdGxlXSwgW3NlbGYgYm9keV0sIFtzZWxmIHRhZ10sIFtzZWxm IGljb25VUkxdXTsKK30KK0BlbmQKKwogQGltcGxlbWVudGF0aW9uIE1vY2tXZWJOb3RpZmljYXRp b25Qcm92aWRlcgogCiArIChNb2NrV2ViTm90aWZpY2F0aW9uUHJvdmlkZXIgKilzaGFyZWQKQEAg LTkzLDEyICsxMDksMjIgQEAKIAogLSAodm9pZCl3ZWJWaWV3OihXZWJWaWV3ICopd2ViVmlldyBk aWRTaG93Tm90aWZpY2F0aW9uOih1aW50NjRfdClub3RpZmljYXRpb25JRAogewotICAgIFtfbm90 aWZpY2F0aW9ucy5nZXQobm90aWZpY2F0aW9uSUQpLmdldCgpIGRpc3BhdGNoU2hvd0V2ZW50XTsK KyAgICBXZWJOb3RpZmljYXRpb24gKm5vdGlmaWNhdGlvbiA9IF9ub3RpZmljYXRpb25zLmdldChu b3RpZmljYXRpb25JRCkuZ2V0KCk7CisgICAgQVNTRVJUKG5vdGlmaWNhdGlvbik7CisKKyAgICBp ZiAoIWRvbmUgJiYgZ1Rlc3RSdW5uZXItPmR1bXBXZWJOb3RpZmljYXRpb25DYWxsYmFja3MoKSkK KyAgICAgICAgcHJpbnRmKCJTSE9XRUQgV0VCIE5PVElGSUNBVElPTiAlc1xuIiwgW1tub3RpZmlj YXRpb24gX2RydF9kZXNjcmlwdGlvblN1aXRhYmxlRm9yVGVzdFJlc3VsdF0gVVRGOFN0cmluZ10p OworICAgIFtub3RpZmljYXRpb24gZGlzcGF0Y2hTaG93RXZlbnRdOwogfQogCiAtICh2b2lkKXdl YlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IGRpZENsaWNrTm90aWZpY2F0aW9uOih1aW50NjRfdClu b3RpZmljYXRpb25JRAogewotICAgIFtfbm90aWZpY2F0aW9ucy5nZXQobm90aWZpY2F0aW9uSUQp LmdldCgpIGRpc3BhdGNoQ2xpY2tFdmVudF07CisgICAgV2ViTm90aWZpY2F0aW9uICpub3RpZmlj YXRpb24gPSBfbm90aWZpY2F0aW9ucy5nZXQobm90aWZpY2F0aW9uSUQpLmdldCgpOworICAgIEFT U0VSVChub3RpZmljYXRpb24pOworCisgICAgaWYgKCFkb25lICYmIGdUZXN0UnVubmVyLT5kdW1w V2ViTm90aWZpY2F0aW9uQ2FsbGJhY2tzKCkpCisgICAgICAgIHByaW50ZigiQ0xJQ0tFRCBXRUIg Tk9USUZJQ0FUSU9OICVzXG4iLCBbW25vdGlmaWNhdGlvbiBfZHJ0X2Rlc2NyaXB0aW9uU3VpdGFi bGVGb3JUZXN0UmVzdWx0XSBVVEY4U3RyaW5nXSk7CisgICAgW25vdGlmaWNhdGlvbiBkaXNwYXRj aENsaWNrRXZlbnRdOwogfQogCiAtICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IGRp ZENsb3NlTm90aWZpY2F0aW9uczooTlNBcnJheSAqKW5vdGlmaWNhdGlvbklEcwpAQCAtMTA3LDcg KzEzMywxMiBAQAogICAgICAgICB1aW50NjRfdCBpZCA9IFtub3RpZmljYXRpb25JRCB1bnNpZ25l ZExvbmdMb25nVmFsdWVdOwogICAgICAgICBOb3RpZmljYXRpb25JRE1hcDo6aXRlcmF0b3IgaXQg PSBfbm90aWZpY2F0aW9ucy5maW5kKGlkKTsKICAgICAgICAgQVNTRVJUKGl0ICE9IF9ub3RpZmlj YXRpb25zLmVuZCgpKTsKLSAgICAgICAgW2l0LT5zZWNvbmQuZ2V0KCkgZGlzcGF0Y2hDbG9zZUV2 ZW50XTsKKworICAgICAgICBXZWJOb3RpZmljYXRpb24gKm5vdGlmaWNhdGlvbiA9IGl0LT5zZWNv bmQuZ2V0KCk7CisgICAgICAgIGlmICghZG9uZSAmJiBnVGVzdFJ1bm5lci0+ZHVtcFdlYk5vdGlm aWNhdGlvbkNhbGxiYWNrcygpKQorICAgICAgICAgICAgcHJpbnRmKCJDTE9TRUQgV0VCIE5PVElG SUNBVElPTiAlc1xuIiwgW1tub3RpZmljYXRpb24gX2RydF9kZXNjcmlwdGlvblN1aXRhYmxlRm9y VGVzdFJlc3VsdF0gVVRGOFN0cmluZ10pOworCisgICAgICAgIFtub3RpZmljYXRpb24gZGlzcGF0 Y2hDbG9zZUV2ZW50XTsKICAgICAgICAgX25vdGlmaWNhdGlvbnMucmVtb3ZlKGl0KTsKICAgICAg ICAgX25vdGlmaWNhdGlvblZpZXdNYXAucmVtb3ZlKGlkKTsKICAgICB9CmRpZmYgLS1naXQgYS9U b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvVUlEZWxlZ2F0ZS5tbSBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL21hYy9VSURlbGVnYXRlLm1tCmluZGV4IDU4MGIwZDY0OTIxOGNkODdiYzg2NzFiZWFhMjhh NjY5YzE4ODkyOTkuLjY5M2ZhMzcyOTZlNWFlZjA4Nzk2OTdhMWMzNzczNGI3MDAyYmEzMmQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9VSURlbGVnYXRlLm1tCisrKyBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL21hYy9VSURlbGVnYXRlLm1tCkBAIC0yOTEsNiArMjkxLDcgQEAg RHVtcFJlbmRlclRyZWVEcmFnZ2luZ0luZm8gKmRyYWdnaW5nSW5mbyA9IG5pbDsKIAogLSAodm9p ZCl3ZWJWaWV3OihXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOb3RpZmljYXRpb25S ZXF1ZXN0RnJvbU9yaWdpbjooV2ViU2VjdXJpdHlPcmlnaW4gKilvcmlnaW4gbGlzdGVuZXI6KGlk PFdlYkFsbG93RGVueVBvbGljeUxpc3RlbmVyPilsaXN0ZW5lcgogeworICAgIHByaW50ZigiUkVR VUVTVEVEIFdFQiBOT1RJRklDQVRJT04gUEVSTUlTU0lPTiBGT1IgJXNcbiIsIFtbb3JpZ2luIHN0 cmluZ1ZhbHVlXSBVVEY4U3RyaW5nXSk7CiAgICAgWyhNb2NrV2ViTm90aWZpY2F0aW9uUHJvdmlk ZXIgKilbd2ViVmlldyBfbm90aWZpY2F0aW9uUHJvdmlkZXJdIHNldFdlYk5vdGlmaWNhdGlvbk9y aWdpbjpbb3JpZ2luIHN0cmluZ1ZhbHVlXSBwZXJtaXNzaW9uOllFU107CiAgICAgW2xpc3RlbmVy IGFsbG93XTsKIH0K