8981 2006-05-18 14:32:52 -0700 Move loading-related code out of WebView 2006-05-18 14:52:37 -0700 1 1 1 Unclassified WebKit WebKit Misc. 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 mjs mjs oldest_to_newest 42851 0 mjs 2006-05-18 14:32:52 -0700 WebView has a bunch of methods called from WebLoader which are related to loading and take a WebDataSource argument, but they just call a bunch of WebDataSource methods, so they may as well be on WebDataSource in the first place. 42852 1 8397 mjs 2006-05-18 14:36:45 -0700 Created attachment 8397 do it 42853 2 8397 eric 2006-05-18 14:42:44 -0700 Comment on attachment 8397 do it r=me 8397 2006-05-18 14:36:45 -0700 2006-05-18 14:42:44 -0700 do it loading-fix.patch.txt text/plain 11350 mjs SW5kZXg6IFBsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5TdHJlYW0ubQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBQ bHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luU3RyZWFtLm0JKHJldmlzaW9uIDE0NDY5KQorKysgUGx1 Z2lucy9XZWJOZXRzY2FwZVBsdWdpblN0cmVhbS5tCSh3b3JraW5nIGNvcHkpCkBAIC0xODcsNyAr MTg3LDcgQEAKICAgICBbc2VsZiByZXRhaW5dOwogCiAgICAgW1tzZWxmIGRhdGFTb3VyY2VdIF9y ZW1vdmVQbHVnSW5TdHJlYW1Mb2FkZXI6c2VsZl07Ci0gICAgW1t2aWV3IHdlYlZpZXddIF9maW5p c2hlZExvYWRpbmdSZXNvdXJjZUZyb21EYXRhU291cmNlOltzZWxmIGRhdGFTb3VyY2VdXTsKKyAg ICBbW3NlbGYgZGF0YVNvdXJjZV0gX2ZpbmlzaGVkTG9hZGluZ1Jlc291cmNlXTsKICAgICBbc3Ry ZWFtIGZpbmlzaGVkTG9hZGluZ1dpdGhEYXRhOltzZWxmIHJlc291cmNlRGF0YV1dOwogICAgIFtz dXBlciBkaWRGaW5pc2hMb2FkaW5nXTsKIApAQCAtMjAyLDcgKzIwMiw3IEBACiAgICAgW3NlbGYg cmV0YWluXTsKIAogICAgIFtbc2VsZiBkYXRhU291cmNlXSBfcmVtb3ZlUGx1Z0luU3RyZWFtTG9h ZGVyOnNlbGZdOwotICAgIFtbdmlldyB3ZWJWaWV3XSBfcmVjZWl2ZWRFcnJvcjplcnJvciBmcm9t RGF0YVNvdXJjZTpbc2VsZiBkYXRhU291cmNlXV07CisgICAgW1tzZWxmIGRhdGFTb3VyY2VdIF9y ZWNlaXZlZEVycm9yOmVycm9yXTsKICAgICBbc3RyZWFtIGRlc3Ryb3lTdHJlYW1XaXRoRXJyb3I6 ZXJyb3JdOwogICAgIFtzdXBlciBkaWRGYWlsV2l0aEVycm9yOmVycm9yXTsKIApJbmRleDogV2Vi Q29yZVN1cHBvcnQvV2ViU3VicmVzb3VyY2VMb2FkZXIubQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl U3VwcG9ydC9XZWJTdWJyZXNvdXJjZUxvYWRlci5tCShyZXZpc2lvbiAxNDQ2OSkKKysrIFdlYkNv cmVTdXBwb3J0L1dlYlN1YnJlc291cmNlTG9hZGVyLm0JKHdvcmtpbmcgY29weSkKQEAgLTE0MSw3 ICsxNDEsNyBAQAogCiAtICh2b2lkKXJlY2VpdmVkRXJyb3I6KE5TRXJyb3IgKillcnJvcgogewot ICAgIFtbZGF0YVNvdXJjZSBfd2ViVmlld10gX3JlY2VpdmVkRXJyb3I6ZXJyb3IgZnJvbURhdGFT b3VyY2U6ZGF0YVNvdXJjZV07CisgICAgW2RhdGFTb3VyY2UgX3JlY2VpdmVkRXJyb3I6ZXJyb3Jd OwogfQogCiAtIChOU1VSTFJlcXVlc3QgKil3aWxsU2VuZFJlcXVlc3Q6KE5TVVJMUmVxdWVzdCAq KW5ld1JlcXVlc3QgcmVkaXJlY3RSZXNwb25zZTooTlNVUkxSZXNwb25zZSAqKXJlZGlyZWN0UmVz cG9uc2U7CkBAIC0yMTAsNyArMjEwLDcgQEAKIC0gKHZvaWQpc2lnbmFsRmluaXNoCiB7CiAgICAg W2RhdGFTb3VyY2UgX3JlbW92ZVN1YnJlc291cmNlTG9hZGVyOnNlbGZdOwotICAgIFtbZGF0YVNv dXJjZSBfd2ViVmlld10gX2ZpbmlzaGVkTG9hZGluZ1Jlc291cmNlRnJvbURhdGFTb3VyY2U6ZGF0 YVNvdXJjZV07CisgICAgW2RhdGFTb3VyY2UgX2ZpbmlzaGVkTG9hZGluZ1Jlc291cmNlXTsKICAg ICBbc3VwZXIgc2lnbmFsRmluaXNoXTsKIH0KIApJbmRleDogQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIENoYW5nZUxvZwkocmV2aXNpb24gMTQ0NzIpCisrKyBDaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwzMSBAQAorMjAwNi0wNS0xOCAgTWFjaWVqIFN0YWNob3dpYWsgIDxtanNA YXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAg ICAKKyAgICAgICAgLSByZW1vdmUgbG9hZGluZy1yZWxhdGVkIGNvZGUgZnJvbSBXZWJWaWV3CisK KyAgICAgICAgKiBQbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luU3RyZWFtLm06CisgICAgICAgICgt W1dlYk5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyIGRpZEZpbmlzaExvYWRpbmddKToKKyAgICAg ICAgKC1bV2ViTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIgZGlkRmFpbFdpdGhFcnJvcjpdKToK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJTdWJyZXNvdXJjZUxvYWRlci5tOgorICAgICAg ICAoLVtXZWJTdWJyZXNvdXJjZUxvYWRlciByZWNlaXZlZEVycm9yOl0pOgorICAgICAgICAoLVtX ZWJTdWJyZXNvdXJjZUxvYWRlciBzaWduYWxGaW5pc2hdKToKKyAgICAgICAgKiBXZWJWaWV3L1dl YkRhdGFTb3VyY2UubToKKyAgICAgICAgKC1bV2ViRGF0YVNvdXJjZSBfc3RvcExvYWRpbmddKToK KyAgICAgICAgKC1bV2ViRGF0YVNvdXJjZSBfcmVjZWl2ZWRNYWluUmVzb3VyY2VFcnJvcjpjb21w bGV0ZTpdKToKKyAgICAgICAgKC1bV2ViRGF0YVNvdXJjZSBfZmluaXNoZWRMb2FkaW5nUmVzb3Vy Y2VdKToKKyAgICAgICAgKC1bV2ViRGF0YVNvdXJjZSBfbWFpblJlY2VpdmVkQnl0ZXNTb0Zhcjpj b21wbGV0ZTpdKToKKyAgICAgICAgKC1bV2ViRGF0YVNvdXJjZSBfcmVjZWl2ZWRFcnJvcjpdKToK KyAgICAgICAgKC1bV2ViRGF0YVNvdXJjZSBfbWFpblJlY2VpdmVkRXJyb3I6Y29tcGxldGU6XSk6 CisgICAgICAgICogV2ViVmlldy9XZWJEYXRhU291cmNlSW50ZXJuYWwuaDoKKyAgICAgICAgKiBX ZWJWaWV3L1dlYkZyYW1lLm06CisgICAgICAgICgtW1dlYkZyYW1lIF9zZW5kUmVtYWluaW5nRGVs ZWdhdGVNZXNzYWdlc1dpdGhJZGVudGlmaWVyOnJlc3BvbnNlOmxlbmd0aDplcnJvcjpdKToKKyAg ICAgICAgKiBXZWJWaWV3L1dlYk1haW5SZXNvdXJjZUxvYWRlci5tOgorICAgICAgICAoLVtXZWJN YWluUmVzb3VyY2VMb2FkZXIgZGlkUmVjZWl2ZURhdGE6bGVuZ3RoUmVjZWl2ZWQ6XSk6CisgICAg ICAgICgtW1dlYk1haW5SZXNvdXJjZUxvYWRlciBkaWRGaW5pc2hMb2FkaW5nXSk6CisgICAgICAg ICogV2ViVmlldy9XZWJWaWV3Lm06CisgICAgICAgICogV2ViVmlldy9XZWJWaWV3SW50ZXJuYWwu aDoKKwogMjAwNi0wNS0xNyAgVGltIE9tZXJuaWNrICA8dGltb0BhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgS2V2aW4gRGVja2VyIGFuZCBKb2huIFN1bGxpdmFuLgpJbmRleDogV2Vi Vmlldy9XZWJWaWV3SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJWaWV3L1dlYlZpZXdJbnRl cm5hbC5oCShyZXZpc2lvbiAxNDQ2OSkKKysrIFdlYlZpZXcvV2ViVmlld0ludGVybmFsLmgJKHdv cmtpbmcgY29weSkKQEAgLTYyLDE5ICs2MiwxNSBAQAogLSAoaWQpX2VkaXRpbmdEZWxlZ2F0ZUZv cndhcmRlcjsKIC0gKGlkKV9wb2xpY3lEZWxlZ2F0ZUZvcndhcmRlcjsKIC0gKGlkKV9zY3JpcHRE ZWJ1Z0RlbGVnYXRlRm9yd2FyZGVyOwotLSAodm9pZClfZmluaXNoZWRMb2FkaW5nUmVzb3VyY2VG cm9tRGF0YVNvdXJjZTooV2ViRGF0YVNvdXJjZSAqKWRhdGFTb3VyY2U7Ci0tICh2b2lkKV9yZWNl aXZlZEVycm9yOihOU0Vycm9yICopZXJyb3IgZnJvbURhdGFTb3VyY2U6KFdlYkRhdGFTb3VyY2Ug KilkYXRhU291cmNlOwogLSAoV2ViQ29yZVNldHRpbmdzICopX3NldHRpbmdzOwogLSAodm9pZClf cHVzaFBlcmZvcm1pbmdQcm9ncmFtbWF0aWNGb2N1czsKIC0gKHZvaWQpX3BvcFBlcmZvcm1pbmdQ cm9ncmFtbWF0aWNGb2N1czsKIC0gKHZvaWQpX2luY3JlbWVudFByb2dyZXNzRm9yQ29ubmVjdGlv bkRlbGVnYXRlOihpZCljb25uZWN0aW9uRGVsZWdhdGUgcmVzcG9uc2U6KE5TVVJMUmVzcG9uc2Ug KilyZXNwb25zZTsKIC0gKHZvaWQpX2luY3JlbWVudFByb2dyZXNzRm9yQ29ubmVjdGlvbkRlbGVn YXRlOihpZCljb25uZWN0aW9uRGVsZWdhdGUgZGF0YTooTlNEYXRhICopZGF0YVNvdXJjZTsKIC0g KHZvaWQpX2NvbXBsZXRlUHJvZ3Jlc3NGb3JDb25uZWN0aW9uRGVsZWdhdGU6KGlkKWNvbm5lY3Rp b25EZWxlZ2F0ZTsKLS0gKHZvaWQpX21haW5SZWNlaXZlZEJ5dGVzU29GYXI6KHVuc2lnbmVkKWJ5 dGVzU29GYXIgZnJvbURhdGFTb3VyY2U6KFdlYkRhdGFTb3VyY2UgKilkYXRhU291cmNlIGNvbXBs ZXRlOihCT09MKWlzQ29tcGxldGU7CiAtICh2b2lkKV9wcm9ncmVzc1N0YXJ0ZWQ6KFdlYkZyYW1l ICopZnJhbWU7CiAtICh2b2lkKV9kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOihXZWJG cmFtZSAqKWZyYW1lOwogKyAoQk9PTClfdmlld0NsYXNzOihDbGFzcyAqKXZDbGFzcyBhbmRSZXBy ZXNlbnRhdGlvbkNsYXNzOihDbGFzcyAqKXJDbGFzcyBmb3JNSU1FVHlwZTooTlNTdHJpbmcgKilN SU1FVHlwZTsKLS0gKHZvaWQpX21haW5SZWNlaXZlZEVycm9yOihOU0Vycm9yICopZXJyb3IgZnJv bURhdGFTb3VyY2U6KFdlYkRhdGFTb3VyY2UgKilkYXRhU291cmNlIGNvbXBsZXRlOihCT09MKWlz Q29tcGxldGU7CiArIChOU1N0cmluZyAqKV9NSU1FVHlwZUZvckZpbGU6KE5TU3RyaW5nICopcGF0 aDsKIC0gKHZvaWQpX2Rvd25sb2FkVVJMOihOU1VSTCAqKVVSTDsKICsgKE5TU3RyaW5nICopX2dl bmVyYXRlZE1JTUVUeXBlRm9yVVJMU2NoZW1lOihOU1N0cmluZyAqKVVSTFNjaGVtZTsKSW5kZXg6 IFdlYlZpZXcvV2ViRGF0YVNvdXJjZUludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViVmlldy9X ZWJEYXRhU291cmNlSW50ZXJuYWwuaAkocmV2aXNpb24gMTQ0NjkpCisrKyBXZWJWaWV3L1dlYkRh dGFTb3VyY2VJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDQsNSArMTA0LDkgQEAKIC0g KHZvaWQpX3N0YXJ0TG9hZGluZzsKIC0gKHZvaWQpX2xvYWRGcm9tUGFnZUNhY2hlOihOU0RpY3Rp b25hcnkgKilwYWdlQ2FjaGU7CiAtIChET01FbGVtZW50ICopX2ltYWdlRWxlbWVudFdpdGhJbWFn ZVJlc291cmNlOihXZWJSZXNvdXJjZSAqKXJlc291cmNlOworLSAodm9pZClfZmluaXNoZWRMb2Fk aW5nUmVzb3VyY2U7CistICh2b2lkKV9tYWluUmVjZWl2ZWRCeXRlc1NvRmFyOih1bnNpZ25lZCli eXRlc1NvRmFyIGNvbXBsZXRlOihCT09MKWlzQ29tcGxldGU7CistICh2b2lkKV9yZWNlaXZlZEVy cm9yOihOU0Vycm9yICopZXJyb3I7CistICh2b2lkKV9tYWluUmVjZWl2ZWRFcnJvcjooTlNFcnJv ciAqKWVycm9yIGNvbXBsZXRlOihCT09MKWlzQ29tcGxldGU7CiAKIEBlbmQKSW5kZXg6IFdlYlZp ZXcvV2ViTWFpblJlc291cmNlTG9hZGVyLm0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViVmlldy9XZWJNYWlu UmVzb3VyY2VMb2FkZXIubQkocmV2aXNpb24gMTQ0NjkpCisrKyBXZWJWaWV3L1dlYk1haW5SZXNv dXJjZUxvYWRlci5tCSh3b3JraW5nIGNvcHkpCkBAIC0zNzksOSArMzc5LDcgQEAKICAgICAvLyBy ZXRhaW4vcmVsZWFzZSBzZWxmIGluIHRoaXMgZGVsZWdhdGUgbWV0aG9kIHNpbmNlIHRoZSBhZGRp dGlvbmFsIHByb2Nlc3NpbmcgY2FuIGRvCiAgICAgLy8gYW55dGhpbmcgaW5jbHVkaW5nIHBvc3Np Ymx5IHJlbGVhc2luZyBzZWxmOyBvbmUgZXhhbXBsZSBvZiB0aGlzIGlzIDMyNjYyMTYKICAgICBb c2VsZiByZXRhaW5dOwotICAgIFtbZGF0YVNvdXJjZSBfd2ViVmlld10gX21haW5SZWNlaXZlZEJ5 dGVzU29GYXI6X2J5dGVzUmVjZWl2ZWQKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGZyb21EYXRhU291cmNlOmRhdGFTb3VyY2UKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbXBsZXRlOk5PXTsKKyAgICBbZGF0YVNvdXJjZSBfbWFp blJlY2VpdmVkQnl0ZXNTb0ZhcjpfYnl0ZXNSZWNlaXZlZCBjb21wbGV0ZTpOT107CiAgICAgCiAg ICAgW3N1cGVyIGRpZFJlY2VpdmVEYXRhOmRhdGEgbGVuZ3RoUmVjZWl2ZWQ6bGVuZ3RoUmVjZWl2 ZWRdOwogICAgIF9ieXRlc1JlY2VpdmVkICs9IFtkYXRhIGxlbmd0aF07CkBAIC00MDEsOSArMzk5 LDcgQEAKICAgICBbc2VsZiByZXRhaW5dOwogCiAgICAgW2RhdGFTb3VyY2UgX2ZpbmlzaGVkTG9h ZGluZ107Ci0gICAgW1tkYXRhU291cmNlIF93ZWJWaWV3XSBfbWFpblJlY2VpdmVkQnl0ZXNTb0Zh cjpfYnl0ZXNSZWNlaXZlZAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZnJv bURhdGFTb3VyY2U6ZGF0YVNvdXJjZQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb21wbGV0ZTpZRVNdOworICAgIFtkYXRhU291cmNlIF9tYWluUmVjZWl2ZWRC eXRlc1NvRmFyOl9ieXRlc1JlY2VpdmVkIGNvbXBsZXRlOllFU107CiAgICAgW3N1cGVyIGRpZEZp bmlzaExvYWRpbmddOwogCiAgICAgW3NlbGYgcmVsZWFzZV07CkluZGV4OiBXZWJWaWV3L1dlYlZp ZXcubQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJWaWV3L1dlYlZpZXcubQkocmV2aXNpb24gMTQ0NjkpCisr KyBXZWJWaWV3L1dlYlZpZXcubQkod29ya2luZyBjb3B5KQpAQCAtNTYzLDU2ICs1NjMsNiBAQCBz dGF0aWMgYm9vbCBkZWJ1Z1dpZGdldCA9IHRydWU7CiAgICAgfQogfQogCi0tICh2b2lkKV9maW5p c2hlZExvYWRpbmdSZXNvdXJjZUZyb21EYXRhU291cmNlOihXZWJEYXRhU291cmNlICopZGF0YVNv dXJjZQotewotICAgIFdlYkZyYW1lICpmcmFtZSA9IFtkYXRhU291cmNlIHdlYkZyYW1lXTsKLSAg ICAKLSAgICBBU1NFUlQoZGF0YVNvdXJjZSAhPSBuaWwpOwotICAgIAotICAgIC8vIFRoaXMgcmVz b3VyY2UgaGFzIGNvbXBsZXRlZCwgc28gY2hlY2sgaWYgdGhlIGxvYWQgaXMgY29tcGxldGUgZm9y IGFsbCBmcmFtZXMuCi0gICAgaWYgKGZyYW1lICE9IG5pbCkKLSAgICAgICAgW2ZyYW1lIF9jaGVj a0xvYWRDb21wbGV0ZV07Ci19Ci0KLS0gKHZvaWQpX21haW5SZWNlaXZlZEJ5dGVzU29GYXI6KHVu c2lnbmVkKWJ5dGVzU29GYXIgZnJvbURhdGFTb3VyY2U6KFdlYkRhdGFTb3VyY2UgKilkYXRhU291 cmNlIGNvbXBsZXRlOiAoQk9PTClpc0NvbXBsZXRlCi17Ci0gICAgV2ViRnJhbWUgKmZyYW1lID0g W2RhdGFTb3VyY2Ugd2ViRnJhbWVdOwotICAgIAotICAgIEFTU0VSVChkYXRhU291cmNlICE9IG5p bCk7Ci0KLSAgICAvLyBUaGUgZnJhbWUgbWF5IGJlIG5pbCBpZiBhIHByZXZpb3VzbHkgY2FuY2Vs bGVkIGxvYWQgaXMgc3RpbGwgbWFraW5nIHByb2dyZXNzIGNhbGxiYWNrcy4KLSAgICBpZiAoZnJh bWUgPT0gbmlsKQotICAgICAgICByZXR1cm47Ci0gICAgICAgIAotICAgIC8vIFRoaXMgcmVzb3Vy Y2UgaGFzIGNvbXBsZXRlZCwgc28gY2hlY2sgaWYgdGhlIGxvYWQgaXMgY29tcGxldGUgZm9yIHRo aXMgZnJhbWUgYW5kIGl0cyBhbmNlc3RvcnMKLSAgICBpZiAoaXNDb21wbGV0ZSl7Ci0gICAgICAg IC8vIElmIHRoZSBsb2FkIGlzIGNvbXBsZXRlLCBtYXJrIHRoZSBwcmltYXJ5IGxvYWQgYXMgZG9u ZS4gIFRoZSBwcmltYXJ5IGxvYWQgaXMgdGhlIGxvYWQKLSAgICAgICAgLy8gb2YgdGhlIG1haW4g ZG9jdW1lbnQuICBPdGhlciByZXNvdXJjZXMgbWF5IHN0aWxsIGJlIGFycml2aW5nLgotICAgICAg ICBbZGF0YVNvdXJjZSBfc2V0UHJpbWFyeUxvYWRDb21wbGV0ZTpZRVNdOwotICAgICAgICBbZnJh bWUgX2NoZWNrTG9hZENvbXBsZXRlXTsKLSAgICB9Ci19Ci0KLS0gKHZvaWQpX3JlY2VpdmVkRXJy b3I6KE5TRXJyb3IgKillcnJvciBmcm9tRGF0YVNvdXJjZTooV2ViRGF0YVNvdXJjZSAqKWRhdGFT b3VyY2UKLXsKLSAgICBXZWJGcmFtZSAqZnJhbWUgPSBbZGF0YVNvdXJjZSB3ZWJGcmFtZV07Ci0K LSAgICBbZnJhbWUgX2NoZWNrTG9hZENvbXBsZXRlXTsKLX0KLQotLSAodm9pZClfbWFpblJlY2Vp dmVkRXJyb3I6KE5TRXJyb3IgKillcnJvciBmcm9tRGF0YVNvdXJjZTooV2ViRGF0YVNvdXJjZSAq KWRhdGFTb3VyY2UgY29tcGxldGU6KEJPT0wpaXNDb21wbGV0ZQotewotICAgIEFTU0VSVChkYXRh U291cmNlKTsKLSAgICBBU1NFUlQoW2RhdGFTb3VyY2Ugd2ViRnJhbWVdKTsKLSAgICAKLSAgICBb ZGF0YVNvdXJjZSBfc2V0TWFpbkRvY3VtZW50RXJyb3I6IGVycm9yXTsKLQotICAgIGlmIChpc0Nv bXBsZXRlKSB7Ci0gICAgICAgIFtkYXRhU291cmNlIF9zZXRQcmltYXJ5TG9hZENvbXBsZXRlOllF U107Ci0gICAgICAgIFtbZGF0YVNvdXJjZSB3ZWJGcmFtZV0gX2NoZWNrTG9hZENvbXBsZXRlXTsK LSAgICB9Ci19Ci0KICsgKE5TU3RyaW5nICopX01JTUVUeXBlRm9yRmlsZTooTlNTdHJpbmcgKilw YXRoCiB7CiAgICAgTlNTdHJpbmcgKmV4dGVuc2lvbiA9IFtwYXRoIHBhdGhFeHRlbnNpb25dOwpJ bmRleDogV2ViVmlldy9XZWJGcmFtZS5tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYlZpZXcvV2ViRnJhbWUu bQkocmV2aXNpb24gMTQ0NjkpCisrKyBXZWJWaWV3L1dlYkZyYW1lLm0JKHdvcmtpbmcgY29weSkK QEAgLTI2MjAsNyArMjYyMCw3IEBAIHN0YXRpYyBDRkFic29sdXRlVGltZSBfdGltZU9mTGFzdENv bXBsZXQKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIFtzaGFyZWREZWxlZ2F0ZSB3ZWJW aWV3Ond2IHJlc291cmNlOmlkZW50aWZpZXIgZGlkRmluaXNoTG9hZGluZ0Zyb21EYXRhU291cmNl OmRhdGFTb3VyY2VdOwogICAgICAgICB9Ci0gICAgICAgIFt3diBfZmluaXNoZWRMb2FkaW5nUmVz b3VyY2VGcm9tRGF0YVNvdXJjZTpkYXRhU291cmNlXTsKKyAgICAgICAgW3NlbGYgX2NoZWNrTG9h ZENvbXBsZXRlXTsKICAgICB9IGVsc2UgewogICAgICAgICBbW3d2IF9yZXNvdXJjZUxvYWREZWxl Z2F0ZUZvcndhcmRlcl0gd2ViVmlldzp3diByZXNvdXJjZTppZGVudGlmaWVyIGRpZEZhaWxMb2Fk aW5nV2l0aEVycm9yOmVycm9yIGZyb21EYXRhU291cmNlOmRhdGFTb3VyY2VdOwogICAgIH0KSW5k ZXg6IFdlYlZpZXcvV2ViRGF0YVNvdXJjZS5tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYlZpZXcvV2ViRGF0 YVNvdXJjZS5tCShyZXZpc2lvbiAxNDQ2OSkKKysrIFdlYlZpZXcvV2ViRGF0YVNvdXJjZS5tCSh3 b3JraW5nIGNvcHkpCkBAIC00MTcsOSArNDE3LDcgQEAKICAgICB9IGVsc2UgewogICAgICAgICAv LyBJZiB0aGVyZSBhcmUgbm8gcmVzb3VyY2UgbG9hZGVycywgd2UgbmVlZCB0byBtYW51ZmFjdHVy ZSBhIGNhbmNlbGxlZCBtZXNzYWdlLgogICAgICAgICAvLyAoQSBiYWNrL2ZvcndhcmQgbmF2aWdh dGlvbiBoYXMgbm8gcmVzb3VyY2UgbG9hZGVycyBiZWNhdXNlIGl0cyByZXNvdXJjZXMgYXJlIGNh Y2hlZC4pCi0gICAgICAgIFtbc2VsZiBfd2ViVmlld10gX21haW5SZWNlaXZlZEVycm9yOltzZWxm IF9jYW5jZWxsZWRFcnJvcl0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZnJvbURhdGFT b3VyY2U6c2VsZgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wbGV0ZTpZ RVNdOworICAgICAgICBbc2VsZiBfbWFpblJlY2VpdmVkRXJyb3I6W3NlbGYgX2NhbmNlbGxlZEVy cm9yXSBjb21wbGV0ZTpZRVNdOwogICAgIH0KICAgICAKICAgICBOU0FycmF5ICpsb2FkZXJzID0g W19wcml2YXRlLT5zdWJyZXNvdXJjZUxvYWRlcnMgY29weV07CkBAIC04MTEsOSArODA5LDcgQEAg c3RhdGljIGlubGluZSB2b2lkIGFkZFR5cGVzRnJvbUNsYXNzKE5TTQogICAgIFticmlkZ2UgcmVs ZWFzZV07CiAKICAgICBbW3NlbGYgd2ViRnJhbWVdIF9yZWNlaXZlZE1haW5SZXNvdXJjZUVycm9y OmVycm9yXTsKLSAgICBbW3NlbGYgX3dlYlZpZXddIF9tYWluUmVjZWl2ZWRFcnJvcjplcnJvcgot ICAgICAgICAgICAgICAgICAgICAgICAgIGZyb21EYXRhU291cmNlOnNlbGYKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb21wbGV0ZTppc0NvbXBsZXRlXTsKKyAgICBbc2VsZiBfbWFp blJlY2VpdmVkRXJyb3I6ZXJyb3IgY29tcGxldGU6aXNDb21wbGV0ZV07CiB9CiAKIC0gKHZvaWQp X2ljb25Mb2FkZXJSZWNlaXZlZFBhZ2VJY29uOihXZWJJY29uTG9hZGVyICopaWNvbkxvYWRlcgpA QCAtMTE2MCw0ICsxMTU2LDQzIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRUeXBlc0Zyb21DbGFz cyhOU00KICAgICB9CiB9CiAKKy0gKHZvaWQpX2ZpbmlzaGVkTG9hZGluZ1Jlc291cmNlCit7Cisg ICAgW1tzZWxmIHdlYkZyYW1lXSBfY2hlY2tMb2FkQ29tcGxldGVdOworfQorCistICh2b2lkKV9t YWluUmVjZWl2ZWRCeXRlc1NvRmFyOih1bnNpZ25lZClieXRlc1NvRmFyIGNvbXBsZXRlOihCT09M KWlzQ29tcGxldGUKK3sKKyAgICBXZWJGcmFtZSAqZnJhbWUgPSBbc2VsZiB3ZWJGcmFtZV07Cisg ICAgCisgICAgLy8gVGhlIGZyYW1lIG1heSBiZSBuaWwgaWYgYSBwcmV2aW91c2x5IGNhbmNlbGxl ZCBsb2FkIGlzIHN0aWxsIG1ha2luZyBwcm9ncmVzcyBjYWxsYmFja3MuCisgICAgaWYgKGZyYW1l ID09IG5pbCkKKyAgICAgICAgcmV0dXJuOworICAgICAgICAKKyAgICAvLyBUaGlzIHJlc291cmNl IGhhcyBjb21wbGV0ZWQsIHNvIGNoZWNrIGlmIHRoZSBsb2FkIGlzIGNvbXBsZXRlIGZvciB0aGlz IGZyYW1lIGFuZCBpdHMgYW5jZXN0b3JzCisgICAgaWYgKGlzQ29tcGxldGUpeworICAgICAgICAv LyBJZiB0aGUgbG9hZCBpcyBjb21wbGV0ZSwgbWFyayB0aGUgcHJpbWFyeSBsb2FkIGFzIGRvbmUu ICBUaGUgcHJpbWFyeSBsb2FkIGlzIHRoZSBsb2FkCisgICAgICAgIC8vIG9mIHRoZSBtYWluIGRv Y3VtZW50LiAgT3RoZXIgcmVzb3VyY2VzIG1heSBzdGlsbCBiZSBhcnJpdmluZy4KKyAgICAgICAg W3NlbGYgX3NldFByaW1hcnlMb2FkQ29tcGxldGU6WUVTXTsKKyAgICAgICAgW2ZyYW1lIF9jaGVj a0xvYWRDb21wbGV0ZV07CisgICAgfQorfQorCistICh2b2lkKV9yZWNlaXZlZEVycm9yOihOU0Vy cm9yICopZXJyb3IKK3sKKyAgICBbW3NlbGYgd2ViRnJhbWVdIF9jaGVja0xvYWRDb21wbGV0ZV07 Cit9CisKKy0gKHZvaWQpX21haW5SZWNlaXZlZEVycm9yOihOU0Vycm9yICopZXJyb3IgY29tcGxl dGU6KEJPT0wpaXNDb21wbGV0ZQoreworICAgIEFTU0VSVChbc2VsZiB3ZWJGcmFtZV0pOworICAg IAorICAgIFtzZWxmIF9zZXRNYWluRG9jdW1lbnRFcnJvcjplcnJvcl07CisKKyAgICBpZiAoaXND b21wbGV0ZSkgeworICAgICAgICBbc2VsZiBfc2V0UHJpbWFyeUxvYWRDb21wbGV0ZTpZRVNdOwor ICAgICAgICBbW3NlbGYgd2ViRnJhbWVdIF9jaGVja0xvYWRDb21wbGV0ZV07CisgICAgfQorfQor CiBAZW5kCg==