68269 2011-09-16 12:49:08 -0700 Add back the WKHitTestResultRef parameter to mouseDidMoveOverElement in an ABI preserving way 2011-09-16 19:08:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca rniwa oldest_to_newest 468724 0 andersca 2011-09-16 12:49:08 -0700 Add back the WKHitTestResultRef parameter to mouseDidMoveOverElement in an ABI preserving way 468729 1 107707 andersca 2011-09-16 12:53:49 -0700 Created attachment 107707 Patch 468742 2 107707 ggaren 2011-09-16 13:03:31 -0700 Comment on attachment 107707 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107707&action=review r=me > Source/WebKit2/UIProcess/WebUIClient.cpp:166 > + if (!m_client.version) { This is a particularly glaring case where our style rule that compares to 0 should use ! is bizarre and unreadable. Oh well. 468750 3 andersca 2011-09-16 13:11:04 -0700 Committed r95315: <http://trac.webkit.org/changeset/95315> 468986 4 rniwa 2011-09-16 19:08:20 -0700 It seems like this patch broke WK2 tests: http://build.webkit.org/builders/SnowLeopard%20Intel%20Release%20%28WebKit2%20Tests%29/builds/14919 http://build.webkit.org/builders/SnowLeopard%20Intel%20Release%20%28WebKit2%20Tests%29/builds/14919/steps/layout-test/logs/stdio 107707 2011-09-16 12:53:49 -0700 2011-09-16 13:03:31 -0700 Patch bug-68269-20110916125348.patch text/plain 11307 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1MzExKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDktMTYgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYmFjayB0aGUgV0tI aXRUZXN0UmVzdWx0UmVmIHBhcmFtZXRlciB0byBtb3VzZURpZE1vdmVPdmVyRWxlbWVudCBpbiBh biBBQkkgcHJlc2VydmluZyB3YXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY4MjY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIGJhY2sgV0tQYWdlTW91c2VEaWRNb3ZlT3ZlckVsZW1lbnRDYWxsYmFj ayBsYXN0IGFuZCBkZXByZWNhdGUgdGhlIGN1cnJlbnQgY2FsbGJhY2suCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlVJQ2xpZW50 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVUlDbGllbnQ6Om1vdXNlRGlkTW92ZU92ZXJFbGVt ZW50KToKKwogMjAxMS0wOS0xNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29t PgogCiAgICAgICAgIFRlbXBvcmFyaWx5IHJlbW92ZSB0aGUgV0tIaXRUZXN0UmVzdWx0UmVmIHBh cmFtZXRlciB0byBhdm9pZCBicmVha2luZyB0aGUgV0syIEFCSS9BUEkKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmNwcAkocmV2aXNpb24gOTUzMTEpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVUlDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x NTcsMTIgKzE1NywxOSBAQCB2b2lkIFdlYlVJQ2xpZW50OjpzZXRTdGF0dXNUZXh0KFdlYlBhZ2VQ CiAKIHZvaWQgV2ViVUlDbGllbnQ6Om1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KFdlYlBhZ2VQcm94 eSogcGFnZSwgY29uc3QgV2ViSGl0VGVzdFJlc3VsdDo6RGF0YSYgZGF0YSwgV2ViRXZlbnQ6Ok1v ZGlmaWVycyBtb2RpZmllcnMsIEFQSU9iamVjdCogdXNlckRhdGEpCiB7Ci0gICAgaWYgKCFtX2Ns aWVudC5tb3VzZURpZE1vdmVPdmVyRWxlbWVudCkKKyAgICBpZiAoIW1fY2xpZW50Lm1vdXNlRGlk TW92ZU92ZXJFbGVtZW50ICYmICFtX2NsaWVudC5tb3VzZURpZE1vdmVPdmVyRWxlbWVudF9kZXBy ZWNhdGVkRm9yVXNlV2l0aFYwKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBGSVhNRTogUGFz cyB0aGUgaGl0IHRlc3QgcmVzdWx0IHRvIHRoZSBVSSBjbGllbnQgY2FsbGJhY2sgZnVuY3Rpb24u CisgICAgaWYgKG1fY2xpZW50LnZlcnNpb24gPT0ga1dLUGFnZVVJQ2xpZW50Q3VycmVudFZlcnNp b24gJiYgIW1fY2xpZW50Lm1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KQorICAgICAgICByZXR1cm47 CisKKyAgICBpZiAoIW1fY2xpZW50LnZlcnNpb24pIHsKKyAgICAgICAgbV9jbGllbnQubW91c2VE aWRNb3ZlT3ZlckVsZW1lbnRfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCh0b0FQSShwYWdlKSwgdG9B UEkobW9kaWZpZXJzKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFJlZlB0cjxXZWJIaXRUZXN0UmVzdWx0PiB3ZWJI aXRUZXN0UmVzdWx0ID0gV2ViSGl0VGVzdFJlc3VsdDo6Y3JlYXRlKGRhdGEpOwotICAgIG1fY2xp ZW50Lm1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KHRvQVBJKHBhZ2UpLCB0b0FQSShtb2RpZmllcnMp LCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmNsaWVudEluZm8pOworICAgIG1fY2xpZW50Lm1v dXNlRGlkTW92ZU92ZXJFbGVtZW50KHRvQVBJKHBhZ2UpLCB0b0FQSSh3ZWJIaXRUZXN0UmVzdWx0 LmdldCgpKSwgdG9BUEkobW9kaWZpZXJzKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5jbGll bnRJbmZvKTsKIH0KIAogdm9pZCBXZWJVSUNsaWVudDo6bWlzc2luZ1BsdWdpbkJ1dHRvbkNsaWNr ZWQoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJp bmcmIHVybCwgY29uc3QgU3RyaW5nJiBwbHVnaW5zUGFnZVVSTCkKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgJKHJldmlzaW9uIDk1MzExKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjgsNyAr MTY4LDcgQEAgdHlwZWRlZiB2b2lkICgqV0tQYWdlVGFrZUZvY3VzQ2FsbGJhY2spKAogdHlwZWRl ZiB2b2lkICgqV0tQYWdlRm9jdXNDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQg KmNsaWVudEluZm8pOwogdHlwZWRlZiB2b2lkICgqV0tQYWdlVW5mb2N1c0NhbGxiYWNrKShXS1Bh Z2VSZWYgcGFnZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1Bh Z2VTZXRTdGF0dXNUZXh0Q2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiB0ZXh0 LCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKLXR5cGVkZWYgdm9pZCAoKldLUGFnZU1vdXNlRGlk TW92ZU92ZXJFbGVtZW50Q2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS0V2ZW50TW9kaWZpZXJz IG1vZGlmaWVycywgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsK K3R5cGVkZWYgdm9pZCAoKldLUGFnZU1vdXNlRGlkTW92ZU92ZXJFbGVtZW50Q2FsbGJhY2spKFdL UGFnZVJlZiBwYWdlLCBXS0hpdFRlc3RSZXN1bHRSZWYgaGl0VGVzdFJlc3VsdCwgV0tFdmVudE1v ZGlmaWVycyBtb2RpZmllcnMsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCAqY2xpZW50 SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VNaXNzaW5nUGx1Z2luQnV0dG9uQ2xpY2tlZENh bGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgbWltZVR5cGUsIFdLU3RyaW5nUmVm IHVybCwgV0tTdHJpbmdSZWYgcGx1Z2luc1BhZ2VVUkwsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8p OwogdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkTm90SGFuZGxlS2V5RXZlbnRDYWxsYmFjaykoV0tQ YWdlUmVmIHBhZ2UsIFdLTmF0aXZlRXZlbnRQdHIgZXZlbnQsIGNvbnN0IHZvaWQgKmNsaWVudElu Zm8pOwogdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkTm90SGFuZGxlV2hlZWxFdmVudENhbGxiYWNr KShXS1BhZ2VSZWYgcGFnZSwgV0tOYXRpdmVFdmVudFB0ciBldmVudCwgY29uc3Qgdm9pZCAqY2xp ZW50SW5mbyk7CkBAIC0xOTcsNyArMTk3LDggQEAgdHlwZWRlZiBib29sICgqV0tQYWdlU2hvdWxk SW50ZXJydXB0SmF2YQogCiAvLyBEZXByZWNhdGVkICAgIAogdHlwZWRlZiBXS1BhZ2VSZWYgKCpX S1BhZ2VDcmVhdGVOZXdQYWdlQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCkoV0tQYWdl UmVmIHBhZ2UsIFdLRGljdGlvbmFyeVJlZiBmZWF0dXJlcywgV0tFdmVudE1vZGlmaWVycyBtb2Rp ZmllcnMsIFdLRXZlbnRNb3VzZUJ1dHRvbiBtb3VzZUJ1dHRvbiwgY29uc3Qgdm9pZCAqY2xpZW50 SW5mbyk7Ci0gICAgCit0eXBlZGVmIHZvaWQgICAgICAoKldLUGFnZU1vdXNlRGlkTW92ZU92ZXJF bGVtZW50Q2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCkoV0tQYWdlUmVmIHBhZ2UsIFdL RXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQg KmNsaWVudEluZm8pOworCiBzdHJ1Y3QgV0tQYWdlVUlDbGllbnQgewogICAgIGludCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dmVyc2lvbjsKICAgICBjb25zdCB2b2lkICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNsaWVudEluZm87CkBAIC0yMTMsNyArMjE0LDcgQEAg c3RydWN0IFdLUGFnZVVJQ2xpZW50IHsKICAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0Q29uZmlybUNh bGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRDb25m aXJtOwogICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRQcm9tcHRDYWxsYmFjayAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcnVuSmF2YVNjcmlwdFByb21wdDsKICAgICBXS1BhZ2VTZXRT dGF0dXNUZXh0Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHNldFN0YXR1c1RleHQ7Ci0gICAgV0tQYWdlTW91c2VEaWRNb3ZlT3ZlckVsZW1lbnRDYWxsYmFj ayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtb3VzZURpZE1vdmVPdmVyRWxlbWVudDsK KyAgICBXS1BhZ2VNb3VzZURpZE1vdmVPdmVyRWxlbWVudENhbGxiYWNrX2RlcHJlY2F0ZWRGb3JV c2VXaXRoVjAgICAgICAgIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50X2RlcHJlY2F0ZWRGb3JVc2VX aXRoVjA7CiAgICAgV0tQYWdlTWlzc2luZ1BsdWdpbkJ1dHRvbkNsaWNrZWRDYWxsYmFjayAgICAg ICAgICAgICAgICAgICAgICAgICAgICBtaXNzaW5nUGx1Z2luQnV0dG9uQ2xpY2tlZDsKICAgICBX S1BhZ2VEaWROb3RIYW5kbGVLZXlFdmVudENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRpZE5vdEhhbmRsZUtleUV2ZW50OwogICAgIFdLUGFnZURpZE5vdEhhbmRsZVdo ZWVsRXZlbnRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkTm90SGFu ZGxlV2hlZWxFdmVudDsKQEAgLTI0NSw2ICsyNDYsNyBAQCBzdHJ1Y3QgV0tQYWdlVUlDbGllbnQg ewogCiAgICAgLy8gVmVyc2lvbiAxCiAgICAgV0tQYWdlQ3JlYXRlTmV3UGFnZUNhbGxiYWNrICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjcmVhdGVOZXdQYWdlOworICAg IFdLUGFnZU1vdXNlRGlkTW92ZU92ZXJFbGVtZW50Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQ7CiB9OwogdHlwZWRlZiBzdHJ1Y3Qg V0tQYWdlVUlDbGllbnQgV0tQYWdlVUlDbGllbnQ7CiAKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1MzExKQorKysgVG9vbHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDktMTYgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYmFjayB0 aGUgV0tIaXRUZXN0UmVzdWx0UmVmIHBhcmFtZXRlciB0byBtb3VzZURpZE1vdmVPdmVyRWxlbWVu dCBpbiBhbiBBQkkgcHJlc2VydmluZyB3YXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY4MjY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVXBkYXRlIGNsaWVudCBmdW5jdGlvbiBzaWduYXR1cmVzLgorCisg ICAgICAgICogTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYzoKKyAgICAgICAgKGJyb3dz ZXJXaW5kb3dVSUNsaWVudEluaXQpOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2Vy V2luZG93Q29udHJvbGxlci5tOgorICAgICAgICAobW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQpOgor ICAgICAgICAoLVtCcm93c2VyV2luZG93Q29udHJvbGxlciBhd2FrZUZyb21OaWJdKToKKyAgICAg ICAgKiBNaW5pQnJvd3Nlci93aW4vQnJvd3NlclZpZXcuY3BwOgorICAgICAgICAoQnJvd3NlclZp ZXc6OmNyZWF0ZSk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5j cHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpjcmVhdGVPdGhlclBhZ2UpOgorICAg ICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZSk6CisKIDIwMTEtMDktMTYgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBUZW1wb3Jhcmls eSByZW1vdmUgdGhlIFdLSGl0VGVzdFJlc3VsdFJlZiBwYXJhbWV0ZXIgdG8gYXZvaWQgYnJlYWtp bmcgdGhlIFdLMiBBQkkvQVBJCkluZGV4OiBUb29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3Nlcldp bmRvdy5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93 LmMJKHJldmlzaW9uIDk1MzEwKQorKysgVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5k b3cuYwkod29ya2luZyBjb3B5KQpAQCAtNjIzLDcgKzYyMyw3IEBAIHN0YXRpYyB2b2lkIGJyb3dz ZXJXaW5kb3dVSUNsaWVudEluaXQoQnIKICAgICAgICAgcnVuSmF2YVNjcmlwdENvbmZpcm0sCiAg ICAgICAgIHJ1bkphdmFTY3JpcHRQcm9tcHQsCiAgICAgICAgIDAsICAgICAgLyogc2V0U3RhdHVz VGV4dCAqLwotICAgICAgICBtb3VzZURpZE1vdmVPdmVyRWxlbWVudCwKKyAgICAgICAgMCwgICAg ICAvKiBtb3VzZURpZE1vdmVPdmVyRWxlbWVudF9kZXByZWNhdGVkRm9yVXNlV2l0aFYwICovCiAg ICAgICAgIDAsICAgICAgLyogbWlzc2luZ1BsdWdpbkJ1dHRvbkNsaWNrZWQgKi8KICAgICAgICAg MCwgICAgICAvKiBkaWROb3RIYW5kbGVLZXlFdmVudCAqLwogICAgICAgICAwLCAgICAgIC8qIGRp ZE5vdEhhbmRsZVdoZWVsRXZlbnQgKi8KQEAgLTY1Miw3ICs2NTIsOCBAQCBzdGF0aWMgdm9pZCBi cm93c2VyV2luZG93VUlDbGllbnRJbml0KEJyCiAgICAgICAgIDAsICAgICAgLyogZGlkQ29tcGxl dGVSdWJiZXJCYW5kRm9yTWFpbkZyYW1lICovCiAgICAgICAgIDAsICAgICAgLyogc2F2ZURhdGFU b0ZpbGVJbkRvd25sb2Fkc0ZvbGRlciAqLwogICAgICAgICAwLCAgICAgIC8qIHNob3VsZEludGVy cnVwdEphdmFTY3JpcHQgKi8KLSAgICAgICAgY3JlYXRlTmV3UGFnZQorICAgICAgICBjcmVhdGVO ZXdQYWdlLAorICAgICAgICBtb3VzZURpZE1vdmVPdmVyRWxlbWVudAogICAgIH07CiAgICAgV0tQ YWdlU2V0UGFnZVVJQ2xpZW50KFdLVmlld0dldFBhZ2Uod2luZG93LT53ZWJWaWV3KSwgJnVpQ2xp ZW50KTsKIH0KSW5kZXg6IFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJv bGxlci5tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93 Q29udHJvbGxlci5tCShyZXZpc2lvbiA5NTMxMSkKKysrIFRvb2xzL01pbmlCcm93c2VyL21hYy9C cm93c2VyV2luZG93Q29udHJvbGxlci5tCSh3b3JraW5nIGNvcHkpCkBAIC00OTAsNyArNDkwLDcg QEAgc3RhdGljIHZvaWQgc2V0U3RhdHVzVGV4dChXS1BhZ2VSZWYgcGFnZQogICAgIExPRyhAInNl dFN0YXR1c1RleHQiKTsKIH0KIAotc3RhdGljIHZvaWQgbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQo V0tQYWdlUmVmIHBhZ2UsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCBXS1R5cGVSZWYgdXNl ckRhdGEsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pCitzdGF0aWMgdm9pZCBtb3VzZURpZE1vdmVP dmVyRWxlbWVudChXS1BhZ2VSZWYgcGFnZSwgV0tIaXRUZXN0UmVzdWx0UmVmIGhpdFRlc3RSZXN1 bHQsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0 IHZvaWQgKmNsaWVudEluZm8pCiB7CiAgICAgTE9HKEAibW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQi KTsKIH0KQEAgLTYyNiw3ICs2MjYsNyBAQCAtICh2b2lkKWF3YWtlRnJvbU5pYgogICAgICAgICBy dW5KYXZhU2NyaXB0Q29uZmlybSwKICAgICAgICAgcnVuSmF2YVNjcmlwdFByb21wdCwKICAgICAg ICAgc2V0U3RhdHVzVGV4dCwKLSAgICAgICAgbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQsCisgICAg ICAgIDAsICAgICAgICAgIC8qIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50X2RlcHJlY2F0ZWRGb3JV c2VXaXRoVjAgKi8KICAgICAgICAgMCwgICAgICAgICAgLyogbWlzc2luZ1BsdWdpbkJ1dHRvbkNs aWNrZWQgKi8KICAgICAgICAgMCwgICAgICAgICAgLyogZGlkTm90SGFuZGxlS2V5RXZlbnQgKi8K ICAgICAgICAgMCwgICAgICAgICAgLyogZGlkTm90SGFuZGxlV2hlZWxFdmVudCAqLwpAQCAtNjU2 LDYgKzY1Niw3IEBAIC0gKHZvaWQpYXdha2VGcm9tTmliCiAgICAgICAgIDAsIC8vIHNhdmVEYXRh VG9GaWxlSW5Eb3dubG9hZHNGb2xkZXIKICAgICAgICAgMCwgLy8gc2hvdWxkSW50ZXJydXB0SmF2 YVNjcmlwdAogICAgICAgICBjcmVhdGVOZXdQYWdlLAorICAgICAgICBtb3VzZURpZE1vdmVPdmVy RWxlbWVudCwKICAgICB9OwogICAgIFdLUGFnZVNldFBhZ2VVSUNsaWVudChfd2ViVmlldy5wYWdl UmVmLCAmdWlDbGllbnQpOwogfQpJbmRleDogVG9vbHMvTWluaUJyb3dzZXIvd2luL0Jyb3dzZXJW aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9NaW5pQnJvd3Nlci93aW4vQnJvd3NlclZpZXcu Y3BwCShyZXZpc2lvbiA5NTMxMCkKKysrIFRvb2xzL01pbmlCcm93c2VyL3dpbi9Ccm93c2VyVmll dy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw3ICsxMDUsNyBAQCB2b2lkIEJyb3dzZXJWaWV3 OjpjcmVhdGUoUkVDVCB3ZWJWaWV3UmVjCiAgICAgICAgIHJ1bkphdmFTY3JpcHRDb25maXJtLAog ICAgICAgICBydW5KYXZhU2NyaXB0UHJvbXB0LAogICAgICAgICBzZXRTdGF0dXNUZXh0LAotICAg ICAgICBtb3VzZURpZE1vdmVPdmVyRWxlbWVudCwKKyAgICAgICAgMCwgICAgICAgICAgLyogbW91 c2VEaWRNb3ZlT3ZlckVsZW1lbnRfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCAqLwogICAgICAgICAw LCAgICAgICAgICAvKiBtaXNzaW5nUGx1Z2luQnV0dG9uQ2xpY2tlZCAqLwogICAgICAgICAwLCAg ICAgICAgICAvKiBkaWROb3RIYW5kbGVLZXlFdmVudCAqLwogICAgICAgICAwLCAgICAgICAgICAv KiBkaWROb3RIYW5kbGVXaGVlbEV2ZW50ICovCkBAIC0xMzUsNiArMTM1LDcgQEAgdm9pZCBCcm93 c2VyVmlldzo6Y3JlYXRlKFJFQ1Qgd2ViVmlld1JlYwogICAgICAgICAwLCAgICAgICAgICAvKiBz YXZlRGF0YVRvRmlsZUluRG93bmxvYWRzRm9sZGVyICovCiAgICAgICAgIDAsICAgICAgICAgIC8q IHNob3VsZEludGVycnVwdEphdmFTY3JpcHQgKi8KICAgICAgICAgY3JlYXRlTmV3UGFnZSwKKyAg ICAgICAgbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQsCiAgICAgfTsKIAogICAgIFdLUGFnZVNldFBh Z2VVSUNsaWVudChXS1ZpZXdHZXRQYWdlKG1fd2ViVmlldyksICZ1aUNsaWVudCk7CkluZGV4OiBU b29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAkocmV2aXNpb24gOTUzMTAp CisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTU3LDcgKzE1Nyw3IEBAIFdLUGFnZVJlZiBUZXN0Q29udHJvbGxlcjo6Y3JlYXRl T3RoZXJQYWcKICAgICAgICAgMCwgLy8gcnVuSmF2YVNjcmlwdENvbmZpcm0KICAgICAgICAgMCwg Ly8gcnVuSmF2YVNjcmlwdFByb21wdAogICAgICAgICAwLCAvLyBzZXRTdGF0dXNUZXh0Ci0gICAg ICAgIDAsIC8vIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50CisgICAgICAgIDAsIC8vIG1vdXNlRGlk TW92ZU92ZXJFbGVtZW50X2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjAKICAgICAgICAgMCwgLy8gbWlz c2luZ1BsdWdpbkJ1dHRvbkNsaWNrZWQKICAgICAgICAgMCwgLy8gZGlkTm90SGFuZGxlS2V5RXZl bnQKICAgICAgICAgMCwgLy8gZGlkTm90SGFuZGxlV2hlZWxFdmVudApAQCAtMTg3LDYgKzE4Nyw3 IEBAIFdLUGFnZVJlZiBUZXN0Q29udHJvbGxlcjo6Y3JlYXRlT3RoZXJQYWcKICAgICAgICAgMCwg Ly8gc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcgogICAgICAgICAwLCAvLyBzaG91bGRJ bnRlcnJ1cHRKYXZhU2NyaXB0CiAgICAgICAgIGNyZWF0ZU90aGVyUGFnZSwKKyAgICAgICAgMCwg Ly8gbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQKICAgICB9OwogICAgIFdLUGFnZVNldFBhZ2VVSUNs aWVudChuZXdQYWdlLCAmb3RoZXJQYWdlVUlDbGllbnQpOwogCkBAIC0zMDEsNyArMzAyLDcgQEAg dm9pZCBUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZShpbnQgYXJnYwogICAgICAgICAwLCAvLyBy dW5KYXZhU2NyaXB0Q29uZmlybQogICAgICAgICAwLCAvLyBydW5KYXZhU2NyaXB0UHJvbXB0CiAg ICAgICAgIDAsIC8vIHNldFN0YXR1c1RleHQKLSAgICAgICAgMCwgLy8gbW91c2VEaWRNb3ZlT3Zl ckVsZW1lbnQKKyAgICAgICAgMCwgLy8gbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnRfZGVwcmVjYXRl ZEZvclVzZVdpdGhWMAogICAgICAgICAwLCAvLyBtaXNzaW5nUGx1Z2luQnV0dG9uQ2xpY2tlZAog ICAgICAgICAwLCAvLyBkaWROb3RIYW5kbGVLZXlFdmVudAogICAgICAgICAwLCAvLyBkaWROb3RI YW5kbGVXaGVlbEV2ZW50CkBAIC0zMzEsNiArMzMyLDcgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6 aW5pdGlhbGl6ZShpbnQgYXJnYwogICAgICAgICAwLCAvLyBzYXZlRGF0YVRvRmlsZUluRG93bmxv YWRzRm9sZGVyCiAgICAgICAgIDAsIC8vIHNob3VsZEludGVycnVwdEphdmFTY3JpcHQKICAgICAg ICAgY3JlYXRlT3RoZXJQYWdlLAorICAgICAgICAwLCAvLyBtb3VzZURpZE1vdmVPdmVyRWxlbWVu dAogICAgIH07CiAgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KG1fbWFpbldlYlZpZXctPnBhZ2Uo KSwgJnBhZ2VVSUNsaWVudCk7CiAK