66964 2011-08-25 11:35:18 -0700 Return the correct value for NPNVsupportsCarbonBool 2011-08-25 13:26:46 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca darin oldest_to_newest 457019 0 andersca 2011-08-25 11:35:18 -0700 Return the correct value for NPNVsupportsCarbonBool 457020 1 105226 andersca 2011-08-25 11:36:12 -0700 Created attachment 105226 Patch 457024 2 darin 2011-08-25 11:43:14 -0700 Can we make a regression test for this? What’s the real world impact? 457027 3 andersca 2011-08-25 11:47:08 -0700 (In reply to comment #2) > Can we make a regression test for this? We could, but it would involve making run-webkit-tests aware of whether Carbon plug-ins are available and look for different results depending on that. I don't think it's worth it. > > What’s the real world impact? Probably none - Carbon plug-ins just assume that the Carbon event model is supported. I just saw that it was wrong and it bothered me. 457034 4 105226 aroben 2011-08-25 11:50:28 -0700 Comment on attachment 105226 Patch This really should have a test associated with it. 457102 5 105236 andersca 2011-08-25 13:23:07 -0700 Created attachment 105236 Patch 457103 6 105236 aroben 2011-08-25 13:24:42 -0700 Comment on attachment 105236 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105236&action=review > Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/SupportsCarbonEventModel.cpp:56 > + bool testConvert(double x, double y, NPCoordinateSpace sourceSpace, NPCoordinateSpace destSpace) > + { > + // First convert from src to dest. > + double destX, destY; > + if (!NPN_ConvertPoint(x, y, sourceSpace, &destX, &destY, destSpace)) > + return false; > + > + // Then convert back to src > + double srcX, srcY; > + if (!NPN_ConvertPoint(destX, destY, destSpace, &srcX, &srcY, sourceSpace)) > + return false; > + > + > + // Then compare. > + if (srcX != x || srcY != y) > + return false; > + > + return true; > + } This function never seems to be called. > Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/SupportsCarbonEventModel.cpp:58 > + bool runTest() This can be private. 457104 7 andersca 2011-08-25 13:26:46 -0700 Committed r93814: <http://trac.webkit.org/changeset/93814> 105226 2011-08-25 11:36:12 -0700 2011-08-25 13:23:03 -0700 Patch bug-66964-20110825113610.patch text/plain 1376 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzODAyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDgtMjUgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXR1cm4gdGhlIGNvcnJl Y3QgdmFsdWUgZm9yIE5QTlZzdXBwb3J0c0NhcmJvbkJvb2wKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2OTY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv TmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOUE5fR2V0VmFsdWUp OgorICAgICAgICBSZW1vdmUgYSBGSVhNRSBjb21tZW50IGFuZCBzZXQgdGhlIHZhbHVlIHRvIHRy dWUuCisKIDIwMTEtMDgtMjUgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3Nz YS5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJdIFJlbW92ZSBRV0tDb250ZXh0IGNsYXNzIGFuZCBt YWtlIHN1cmUgdGhlIFdlYlByb2Nlc3NQcm94eSBsaWZlIGlzIGNvcnJlY3RseSBtYW5hZ2VkLgpJ bmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBl QnJvd3NlckZ1bmNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwCShyZXZpc2lvbiA5Mzc5 MSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2Fw ZUJyb3dzZXJGdW5jcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4OSw4ICs0ODksNyBAQCBzdGF0 aWMgTlBFcnJvciBOUE5fR2V0VmFsdWUoTlBQIG5wcCwgTlBOCiAjZW5kaWYKICNpZm5kZWYgTlBf Tk9fQ0FSQk9OCiAgICAgICAgY2FzZSBOUE5Wc3VwcG9ydHNDYXJib25Cb29sOgotICAgICAgICAg ICAgLy8gRklYTUU6IFdlIHNob3VsZCBzdXBwb3J0IHRoZSBDYXJib24gZXZlbnQgbW9kZWwuCi0g ICAgICAgICAgICAqKE5QQm9vbCopdmFsdWUgPSBmYWxzZTsKKyAgICAgICAgICAgICooTlBCb29s Kil2YWx1ZSA9IHRydWU7CiAgICAgICAgICAgICBicmVhazsKICNlbmRpZgogI2VsaWYgUExBVEZP Uk0oV0lOKQo= 105236 2011-08-25 13:23:07 -0700 2011-08-25 13:24:42 -0700 Patch bug-66964-20110825132305.patch text/plain 10936 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzODEyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDgtMjUgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXR1cm4gdGhlIGNvcnJl Y3QgdmFsdWUgZm9yIE5QTlZzdXBwb3J0c0NhcmJvbkJvb2wKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2OTY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv TmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOUE5fR2V0VmFsdWUp OgorICAgICAgICBSZW1vdmUgYSBGSVhNRSBhbmQgc2V0IHRoZSB2YWx1ZSB0byB0cnVlLgorCiAy MDExLTA4LTI1ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgog CiAgICAgICAgIFtRdF1bV0syXSBSZW1vdmUgUVdLQ29udGV4dCBjbGFzcyBhbmQgbWFrZSBzdXJl IHRoZSBXZWJQcm9jZXNzUHJveHkgbGlmZSBpcyBjb3JyZWN0bHkgbWFuYWdlZC4KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJG dW5jcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcAkocmV2aXNpb24gOTM3OTEpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2Vy RnVuY3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00ODksOCArNDg5LDcgQEAgc3RhdGljIE5QRXJy b3IgTlBOX0dldFZhbHVlKE5QUCBucHAsIE5QTgogI2VuZGlmCiAjaWZuZGVmIE5QX05PX0NBUkJP TgogICAgICAgIGNhc2UgTlBOVnN1cHBvcnRzQ2FyYm9uQm9vbDoKLSAgICAgICAgICAgIC8vIEZJ WE1FOiBXZSBzaG91bGQgc3VwcG9ydCB0aGUgQ2FyYm9uIGV2ZW50IG1vZGVsLgotICAgICAgICAg ICAgKihOUEJvb2wqKXZhbHVlID0gZmFsc2U7CisgICAgICAgICAgICAqKE5QQm9vbCopdmFsdWUg PSB0cnVlOwogICAgICAgICAgICAgYnJlYWs7CiAjZW5kaWYKICNlbGlmIFBMQVRGT1JNKFdJTikK SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDkzODEyKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTkgQEAKKzIwMTEtMDgtMjUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KKworICAgICAgICBSZXR1cm4gdGhlIGNvcnJlY3QgdmFsdWUgZm9yIE5QTlZzdXBwb3J0c0Nh cmJvbkJvb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY2OTY0CisKKyAgICAgICAgQWRkIGEgdGVzdC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvVGVzdE5l dHNjYXBlUGx1Z0luL1Rlc3RzL21hYy9TdXBwb3J0c0NhcmJvbkV2ZW50TW9kZWwuY3BwOiBBZGRl ZC4KKyAgICAgICAgKFN1cHBvcnRzQ2FyYm9uRXZlbnRNb2RlbDo6U3VwcG9ydHNDYXJib25FdmVu dE1vZGVsKToKKyAgICAgICAgKFN1cHBvcnRzQ2FyYm9uRXZlbnRNb2RlbDo6dGVzdENvbnZlcnQp OgorICAgICAgICAoU3VwcG9ydHNDYXJib25FdmVudE1vZGVsOjpydW5UZXN0KToKKyAgICAgICAg KFN1cHBvcnRzQ2FyYm9uRXZlbnRNb2RlbDo6TlBQX05ldyk6CisKIDIwMTEtMDgtMjUgIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBnYXJkZW4tby1t YXRpYyBzdW1tYXJ5IHZpZXcgc2hvdWxkIG5vdCBiZSBicm9rZW4uCkluZGV4OiBUb29scy9EdW1w UmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDkzNzkxKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUv RHVtcFJlbmRlclRyZWUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpA QCAtMzIsNiArMzIsNyBAQAogCQkxNDFCRjQzOTA5NkE0NTU5MDBFMDc1M0MgLyogQ2FyYm9uLmZy YW1ld29yayBpbiBGcmFtZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEFFODI1N0VGMDhEMjIzODkwMDA1MDdBQiAvKiBDYXJib24uZnJhbWV3b3JrICovOyB9OwogCQkx NDFCRjQ1MzA5NkE0NUVCMDBFMDc1M0MgLyogUGx1Z2luT2JqZWN0LmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDFCRjQ0NzA5NkE0NUM4MDBFMDc1M0Mg LyogUGx1Z2luT2JqZWN0LmggKi87IH07CiAJCTE0NzcwRkUyMEEyMkFERjcwMDkzNDJFRSAvKiBH Q0NvbnRyb2xsZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDE0NzcwRkUwMEEyMkFERjcwMDkzNDJFRSAvKiBHQ0NvbnRyb2xsZXIuaCAqLzsgfTsKKwkJ MUExNEM4QTUxNDA2REUwNDAwQjI1NEY3IC8qIFN1cHBvcnRzQ2FyYm9uRXZlbnRNb2RlbC5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTE0QzhBMzE0 MDZERTA0MDBCMjU0RjcgLyogU3VwcG9ydHNDYXJib25FdmVudE1vZGVsLmNwcCAqLzsgfTsKIAkJ MUEyMTVBODExMUYyNjA5QzAwOEFEMEY1IC8qIFBsdWdpblRlc3QuY3BwIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEyMTVBN0YxMUYyNjA5QzAwOEFEMEY1 IC8qIFBsdWdpblRlc3QuY3BwICovOyB9OwogCQkxQTIxNUE4MjExRjI2MDlDMDA4QUQwRjUgLyog UGx1Z2luVGVzdC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMUEyMTVBODAxMUYyNjA5QzAwOEFEMEY1IC8qIFBsdWdpblRlc3QuaCAqLzsgfTsKIAkJMUEy MTVCRTcxMUYyNzY1ODAwOEFEMEY1IC8qIERvY3VtZW50T3BlbkluRGVzdHJveVN0cmVhbS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTIxNUE3NTEx RjI2MDcyMDA4QUQwRjUgLyogRG9jdW1lbnRPcGVuSW5EZXN0cm95U3RyZWFtLmNwcCAqLzsgfTsK QEAgLTIxNCw2ICsyMTUsNyBAQAogCQkxNDFCRjQ0NzA5NkE0NUM4MDBFMDc1M0MgLyogUGx1Z2lu T2JqZWN0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBQbHVnaW5PYmplY3Qu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMTQxQkY0NDgwOTZBNDVDODAwRTA3NTND IC8qIEluZm8ucGxpc3QgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5wbGlzdC54bWw7IG5hbWUgPSBJbmZvLnBs aXN0OyBwYXRoID0gbWFjL0luZm8ucGxpc3Q7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTE0NzcwRkUwMEEyMkFERjcwMDkzNDJFRSAvKiBHQ0NvbnRyb2xsZXIuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gR0NDb250cm9sbGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CisJCTFBMTRDOEEzMTQwNkRFMDQwMEIyNTRGNyAvKiBTdXBwb3J0c0NhcmJvbkV2ZW50 TW9kZWwuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU3VwcG9ydHND YXJib25FdmVudE1vZGVsLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUEyMTVB NzUxMUYyNjA3MjAwOEFEMEY1IC8qIERvY3VtZW50T3BlbkluRGVzdHJveVN0cmVhbS5jcHAgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBEb2N1bWVudE9wZW5JbkRlc3Ryb3lT dHJlYW0uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTIxNUE3RjExRjI2MDlD MDA4QUQwRjUgLyogUGx1Z2luVGVzdC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7 IHBhdGggPSBQbHVnaW5UZXN0LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUEy MTVBODAxMUYyNjA5QzAwOEFEMEY1IC8qIFBsdWdpblRlc3QuaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gUGx1Z2luVGVzdC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpA QCAtNTE5LDYgKzUyMSw3IEBACiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAog CQkJCTFBMzFFQjM3MTM0NjZBQzEwMDAxNzM3MiAvKiBDb252ZXJ0UG9pbnQuY3BwICovLAorCQkJ CTFBMTRDOEEzMTQwNkRFMDQwMEIyNTRGNyAvKiBTdXBwb3J0c0NhcmJvbkV2ZW50TW9kZWwuY3Bw ICovLAogCQkJKTsKIAkJCXBhdGggPSBtYWM7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpA QCAtODI3LDYgKzgzMCw3IEBACiAJCQkJMUE1Q0MxRjUxMzdERDJFQzAwQTVEN0U3IC8qIEdldFVS TFdpdGhKYXZhU2NyaXB0VVJMLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTFBRkY2NkJDMTM3REVG RDIwMDc5MTY5NiAvKiBHZXRVUkxOb3RpZnlXaXRoVVJMVGhhdEZhaWxzVG9Mb2FkLmNwcCBpbiBT b3VyY2VzICovLAogCQkJCTRBRDZBMTE0MTNDODEyNDAwMEVBOTczNyAvKiBGb3JtVmFsdWUuY3Bw IGluIFNvdXJjZXMgKi8sCisJCQkJMUExNEM4QTUxNDA2REUwNDAwQjI1NEY3IC8qIFN1cHBvcnRz Q2FyYm9uRXZlbnRNb2RlbC5jcHAgaW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9y RGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKSW5kZXg6IFRvb2xzL0R1bXBSZW5k ZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9UZXN0cy9tYWMvU3VwcG9ydHNDYXJib25FdmVudE1v ZGVsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQ bHVnSW4vVGVzdHMvbWFjL1N1cHBvcnRzQ2FyYm9uRXZlbnRNb2RlbC5jcHAJKHJldmlzaW9uIDAp CisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vVGVzdHMvbWFjL1N1 cHBvcnRzQ2FyYm9uRXZlbnRNb2RlbC5jcHAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsODEgQEAK Ky8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlz dHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5D LiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhF IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJF TUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERB VEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KKyAqLworCisjaW5jbHVkZSAiUGx1Z2luVGVzdC5oIgorCit1c2luZyBuYW1lc3BhY2Ug c3RkOworCisvLyBUZXN0IHRoYXQgd2UgcmVwb3J0IHRoYXQgd2Ugc3VwcG9ydCB0aGUgQ2FyYm9u IGV2ZW50IG1vZGVsIGluIDMyLWJpdC4KK2NsYXNzIFN1cHBvcnRzQ2FyYm9uRXZlbnRNb2RlbCA6 IHB1YmxpYyBQbHVnaW5UZXN0IHsKK3B1YmxpYzoKKyAgICBTdXBwb3J0c0NhcmJvbkV2ZW50TW9k ZWwoTlBQIG5wcCwgY29uc3Qgc3RyaW5nJiBpZGVudGlmaWVyKQorICAgICAgICA6IFBsdWdpblRl c3QobnBwLCBpZGVudGlmaWVyKQorICAgIHsKKyAgICB9CisKKyAgICBib29sIHRlc3RDb252ZXJ0 KGRvdWJsZSB4LCBkb3VibGUgeSwgTlBDb29yZGluYXRlU3BhY2Ugc291cmNlU3BhY2UsIE5QQ29v cmRpbmF0ZVNwYWNlIGRlc3RTcGFjZSkKKyAgICB7CisgICAgICAgIC8vIEZpcnN0IGNvbnZlcnQg ZnJvbSBzcmMgdG8gZGVzdC4KKyAgICAgICAgZG91YmxlIGRlc3RYLCBkZXN0WTsKKyAgICAgICAg aWYgKCFOUE5fQ29udmVydFBvaW50KHgsIHksIHNvdXJjZVNwYWNlLCAmZGVzdFgsICZkZXN0WSwg ZGVzdFNwYWNlKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICAvLyBUaGVu IGNvbnZlcnQgYmFjayB0byBzcmMKKyAgICAgICAgZG91YmxlIHNyY1gsIHNyY1k7CisgICAgICAg IGlmICghTlBOX0NvbnZlcnRQb2ludChkZXN0WCwgZGVzdFksIGRlc3RTcGFjZSwgJnNyY1gsICZz cmNZLCBzb3VyY2VTcGFjZSkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKworICAgICAg ICAvLyBUaGVuIGNvbXBhcmUuCisgICAgICAgIGlmIChzcmNYICE9IHggfHwgc3JjWSAhPSB5KQor ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0K KworICAgIGJvb2wgcnVuVGVzdCgpCisgICAgeworI2lmZGVmIE5QX05PX0NBUkJPTgorICAgICAg ICAvLyBUaGVyZSdzIG5vIHN1cHBvcnQgZm9yIENhcmJvbiwgc28gd2UgY2FuJ3QgdGVzdCBhbnl0 aGluZy4KKyAgICAgICAgcmV0dXJuIHRydWU7CisjZWxzZQorICAgICAgICBOUEJvb2wgc3VwcG9y dHNDYXJib25FdmVudE1vZGVsID0gZmFsc2U7CisgICAgICAgIGlmIChOUE5fR2V0VmFsdWUoTlBO VnN1cHBvcnRzQ2FyYm9uQm9vbCwgJnN1cHBvcnRzQ2FyYm9uRXZlbnRNb2RlbCkgIT0gTlBFUlJf Tk9fRVJST1IpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgcmV0dXJuIHN1 cHBvcnRzQ2FyYm9uRXZlbnRNb2RlbDsKKyNlbmRpZgorICAgIH0KK3ByaXZhdGU6CisgICAgdmly dHVhbCBOUEVycm9yIE5QUF9OZXcoTlBNSU1FVHlwZSBwbHVnaW5UeXBlLCB1aW50MTZfdCBtb2Rl LCBpbnQxNl90IGFyZ2MsIGNoYXIgKmFyZ25bXSwgY2hhciAqYXJndltdLCBOUFNhdmVkRGF0YSAq c2F2ZWQpCisgICAgeworICAgICAgICBpZiAocnVuVGVzdCgpKQorICAgICAgICAgICAgZXhlY3V0 ZVNjcmlwdCgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdCcpLmlubmVySFRNTCA9ICdT VUNDRVNTISciKTsKKworICAgICAgICByZXR1cm4gTlBFUlJfTk9fRVJST1I7CisgICAgfSAgICAg ICAgCit9OworCitzdGF0aWMgUGx1Z2luVGVzdDo6UmVnaXN0ZXI8U3VwcG9ydHNDYXJib25FdmVu dE1vZGVsPiBzdXBwb3J0c0NhcmJvbkV2ZW50TW9kZWwoInN1cHBvcnRzLWNhcmJvbi1ldmVudC1t b2RlbCIpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gOTM4MTIpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wOC0yNSAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldHVybiB0aGUgY29ycmVj dCB2YWx1ZSBmb3IgTlBOVnN1cHBvcnRzQ2FyYm9uQm9vbAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY5NjQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdC4KKworICAgICAgICAqIHBsYXRmb3Jt L21hYy9wbHVnaW5zL3N1cHBvcnRzLWNhcmJvbi1ldmVudC1tb2RlbC1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9wbHVnaW5zL3N1cHBvcnRzLWNhcmJvbi1ldmVu dC1tb2RlbC5odG1sOiBBZGRlZC4KKwogMjAxMS0wOC0yNCAgUGV0ZXIgS2FzdGluZyAgPHBrYXN0 aW5nQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9taXVtXSBGdXJ0aGVyIGF0dGVtcHRzIHRv IGNsZWFuIHVwIHRoZSB0ZXN0IGV4cGVjdGF0aW9ucyBieSBiZWluZwpJbmRleDogTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL3BsdWdpbnMvc3VwcG9ydHMtY2FyYm9uLWV2ZW50LW1vZGVsLWV4cGVj dGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvcGx1Z2lucy9z dXBwb3J0cy1jYXJib24tZXZlbnQtbW9kZWwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL3BsdWdpbnMvc3VwcG9ydHMtY2FyYm9uLWV2ZW50LW1v ZGVsLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzIEBACisKK1RoaXMgdGVz dHMgdGhhdCBXZWJLaXQgY29ycmVjdGx5IHJlcG9ydHMgdGhhdCB0aGUgQ2FyYm9uIGV2ZW50IG1v ZGVsIGlzIHN1cHBvcnRlZC4KK1NVQ0NFU1MhCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvcGx1Z2lucy9zdXBwb3J0cy1jYXJib24tZXZlbnQtbW9kZWwuaHRtbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvcGx1Z2lucy9zdXBwb3J0cy1jYXJib24tZXZlbnQt bW9kZWwuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9wbHVn aW5zL3N1cHBvcnRzLWNhcmJvbi1ldmVudC1tb2RlbC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCww ICsxLDE2IEBACis8c2NyaXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7Cis8L3NjcmlwdD4KKworPGVtYmVk IGlkPSJ0ZXN0UGx1Z2luIiAKKyAgICAgICB0eXBlPSJhcHBsaWNhdGlvbi94LXdlYmtpdC10ZXN0 LW5ldHNjYXBlIgorICAgICAgIHRlc3Q9InN1cHBvcnRzLWNhcmJvbi1ldmVudC1tb2RlbCI+Cis8 L2VtYmVkPgorCis8ZGl2PgorICAgIFRoaXMgdGVzdHMgdGhhdCBXZWJLaXQgY29ycmVjdGx5IHJl cG9ydHMgdGhhdCB0aGUgQ2FyYm9uIGV2ZW50IG1vZGVsIGlzIHN1cHBvcnRlZC4KKzwvZGl2Pgor PGRpdiBpZD0icmVzdWx0Ij5GQUlMVVJFPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg==