188942 2018-08-24 21:20:24 -0700 Transition WKBrowsingContextController from WKPageLoaderClient to WKPageNavigationClient 2018-08-27 09:17:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen aestes webkit-bug-importer oldest_to_newest 1453661 0 achristensen 2018-08-24 21:20:24 -0700 Transition WKBrowsingContextController from WKPageLoaderClient to WKPageNavigationClient 1453662 1 348073 achristensen 2018-08-24 21:21:50 -0700 Created attachment 348073 Patch 1453665 2 348073 achristensen 2018-08-24 21:24:29 -0700 Comment on attachment 348073 Patch Note: I'm deprecating callbacks that are unused. 1453904 3 achristensen 2018-08-27 09:16:24 -0700 http://trac.webkit.org/r235368 1453905 4 webkit-bug-importer 2018-08-27 09:17:21 -0700 <rdar://problem/43756248> 348073 2018-08-24 21:21:50 -0700 2018-08-27 09:14:42 -0700 Patch bug-188942-20180824212150.patch text/plain 13963 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzUzMzgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE4LTA4LTI0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVHJhbnNpdGlvbiBX S0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgZnJvbSBXS1BhZ2VMb2FkZXJDbGllbnQgdG8gV0tQ YWdlTmF2aWdhdGlvbkNsaWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTg4OTQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJv bGxlci5tbToKKyAgICAgICAgKGRpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uKToKKyAgICAg ICAgKGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTmF2aWdhdGlvbik6Cisg ICAgICAgIChkaWRGYWlsUHJvdmlzaW9uYWxOYXZpZ2F0aW9uKToKKyAgICAgICAgKGRpZENvbW1p dE5hdmlnYXRpb24pOgorICAgICAgICAoZGlkRmluaXNoTmF2aWdhdGlvbik6CisgICAgICAgIChk aWRGYWlsTmF2aWdhdGlvbik6CisgICAgICAgIChjYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVj dGlvblNwYWNlKToKKyAgICAgICAgKGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSk6 CisgICAgICAgIChzZXRVcFBhZ2VMb2FkZXJDbGllbnQpOgorICAgICAgICAoLVtXS0Jyb3dzaW5n Q29udGV4dENvbnRyb2xsZXIgc2V0TG9hZERlbGVnYXRlOl0pOgorICAgICAgICAoZGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChkaWRSZWNlaXZlU2Vy dmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSk6IERlbGV0ZWQuCisgICAgICAg IChkaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUpOiBEZWxldGVkLgorICAg ICAgICAoZGlkQ29tbWl0TG9hZEZvckZyYW1lKTogRGVsZXRlZC4KKyAgICAgICAgKGRpZEZpbmlz aExvYWRGb3JGcmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChkaWRGYWlsTG9hZFdpdGhFcnJvckZv ckZyYW1lKTogRGVsZXRlZC4KKyAgICAgICAgKGNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0 aW9uU3BhY2VJbkZyYW1lKTogRGVsZXRlZC4KKyAgICAgICAgKGRpZFJlY2VpdmVBdXRoZW50aWNh dGlvbkNoYWxsZW5nZUluRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAoZGlkU3RhcnRQcm9ncmVz cyk6IERlbGV0ZWQuCisgICAgICAgIChkaWRDaGFuZ2VQcm9ncmVzcyk6IERlbGV0ZWQuCisgICAg ICAgIChkaWRGaW5pc2hQcm9ncmVzcyk6IERlbGV0ZWQuCisgICAgICAgIChkaWRDaGFuZ2VCYWNr Rm9yd2FyZExpc3QpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tC cm93c2luZ0NvbnRleHRMb2FkRGVsZWdhdGUuaDoKKwogMjAxOC0wOC0yMyAgSmVmZiBNaWxsZXIg IDxqZWZmbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIC1bV0tOYXZpZ2F0aW9uRGVsZWdh dGUgX3dlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yUGx1Z2luTG9hZFdpdGhDdXJyZW50UG9saWN5OnBs dWdpbkluZm86dW5hdmFpbGFiaWxpdHlEZXNjcmlwdGlvbjpdCkluZGV4OiBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29u dGV4dENvbnRyb2xsZXIubW0JKHJldmlzaW9uIDIzNTMzMSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIubW0JKHdvcmtpbmcg Y29weSkKQEAgLTMyMCwxMSArMzIwLDggQEAgLSAodm9pZClzZXRQYWdlWm9vbTooQ0dGbG9hdClw YWdlWm9vbQogICAgIF9wYWdlLT5zZXRQYWdlWm9vbUZhY3RvcihwYWdlWm9vbSk7CiB9CiAKLXN0 YXRpYyB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2Us IFdLRnJhbWVSZWYgZnJhbWUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50 SW5mbykKK3N0YXRpYyB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uKFdLUGFnZVJl ZiBwYWdlLCBXS05hdmlnYXRpb25SZWYsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCog Y2xpZW50SW5mbykKIHsKLSAgICBpZiAoIVdLRnJhbWVJc01haW5GcmFtZShmcmFtZSkpCi0gICAg ICAgIHJldHVybjsKLQogICAgIGF1dG8gYnJvd3NpbmdDb250ZXh0ID0gKF9fYnJpZGdlIFdLQnJv d3NpbmdDb250ZXh0Q29udHJvbGxlciAqKWNsaWVudEluZm87CiAgICAgYXV0byBsb2FkRGVsZWdh dGUgPSBicm93c2luZ0NvbnRleHQtPl9sb2FkRGVsZWdhdGUuZ2V0KCk7CiAKQEAgLTMzMiwxMSAr MzI5LDggQEAgc3RhdGljIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcgogICAgICAg ICBbbG9hZERlbGVnYXRlIGJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJEaWRTdGFydFByb3Zpc2lv bmFsTG9hZDpicm93c2luZ0NvbnRleHRdOwogfQogCi1zdGF0aWMgdm9pZCBkaWRSZWNlaXZlU2Vy dmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tG cmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZv KQorc3RhdGljIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxOYXZp Z2F0aW9uKFdLUGFnZVJlZiBwYWdlLCBXS05hdmlnYXRpb25SZWYsIFdLVHlwZVJlZiB1c2VyRGF0 YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKLSAgICBpZiAoIVdLRnJhbWVJc01haW5GcmFt ZShmcmFtZSkpCi0gICAgICAgIHJldHVybjsKLQogICAgIGF1dG8gYnJvd3NpbmdDb250ZXh0ID0g KF9fYnJpZGdlIFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqKWNsaWVudEluZm87CiAgICAg YXV0byBsb2FkRGVsZWdhdGUgPSBicm93c2luZ0NvbnRleHQtPl9sb2FkRGVsZWdhdGUuZ2V0KCk7 CiAKQEAgLTM0NCwxMSArMzM4LDggQEAgc3RhdGljIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGly ZWN0Rm9yUAogICAgICAgICBbbG9hZERlbGVnYXRlIGJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJE aWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWQ6YnJvd3NpbmdDb250ZXh0 XTsKIH0KIAotc3RhdGljIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZy YW1lKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0Vycm9yUmVmIGVycm9yLCBX S1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCitzdGF0aWMgdm9pZCBk aWRGYWlsUHJvdmlzaW9uYWxOYXZpZ2F0aW9uKFdLUGFnZVJlZiBwYWdlLCBXS05hdmlnYXRpb25S ZWYsIFdLRXJyb3JSZWYgZXJyb3IsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xp ZW50SW5mbykKIHsKLSAgICBpZiAoIVdLRnJhbWVJc01haW5GcmFtZShmcmFtZSkpCi0gICAgICAg IHJldHVybjsKLQogICAgIGF1dG8gYnJvd3NpbmdDb250ZXh0ID0gKF9fYnJpZGdlIFdLQnJvd3Np bmdDb250ZXh0Q29udHJvbGxlciAqKWNsaWVudEluZm87CiAgICAgYXV0byBsb2FkRGVsZWdhdGUg PSBicm93c2luZ0NvbnRleHQtPl9sb2FkRGVsZWdhdGUuZ2V0KCk7CiAKQEAgLTM1NiwxMSArMzQ3 LDggQEAgc3RhdGljIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcgogICAgICAgICBb bG9hZERlbGVnYXRlIGJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXI6YnJvd3NpbmdDb250ZXh0IGRp ZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3I6d3JhcHBlcigqdG9JbXBsKGVycm9yKSldOwog fQogCi1zdGF0aWMgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFdL RnJhbWVSZWYgZnJhbWUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5m bykKK3N0YXRpYyB2b2lkIGRpZENvbW1pdE5hdmlnYXRpb24oV0tQYWdlUmVmIHBhZ2UsIFdLTmF2 aWdhdGlvblJlZiwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQog ewotICAgIGlmICghV0tGcmFtZUlzTWFpbkZyYW1lKGZyYW1lKSkKLSAgICAgICAgcmV0dXJuOwot CiAgICAgYXV0byBicm93c2luZ0NvbnRleHQgPSAoX19icmlkZ2UgV0tCcm93c2luZ0NvbnRleHRD b250cm9sbGVyICopY2xpZW50SW5mbzsKICAgICBhdXRvIGxvYWREZWxlZ2F0ZSA9IGJyb3dzaW5n Q29udGV4dC0+X2xvYWREZWxlZ2F0ZS5nZXQoKTsKIApAQCAtMzY4LDExICszNTYsOCBAQCBzdGF0 aWMgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUoV0tQYWdlCiAgICAgICAgIFtsb2FkRGVsZWdh dGUgYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckRpZENvbW1pdExvYWQ6YnJvd3NpbmdDb250ZXh0 XTsKIH0KIAotc3RhdGljIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKFdLUGFnZVJlZiBwYWdl LCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVu dEluZm8pCitzdGF0aWMgdm9pZCBkaWRGaW5pc2hOYXZpZ2F0aW9uKFdLUGFnZVJlZiBwYWdlLCBX S05hdmlnYXRpb25SZWYsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5m bykKIHsKLSAgICBpZiAoIVdLRnJhbWVJc01haW5GcmFtZShmcmFtZSkpCi0gICAgICAgIHJldHVy bjsKLQogICAgIGF1dG8gYnJvd3NpbmdDb250ZXh0ID0gKF9fYnJpZGdlIFdLQnJvd3NpbmdDb250 ZXh0Q29udHJvbGxlciAqKWNsaWVudEluZm87CiAgICAgYXV0byBsb2FkRGVsZWdhdGUgPSBicm93 c2luZ0NvbnRleHQtPl9sb2FkRGVsZWdhdGUuZ2V0KCk7CiAKQEAgLTM4MCwxMSArMzY1LDggQEAg c3RhdGljIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKFdLUGFnZQogICAgICAgICBbbG9hZERl bGVnYXRlIGJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJEaWRGaW5pc2hMb2FkOmJyb3dzaW5nQ29u dGV4dF07CiB9CiAKLXN0YXRpYyB2b2lkIGRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoV0tQ YWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLRXJyb3JSZWYgZXJyb3IsIFdLVHlwZVJl ZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3N0YXRpYyB2b2lkIGRpZEZhaWxO YXZpZ2F0aW9uKFdLUGFnZVJlZiBwYWdlLCBXS05hdmlnYXRpb25SZWYsIFdLRXJyb3JSZWYgZXJy b3IsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKLSAgICBp ZiAoIVdLRnJhbWVJc01haW5GcmFtZShmcmFtZSkpCi0gICAgICAgIHJldHVybjsKLQogICAgIGF1 dG8gYnJvd3NpbmdDb250ZXh0ID0gKF9fYnJpZGdlIFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ciAqKWNsaWVudEluZm87CiAgICAgYXV0byBsb2FkRGVsZWdhdGUgPSBicm93c2luZ0NvbnRleHQt Pl9sb2FkRGVsZWdhdGUuZ2V0KCk7CiAKQEAgLTM5Miw3ICszNzQsNyBAQCBzdGF0aWMgdm9pZCBk aWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lCiAgICAgICAgIFtsb2FkRGVsZWdhdGUgYnJvd3Np bmdDb250ZXh0Q29udHJvbGxlcjpicm93c2luZ0NvbnRleHQgZGlkRmFpbExvYWRXaXRoRXJyb3I6 d3JhcHBlcigqdG9JbXBsKGVycm9yKSldOwogfQogCi1zdGF0aWMgYm9vbCBjYW5BdXRoZW50aWNh dGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlSW5GcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJl ZiBmcmFtZSwgV0tQcm90ZWN0aW9uU3BhY2VSZWYgcHJvdGVjdGlvblNwYWNlLCBjb25zdCB2b2lk ICpjbGllbnRJbmZvKQorc3RhdGljIGJvb2wgY2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rp b25TcGFjZShXS1BhZ2VSZWYgcGFnZSwgV0tQcm90ZWN0aW9uU3BhY2VSZWYgcHJvdGVjdGlvblNw YWNlLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKQogewogICAgIGF1dG8gYnJvd3NpbmdDb250ZXh0 ID0gKF9fYnJpZGdlIFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqKWNsaWVudEluZm87CiAg ICAgYXV0byBsb2FkRGVsZWdhdGUgPSBicm93c2luZ0NvbnRleHQtPl9sb2FkRGVsZWdhdGUuZ2V0 KCk7CkBAIC00MDMsNyArMzg1LDcgQEAgc3RhdGljIGJvb2wgY2FuQXV0aGVudGljYXRlQWdhaW5z dFByb3RlYwogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIHZvaWQgZGlkUmVjZWl2ZUF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlSW5GcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBm cmFtZSwgV0tBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVJlZiBhdXRoZW50aWNhdGlvbkNoYWxsZW5n ZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbykKK3N0YXRpYyB2b2lkIGRpZFJlY2VpdmVBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZShXS1BhZ2VSZWYgcGFnZSwgV0tBdXRoZW50aWNhdGlvbkNoYWxsZW5n ZVJlZiBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbykKIHsK ICAgICBhdXRvIGJyb3dzaW5nQ29udGV4dCA9IChfX2JyaWRnZSBXS0Jyb3dzaW5nQ29udGV4dENv bnRyb2xsZXIgKiljbGllbnRJbmZvOwogICAgIGF1dG8gbG9hZERlbGVnYXRlID0gYnJvd3NpbmdD b250ZXh0LT5fbG9hZERlbGVnYXRlLmdldCgpOwpAQCAtNDEyLDQ2ICszOTQsNiBAQCBzdGF0aWMg dm9pZCBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsCiAgICAgICAgIFsoaWQgPFdLQnJvd3Np bmdDb250ZXh0TG9hZERlbGVnYXRlUHJpdmF0ZT4pbG9hZERlbGVnYXRlIGJyb3dzaW5nQ29udGV4 dENvbnRyb2xsZXI6YnJvd3NpbmdDb250ZXh0IGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZTp3cmFwcGVyKCp0b0ltcGwoYXV0aGVudGljYXRpb25DaGFsbGVuZ2UpKV07CiB9CiAKLXN0 YXRpYyB2b2lkIGRpZFN0YXJ0UHJvZ3Jlc3MoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQqIGNs aWVudEluZm8pCi17Ci0gICAgYXV0byBicm93c2luZ0NvbnRleHQgPSAoX19icmlkZ2UgV0tCcm93 c2luZ0NvbnRleHRDb250cm9sbGVyICopY2xpZW50SW5mbzsKLSAgICBhdXRvIGxvYWREZWxlZ2F0 ZSA9IGJyb3dzaW5nQ29udGV4dC0+X2xvYWREZWxlZ2F0ZS5nZXQoKTsKLQotICAgIGlmIChbbG9h ZERlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoYnJvd3NpbmdDb250ZXh0Q29u dHJvbGxlckRpZFN0YXJ0UHJvZ3Jlc3M6KV0pCi0gICAgICAgIFtsb2FkRGVsZWdhdGUgYnJvd3Np bmdDb250ZXh0Q29udHJvbGxlckRpZFN0YXJ0UHJvZ3Jlc3M6YnJvd3NpbmdDb250ZXh0XTsKLX0K LQotc3RhdGljIHZvaWQgZGlkQ2hhbmdlUHJvZ3Jlc3MoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZv aWQqIGNsaWVudEluZm8pCi17Ci0gICAgYXV0byBicm93c2luZ0NvbnRleHQgPSAoX19icmlkZ2Ug V0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICopY2xpZW50SW5mbzsKLSAgICBhdXRvIGxvYWRE ZWxlZ2F0ZSA9IGJyb3dzaW5nQ29udGV4dC0+X2xvYWREZWxlZ2F0ZS5nZXQoKTsKLQotICAgIGlm IChbbG9hZERlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoYnJvd3NpbmdDb250 ZXh0Q29udHJvbGxlcjplc3RpbWF0ZWRQcm9ncmVzc0NoYW5nZWRUbzopXSkKLSAgICAgICAgW2xv YWREZWxlZ2F0ZSBicm93c2luZ0NvbnRleHRDb250cm9sbGVyOmJyb3dzaW5nQ29udGV4dCBlc3Rp bWF0ZWRQcm9ncmVzc0NoYW5nZWRUbzp0b0ltcGwocGFnZSktPmVzdGltYXRlZFByb2dyZXNzKCld OwotfQotCi1zdGF0aWMgdm9pZCBkaWRGaW5pc2hQcm9ncmVzcyhXS1BhZ2VSZWYgcGFnZSwgY29u c3Qgdm9pZCogY2xpZW50SW5mbykKLXsKLSAgICBhdXRvIGJyb3dzaW5nQ29udGV4dCA9IChfX2Jy aWRnZSBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKiljbGllbnRJbmZvOwotICAgIGF1dG8g bG9hZERlbGVnYXRlID0gYnJvd3NpbmdDb250ZXh0LT5fbG9hZERlbGVnYXRlLmdldCgpOwotCi0g ICAgaWYgKFtsb2FkRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihicm93c2lu Z0NvbnRleHRDb250cm9sbGVyRGlkRmluaXNoUHJvZ3Jlc3M6KV0pCi0gICAgICAgIFtsb2FkRGVs ZWdhdGUgYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckRpZEZpbmlzaFByb2dyZXNzOmJyb3dzaW5n Q29udGV4dF07Ci19Ci0KLXN0YXRpYyB2b2lkIGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdChXS1Bh Z2VSZWYgcGFnZSwgV0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGFkZGVkSXRlbSwgV0tBcnJheVJl ZiByZW1vdmVkSXRlbXMsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pCi17Ci0gICAgYXV0byBicm93 c2luZ0NvbnRleHQgPSAoX19icmlkZ2UgV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICopY2xp ZW50SW5mbzsKLSAgICBhdXRvIGxvYWREZWxlZ2F0ZSA9IGJyb3dzaW5nQ29udGV4dC0+X2xvYWRE ZWxlZ2F0ZS5nZXQoKTsKLQotICAgIGlmICghW2xvYWREZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0 b3I6QHNlbGVjdG9yKGJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJEaWRDaGFuZ2VCYWNrRm9yd2Fy ZExpc3Q6YWRkZWRJdGVtOnJlbW92ZWRJdGVtczopXSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg V0tCYWNrRm9yd2FyZExpc3RJdGVtICphZGRlZCA9IGFkZGVkSXRlbSA/IHdyYXBwZXIoKnRvSW1w bChhZGRlZEl0ZW0pKSA6IG5pbDsKLSAgICBOU0FycmF5ICpyZW1vdmVkID0gcmVtb3ZlZEl0ZW1z ID8gd3JhcHBlcigqdG9JbXBsKHJlbW92ZWRJdGVtcykpIDogbmlsOwotICAgIFtsb2FkRGVsZWdh dGUgYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdDpicm93 c2luZ0NvbnRleHQgYWRkZWRJdGVtOmFkZGVkIHJlbW92ZWRJdGVtczpyZW1vdmVkXTsKLX0KLQog c3RhdGljIHZvaWQgcHJvY2Vzc0RpZENyYXNoKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkKiBj bGllbnRJbmZvKQogewogICAgIGF1dG8gYnJvd3NpbmdDb250ZXh0ID0gKF9fYnJpZGdlIFdLQnJv d3NpbmdDb250ZXh0Q29udHJvbGxlciAqKWNsaWVudEluZm87CkBAIC00NjMsMjkgKzQwNSwyMiBA QCBzdGF0aWMgdm9pZCBwcm9jZXNzRGlkQ3Jhc2goV0tQYWdlUmVmIHBhCiAKIHN0YXRpYyB2b2lk IHNldFVwUGFnZUxvYWRlckNsaWVudChXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKmJyb3dz aW5nQ29udGV4dCwgV2ViUGFnZVByb3h5JiBwYWdlKQogewotICAgIFdLUGFnZUxvYWRlckNsaWVu dFY0IGxvYWRlckNsaWVudDsKKyAgICBXS1BhZ2VOYXZpZ2F0aW9uQ2xpZW50VjAgbG9hZGVyQ2xp ZW50OwogICAgIG1lbXNldCgmbG9hZGVyQ2xpZW50LCAwLCBzaXplb2YobG9hZGVyQ2xpZW50KSk7 CiAKLSAgICBsb2FkZXJDbGllbnQuYmFzZS52ZXJzaW9uID0gNDsKKyAgICBsb2FkZXJDbGllbnQu YmFzZS52ZXJzaW9uID0gMDsKICAgICBsb2FkZXJDbGllbnQuYmFzZS5jbGllbnRJbmZvID0gKF9f YnJpZGdlIHZvaWQqKWJyb3dzaW5nQ29udGV4dDsKLSAgICBsb2FkZXJDbGllbnQuZGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZSA9IGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU7 Ci0gICAgbG9hZGVyQ2xpZW50LmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFs TG9hZEZvckZyYW1lID0gZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWU7Ci0gICAgbG9hZGVyQ2xpZW50LmRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJy b3JGb3JGcmFtZSA9IGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZTsKLSAg ICBsb2FkZXJDbGllbnQuZGlkQ29tbWl0TG9hZEZvckZyYW1lID0gZGlkQ29tbWl0TG9hZEZvckZy YW1lOwotICAgIGxvYWRlckNsaWVudC5kaWRGaW5pc2hMb2FkRm9yRnJhbWUgPSBkaWRGaW5pc2hM b2FkRm9yRnJhbWU7Ci0gICAgbG9hZGVyQ2xpZW50LmRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJh bWUgPSBkaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lOwotCi0gICAgbG9hZGVyQ2xpZW50LmNh bkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2VJbkZyYW1lID0gY2FuQXV0aGVudGlj YXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZUluRnJhbWU7Ci0gICAgbG9hZGVyQ2xpZW50LmRpZFJl Y2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJhbWUgPSBkaWRSZWNlaXZlQXV0aGVudGlj YXRpb25DaGFsbGVuZ2VJbkZyYW1lOwotCi0gICAgbG9hZGVyQ2xpZW50LmRpZFN0YXJ0UHJvZ3Jl c3MgPSBkaWRTdGFydFByb2dyZXNzOwotICAgIGxvYWRlckNsaWVudC5kaWRDaGFuZ2VQcm9ncmVz cyA9IGRpZENoYW5nZVByb2dyZXNzOwotICAgIGxvYWRlckNsaWVudC5kaWRGaW5pc2hQcm9ncmVz cyA9IGRpZEZpbmlzaFByb2dyZXNzOwotICAgIGxvYWRlckNsaWVudC5kaWRDaGFuZ2VCYWNrRm9y d2FyZExpc3QgPSBkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3Q7Ci0KLSAgICBsb2FkZXJDbGllbnQu cHJvY2Vzc0RpZENyYXNoID0gcHJvY2Vzc0RpZENyYXNoOworICAgIGxvYWRlckNsaWVudC5kaWRT dGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbiA9IGRpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9u OworICAgIGxvYWRlckNsaWVudC5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25h bE5hdmlnYXRpb24gPSBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbE5hdmln YXRpb247CisgICAgbG9hZGVyQ2xpZW50LmRpZEZhaWxQcm92aXNpb25hbE5hdmlnYXRpb24gPSBk aWRGYWlsUHJvdmlzaW9uYWxOYXZpZ2F0aW9uOworICAgIGxvYWRlckNsaWVudC5kaWRDb21taXRO YXZpZ2F0aW9uID0gZGlkQ29tbWl0TmF2aWdhdGlvbjsKKyAgICBsb2FkZXJDbGllbnQuZGlkRmlu aXNoTmF2aWdhdGlvbiA9IGRpZEZpbmlzaE5hdmlnYXRpb247CisgICAgbG9hZGVyQ2xpZW50LmRp ZEZhaWxOYXZpZ2F0aW9uID0gZGlkRmFpbE5hdmlnYXRpb247CisgICAgbG9hZGVyQ2xpZW50LmNh bkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2UgPSBjYW5BdXRoZW50aWNhdGVBZ2Fp bnN0UHJvdGVjdGlvblNwYWNlOworICAgIGxvYWRlckNsaWVudC5kaWRSZWNlaXZlQXV0aGVudGlj YXRpb25DaGFsbGVuZ2UgPSBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2U7CisgICAg bG9hZGVyQ2xpZW50LndlYlByb2Nlc3NEaWRDcmFzaCA9IHByb2Nlc3NEaWRDcmFzaDsKIAotICAg IFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQodG9BUEkoJnBhZ2UpLCAmbG9hZGVyQ2xpZW50LmJh c2UpOworICAgIFdLUGFnZVNldFBhZ2VOYXZpZ2F0aW9uQ2xpZW50KHRvQVBJKCZwYWdlKSwgJmxv YWRlckNsaWVudC5iYXNlKTsKIH0KIAogc3RhdGljIFdLUG9saWN5RGVjaXNpb25IYW5kbGVyIG1h a2VQb2xpY3lEZWNpc2lvbkJsb2NrKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiBsaXN0ZW5lcikK QEAgLTU5Nyw3ICs1MzIsNyBAQCAtICh2b2lkKXNldExvYWREZWxlZ2F0ZTooaWQgPFdLQnJvd3Np bmdDCiAgICAgaWYgKGxvYWREZWxlZ2F0ZSkKICAgICAgICAgc2V0VXBQYWdlTG9hZGVyQ2xpZW50 KHNlbGYsICpfcGFnZSk7CiAgICAgZWxzZQotICAgICAgICBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xp ZW50KHRvQVBJKF9wYWdlLmdldCgpKSwgbnVsbHB0cik7CisgICAgICAgIFdLUGFnZVNldFBhZ2VO YXZpZ2F0aW9uQ2xpZW50KHRvQVBJKF9wYWdlLmdldCgpKSwgbnVsbHB0cik7CiB9CiAKIC0gKGlk IDxXS0Jyb3dzaW5nQ29udGV4dFBvbGljeURlbGVnYXRlPilwb2xpY3lEZWxlZ2F0ZQpJbmRleDog U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0TG9hZERl bGVnYXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVnYXRlLmgJKHJldmlzaW9uIDIzNTMzMSkKKysrIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dExvYWREZWxl Z2F0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01MywxMSArNTMsMTEgQEAKIC8qIFNlbnQgaWYgdGhl IGNvbW1pdGVkIGxvYWQgZmFpbHMuICovCiAtICh2b2lkKWJyb3dzaW5nQ29udGV4dENvbnRyb2xs ZXI6KFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqKXNlbmRlciBkaWRGYWlsTG9hZFdpdGhF cnJvcjooTlNFcnJvciAqKWVycm9yOwogCi0tICh2b2lkKWJyb3dzaW5nQ29udGV4dENvbnRyb2xs ZXJEaWRTdGFydFByb2dyZXNzOihXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKilzZW5kZXI7 Ci0tICh2b2lkKWJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXI6KFdLQnJvd3NpbmdDb250ZXh0Q29u dHJvbGxlciAqKXNlbmRlciBlc3RpbWF0ZWRQcm9ncmVzc0NoYW5nZWRUbzooZG91YmxlKWVzdGlt YXRlZFByb2dyZXNzOwotLSAodm9pZClicm93c2luZ0NvbnRleHRDb250cm9sbGVyRGlkRmluaXNo UHJvZ3Jlc3M6KFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqKXNlbmRlcjsKKy0gKHZvaWQp YnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckRpZFN0YXJ0UHJvZ3Jlc3M6KFdLQnJvd3NpbmdDb250 ZXh0Q29udHJvbGxlciAqKXNlbmRlciBXS19BUElfREVQUkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5U KCJXS1dlYlZpZXcuZXN0aW1hdGVkUHJvZ3Jlc3MiLCBtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhX S19JT1NfVEJBKSk7CistICh2b2lkKWJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXI6KFdLQnJvd3Np bmdDb250ZXh0Q29udHJvbGxlciAqKXNlbmRlciBlc3RpbWF0ZWRQcm9ncmVzc0NoYW5nZWRUbzoo ZG91YmxlKWVzdGltYXRlZFByb2dyZXNzIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1F TlQoIldLV2ViVmlldy5lc3RpbWF0ZWRQcm9ncmVzcyIsIG1hY29zeChXS19NQUNfVEJBKSwgaW9z KFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckRpZEZpbmlz aFByb2dyZXNzOihXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKilzZW5kZXIgV0tfQVBJX0RF UFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiV0tXZWJWaWV3LmVzdGltYXRlZFByb2dyZXNzIiwg bWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogCi0tICh2b2lkKWJyb3dzaW5n Q29udGV4dENvbnRyb2xsZXJEaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3Q6KFdLQnJvd3NpbmdDb250 ZXh0Q29udHJvbGxlciAqKXNlbmRlciBhZGRlZEl0ZW06KFdLQmFja0ZvcndhcmRMaXN0SXRlbSAq KWFkZGVkSXRlbSByZW1vdmVkSXRlbXM6KE5TQXJyYXkgKilyZW1vdmVkSXRlbXM7CistICh2b2lk KWJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJEaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3Q6KFdLQnJv d3NpbmdDb250ZXh0Q29udHJvbGxlciAqKXNlbmRlciBhZGRlZEl0ZW06KFdLQmFja0ZvcndhcmRM aXN0SXRlbSAqKWFkZGVkSXRlbSByZW1vdmVkSXRlbXM6KE5TQXJyYXkgKilyZW1vdmVkSXRlbXMg V0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiV0tXZWJWaWV3LmJhY2tGb3J3YXJk TGlzdCIsIG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIAogQGVuZAogCg==