223657 2021-03-23 14:27:49 -0700 [Cocoa] Revise loadSimulatedRequest API with final review comments 2021-03-24 10:03:16 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham achristensen bfulgham ggaren webkit-bug-importer oldest_to_newest 1743010 0 bfulgham 2021-03-23 14:27:49 -0700 We've received final internal review on the proposed Cocoa API for loadSimulatedRequest, which suggested two small changes. This patch exposes the final API, and marks the prior version as deprecated. 1. Revise 'with' label to just be 'response'. - (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request withResponse:(NSURLResponse *)response responseData:(NSData *)data; Becomes - (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request response:(NSURLResponse *)response responseData:(NSData *)data; 2. Revise 'withResponseHTML' to 'responseHTML' - (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request withResponseHTMLString:(NSString *)string; Becomes - (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request responseHTMLString:(NSString *)string; 1743031 1 webkit-bug-importer 2021-03-23 15:18:07 -0700 <rdar://problem/75757727> 1743058 2 424076 bfulgham 2021-03-23 16:16:10 -0700 Created attachment 424076 Patch 1743069 3 424076 achristensen 2021-03-23 16:55:12 -0700 Comment on attachment 424076 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424076&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.h:492 > +- (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request response:(NSURLResponse *)response responseData:(NSData *)data WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)); Nobody suggested responseBody instead of responseData? > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm:54 > + [delegate waitForDidFinishNavigation]; This should do more than just wait until navigation finishes. It should verify that the data did load how we think it should. 1743369 4 ews-feeder 2021-03-24 10:03:14 -0700 Committed r274944: <https://commits.webkit.org/r274944> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424076. 424076 2021-03-23 16:16:10 -0700 2021-03-24 10:03:15 -0700 Patch bug-223657-20210323161609.patch text/plain 8995 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0OTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIwZGM3MDljNDE0OGIzMWJi ZGM3OTQ1NGQ5ODg2YzJiNWU4NjkyM2YuLjJjMjYwYTlmZjMzMGNiNWIxMDNiN2FjZmJkNjEyMDNl YTAxODVmOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjEtMDMtMjMgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBSZXZpc2UgbG9h ZFNpbXVsYXRlZFJlcXVlc3QgQVBJIHdpdGggZmluYWwgcmV2aWV3IGNvbW1lbnRzICgyMjM2NTcp CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM2NTcK KyAgICAgICAgPHJkYXI6Ly83NTc1NzcyNz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUZXN0ZWQgYnkgVGVzdFdlYktpdEFQSS4KKworICAgICAgICBV cGRhdGUgdGhlIFdLV2ViVmlldyBBUEkgdG8gbWF0Y2ggZmluYWwgcmV2aWV3IGNvbW1lbnRzLiBE ZXByZWNhdGUgdGhlIHByaW9yIGRyYWZ0IEFQSSBzbyB0aGF0IHdlCisgICAgICAgIGNhbiBzbW9v dGhseSB0cmFuc2l0aW9uIGF3YXkgZnJvbSB0aGUgb3JpZ2luYWwgbWV0aG9kcy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBsb2FkU2ltdWxh dGVkUmVxdWVzdDpyZXNwb25zZTpyZXNwb25zZURhdGE6XSk6CisgICAgICAgICgtW1dLV2ViVmll dyBsb2FkU2ltdWxhdGVkUmVxdWVzdDp3aXRoUmVzcG9uc2U6cmVzcG9uc2VEYXRhOl0pOgorICAg ICAgICAoLVtXS1dlYlZpZXcgbG9hZFNpbXVsYXRlZFJlcXVlc3Q6cmVzcG9uc2VIVE1MU3RyaW5n Ol0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgbG9hZFNpbXVsYXRlZFJlcXVlc3Q6d2l0aFJlc3Bv bnNlSFRNTFN0cmluZzpdKToKKwogMjAyMS0wMy0yMyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1 ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzQ4ODku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3LmgKaW5kZXgg YTM3YjU2OGE1NmRhOWFmMGYxZjRiOWFmN2QxNjlmMzUxOGRjYThjMS4uYTNmMmMyNzRhOTNkM2Vk YjQ1ODkxZTM5YzM0OTgzM2JmN2M5YjAzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcuaApAQCAtNDg5LDcgKzQ4OSw4IEBAIFRoZSB1bmlmb3JtIHR5 cGUgaWRlbnRpZmllciBrVVRUeXBlV2ViQXJjaGl2ZSBjYW4gYmUgdXNlZCBnZXQgdGhlIHJlbGF0 ZWQgcGFzdGViCiAgQHBhcmFtIGRhdGEgVGhlIGRhdGEgdG8gdXNlIGFzIHRoZSBjb250ZW50cyBv ZiB0aGUgd2VicGFnZS4KICBAcmVzdWx0IEEgbmV3IG5hdmlnYXRpb24uCiAqLwotLSAoV0tOYXZp Z2F0aW9uICopbG9hZFNpbXVsYXRlZFJlcXVlc3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3Qgd2l0 aFJlc3BvbnNlOihOU1VSTFJlc3BvbnNlICopcmVzcG9uc2UgcmVzcG9uc2VEYXRhOihOU0RhdGEg KilkYXRhIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJB KSk7CistIChXS05hdmlnYXRpb24gKilsb2FkU2ltdWxhdGVkUmVxdWVzdDooTlNVUkxSZXF1ZXN0 ICopcmVxdWVzdCByZXNwb25zZTooTlNVUkxSZXNwb25zZSAqKXJlc3BvbnNlIHJlc3BvbnNlRGF0 YTooTlNEYXRhICopZGF0YSBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3Mo V0tfSU9TX1RCQSkpOworLSAoV0tOYXZpZ2F0aW9uICopbG9hZFNpbXVsYXRlZFJlcXVlc3Q6KE5T VVJMUmVxdWVzdCAqKXJlcXVlc3Qgd2l0aFJlc3BvbnNlOihOU1VSTFJlc3BvbnNlICopcmVzcG9u c2UgcmVzcG9uc2VEYXRhOihOU0RhdGEgKilkYXRhIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQ TEFDRU1FTlQoImxvYWRTaW11bGF0ZWRSZXF1ZXN0OnJlc3BvbnNlOnJlc3BvbnNlRGF0YToiLCBt YWNvcyhXS19NQUNfVEJBLCBXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEsIFdLX0lPU19UQkEp KTsKIAogLyohIEBhYnN0cmFjdCBOYXZpZ2F0ZXMgdG8gdGhlIHJlcXVlc3RlZCBmaWxlIFVSTCBv biB0aGUgZmlsZXN5c3RlbS4KICBAcGFyYW0gcmVxdWVzdCBUaGUgcmVxdWVzdCBzcGVjaWZ5aW5n IHRoZSBmaWxlIFVSTCB0byB3aGljaCB0byBuYXZpZ2F0ZS4KQEAgLTUxMCw3ICs1MTEsOCBAQCBU aGUgdW5pZm9ybSB0eXBlIGlkZW50aWZpZXIga1VUVHlwZVdlYkFyY2hpdmUgY2FuIGJlIHVzZWQg Z2V0IHRoZSByZWxhdGVkIHBhc3RlYgogIEBwYXJhbSBzdHJpbmcgVGhlIGRhdGEgdG8gdXNlIGFz IHRoZSBjb250ZW50cyBvZiB0aGUgd2VicGFnZS4KICBAcmVzdWx0IEEgbmV3IG5hdmlnYXRpb24u CiAqLwotLSAoV0tOYXZpZ2F0aW9uICopbG9hZFNpbXVsYXRlZFJlcXVlc3Q6KE5TVVJMUmVxdWVz dCAqKXJlcXVlc3Qgd2l0aFJlc3BvbnNlSFRNTFN0cmluZzooTlNTdHJpbmcgKilzdHJpbmcgTlNf U1dJRlRfTkFNRShsb2FkU2ltdWxhdGVkUmVxdWVzdChfOndpdGhSZXNwb25zZUhUTUw6KSkgV0tf QVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0gKFdL TmF2aWdhdGlvbiAqKWxvYWRTaW11bGF0ZWRSZXF1ZXN0OihOU1VSTFJlcXVlc3QgKilyZXF1ZXN0 IHJlc3BvbnNlSFRNTFN0cmluZzooTlNTdHJpbmcgKilzdHJpbmcgTlNfU1dJRlRfTkFNRShsb2Fk U2ltdWxhdGVkUmVxdWVzdChfOnJlc3BvbnNlSFRNTDopKSBXS19BUElfQVZBSUxBQkxFKG1hY29z KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOworLSAoV0tOYXZpZ2F0aW9uICopbG9hZFNp bXVsYXRlZFJlcXVlc3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3Qgd2l0aFJlc3BvbnNlSFRNTFN0 cmluZzooTlNTdHJpbmcgKilzdHJpbmcgTlNfU1dJRlRfTkFNRShsb2FkU2ltdWxhdGVkUmVxdWVz dChfOndpdGhSZXNwb25zZUhUTUw6KSkgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVO VCgibG9hZFNpbXVsYXRlZFJlcXVlc3Q6cmVzcG9uc2VIVE1MU3RyaW5nOiIsIG1hY29zKFdLX01B Q19UQkEsIFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSwgV0tfSU9TX1RCQSkpOwogCiAjaWYg IVRBUkdFVF9PU19JUEhPTkUKIC8qIEBhYnN0cmFjdCBSZXR1cm5zIGFuIE5TUHJpbnRPcGVyYXRp b24gb2JqZWN0IGNvbmZpZ3VyZWQgdG8gcHJpbnQgdGhlIGNvbnRlbnRzIG9mIHRoaXMgV0tXZWJW aWV3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpp bmRleCBjMmU1MjIwMDI1MjQ3YTBkY2ZhMTA5ODMxNTU2YTY0NTliZjBiYjcwLi4wMTkwNTMyOTMw ZDIxMjFlNjA5Zjk0NWQwNzBjY2IwZWY5OTBkM2Y5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTE1NTQsMTcgKzE1NTQsMjkgQEAgc3Rh dGljIF9XS1NlbGVjdGlvbkF0dHJpYnV0ZXMgc2VsZWN0aW9uQXR0cmlidXRlcyhjb25zdCBXZWJL aXQ6OkVkaXRvclN0YXRlJiBlZGkKICAgICAgICAgW3VpRGVsZWdhdGUgX3dlYlZpZXc6c2VsZiBl ZGl0b3JTdGF0ZURpZENoYW5nZTpkaWN0aW9uYXJ5UmVwcmVzZW50YXRpb25Gb3JFZGl0b3JTdGF0 ZShfcGFnZS0+ZWRpdG9yU3RhdGUoKSldOwogfQogCi0tIChXS05hdmlnYXRpb24gKilsb2FkU2lt dWxhdGVkUmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdCB3aXRoUmVzcG9uc2U6KE5TVVJM UmVzcG9uc2UgKilyZXNwb25zZSByZXNwb25zZURhdGE6KE5TRGF0YSAqKWRhdGEKKy0gKFdLTmF2 aWdhdGlvbiAqKWxvYWRTaW11bGF0ZWRSZXF1ZXN0OihOU1VSTFJlcXVlc3QgKilyZXF1ZXN0IHJl c3BvbnNlOihOU1VSTFJlc3BvbnNlICopcmVzcG9uc2UgcmVzcG9uc2VEYXRhOihOU0RhdGEgKilk YXRhCiB7CiAgICAgcmV0dXJuIHdyYXBwZXIoX3BhZ2UtPmxvYWRTaW11bGF0ZWRSZXF1ZXN0KHJl cXVlc3QsIHJlc3BvbnNlLCB7IHN0YXRpY19jYXN0PGNvbnN0IHVpbnQ4X3QqPihkYXRhLmJ5dGVz KSwgZGF0YS5sZW5ndGggfSkpOwogfQogCi0tIChXS05hdmlnYXRpb24gKilsb2FkU2ltdWxhdGVk UmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdCB3aXRoUmVzcG9uc2VIVE1MU3RyaW5nOihO U1N0cmluZyAqKXN0cmluZworLy8gRklYTUUoMjIzNjU4KTogUmVtb3ZlIHRoaXMgb25jZSBhZG9w dGVycyBoYXZlIG1vdmVkIHRvIHRoZSBmaW5hbCBBUEkuCistIChXS05hdmlnYXRpb24gKilsb2Fk U2ltdWxhdGVkUmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdCB3aXRoUmVzcG9uc2U6KE5T VVJMUmVzcG9uc2UgKilyZXNwb25zZSByZXNwb25zZURhdGE6KE5TRGF0YSAqKWRhdGEKK3sKKyAg ICByZXR1cm4gW3NlbGYgbG9hZFNpbXVsYXRlZFJlcXVlc3Q6cmVxdWVzdCByZXNwb25zZTpyZXNw b25zZSByZXNwb25zZURhdGE6ZGF0YV07Cit9CisKKy0gKFdLTmF2aWdhdGlvbiAqKWxvYWRTaW11 bGF0ZWRSZXF1ZXN0OihOU1VSTFJlcXVlc3QgKilyZXF1ZXN0IHJlc3BvbnNlSFRNTFN0cmluZzoo TlNTdHJpbmcgKilzdHJpbmcKIHsKICAgICBOU0RhdGEgKmRhdGEgPSBbc3RyaW5nIGRhdGFVc2lu Z0VuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXTsKICAgICBhdXRvIHJlc3BvbnNlID0gYWRv cHROUyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOnJlcXVlc3QuVVJMIE1JTUVU eXBlOkAidGV4dC9odG1sIiBleHBlY3RlZENvbnRlbnRMZW5ndGg6c3RyaW5nLmxlbmd0aCB0ZXh0 RW5jb2RpbmdOYW1lOkAiVVRGLTgiXSk7CiAKLSAgICByZXR1cm4gW3NlbGYgbG9hZFNpbXVsYXRl ZFJlcXVlc3Q6cmVxdWVzdCB3aXRoUmVzcG9uc2U6cmVzcG9uc2UuZ2V0KCkgcmVzcG9uc2VEYXRh OmRhdGFdOworICAgIHJldHVybiBbc2VsZiBsb2FkU2ltdWxhdGVkUmVxdWVzdDpyZXF1ZXN0IHJl c3BvbnNlOnJlc3BvbnNlLmdldCgpIHJlc3BvbnNlRGF0YTpkYXRhXTsKK30KKworLy8gRklYTUUo MjIzNjU4KTogUmVtb3ZlIHRoaXMgb25jZSBhZG9wdGVycyBoYXZlIG1vdmVkIHRvIHRoZSBmaW5h bCBBUEkuCistIChXS05hdmlnYXRpb24gKilsb2FkU2ltdWxhdGVkUmVxdWVzdDooTlNVUkxSZXF1 ZXN0ICopcmVxdWVzdCB3aXRoUmVzcG9uc2VIVE1MU3RyaW5nOihOU1N0cmluZyAqKXN0cmluZwor eworICAgIHJldHVybiBbc2VsZiBsb2FkU2ltdWxhdGVkUmVxdWVzdDpyZXF1ZXN0IHJlc3BvbnNl SFRNTFN0cmluZzpzdHJpbmddOwogfQogCiAtIChXS05hdmlnYXRpb24gKilsb2FkRmlsZVJlcXVl c3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3QgYWxsb3dpbmdSZWFkQWNjZXNzVG9VUkw6KE5TVVJM ICopcmVhZEFjY2Vzc1VSTApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IDBiZTIwMjMzOWUwM2JhOTg1N2I2Y2JiMWE5YjU1MTk5MDNkMzI1MTkuLjll NmE1ZDU0NDAxNjZiZGI5YjFlMjA2MmViN2VkOTZlNzE1NDg4YTcgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0w My0yMyAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29j b2FdIFJldmlzZSBsb2FkU2ltdWxhdGVkUmVxdWVzdCBBUEkgd2l0aCBmaW5hbCByZXZpZXcgY29t bWVudHMgKDIyMzY1NykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyMzY1NworICAgICAgICA8cmRhcjovLzc1NzU3NzI3PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0ZXN0cyB0byB1c2UgdGhl IGZpbmFsIEFQSSwgd2hpbGUgc3RpbGwgZXhlcmNpc2luZyB0aGUgZXhpc3RpbmcgQVBJLgorCisg ICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdMb2FkQVBJ cy5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIxLTAzLTIzICBKaWV3ZW4gVGFuICA8amlld2Vu X3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUHJvdmlkZSBhIHdheSB0byBzcGVjaWZ5IHBsYXRm b3JtIHZzIHNlY3VyaXR5IGtleSB3aGVuIHJlcXVlc3RpbmcgYW4gYXNzZXJ0aW9uIGluIHRoZSBT UEkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tX ZWJWaWV3TG9hZEFQSXMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1dLV2ViVmlld0xvYWRBUElzLm1tCmluZGV4IGRhNWUwZGFkZWFiYTExYzdhNTUyN2MzMTcxY2Vk MzdiZDdkY2I4ODYuLjFiN2E2MDdjMGFhZGIwZmIxNzBiYTg2MWNhNWZhYzJkZmEyYTVmNDMgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3 TG9hZEFQSXMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9X S1dlYlZpZXdMb2FkQVBJcy5tbQpAQCAtNTAsNyArNTAsMTMgQEAgVEVTVChXS1dlYlZpZXcsIExv YWRTaW11bGF0ZWRSZXF1ZXN0VXNpbmdSZXNwb25zZUhUTUxTdHJpbmcpCiAKICAgICBOU1VSTFJl cXVlc3QgKmxvYWRSZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpleGFtcGxl VVJMXTsKIAorICAgIFt3ZWJWaWV3IGxvYWRTaW11bGF0ZWRSZXF1ZXN0OmxvYWRSZXF1ZXN0IHJl c3BvbnNlSFRNTFN0cmluZzpodG1sU3RyaW5nXTsKKyAgICBbZGVsZWdhdGUgd2FpdEZvckRpZEZp bmlzaE5hdmlnYXRpb25dOworCitBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgor ICAgIC8vIEZJWE1FKDIyMzY1OCk6IFJlbW92ZSB0aGlzIG9uY2UgYWRvcHRlcnMgaGF2ZSBtb3Zl ZCB0byB0aGUgZmluYWwgQVBJLgogICAgIFt3ZWJWaWV3IGxvYWRTaW11bGF0ZWRSZXF1ZXN0Omxv YWRSZXF1ZXN0IHdpdGhSZXNwb25zZUhUTUxTdHJpbmc6aHRtbFN0cmluZ107CitBTExPV19ERVBS RUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICBbZGVsZWdhdGUgd2FpdEZvckRpZEZpbmlzaE5h dmlnYXRpb25dOwogfQogCkBAIC02Niw3ICs3MiwxMyBAQCBURVNUKFdLV2ViVmlldywgTG9hZFNp bXVsYXRlZFJlcXVlc3RVc2luZ1Jlc3BvbnNlRGF0YSkKICAgICBOU0RhdGEgKmRhdGEgPSBbaHRt bFN0cmluZyBkYXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ107CiAgICAgYXV0 byByZXNwb25zZSA9IGFkb3B0TlMoW1tOU1VSTFJlc3BvbnNlIGFsbG9jXSBpbml0V2l0aFVSTDpl eGFtcGxlVVJMIE1JTUVUeXBlOkAidGV4dC9IVE1MIiBleHBlY3RlZENvbnRlbnRMZW5ndGg6W2Rh dGEgbGVuZ3RoXSB0ZXh0RW5jb2RpbmdOYW1lOkAiVVRGLTgiXSk7CiAKKyAgICBbd2ViVmlldyBs b2FkU2ltdWxhdGVkUmVxdWVzdDpsb2FkUmVxdWVzdCByZXNwb25zZTpyZXNwb25zZS5nZXQoKSBy ZXNwb25zZURhdGE6ZGF0YV07CisgICAgW2RlbGVnYXRlIHdhaXRGb3JEaWRGaW5pc2hOYXZpZ2F0 aW9uXTsKKworQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KKyAgICAvLyBGSVhN RSgyMjM2NTgpOiBSZW1vdmUgdGhpcyBvbmNlIGFkb3B0ZXJzIGhhdmUgbW92ZWQgdG8gdGhlIGZp bmFsIEFQSS4KICAgICBbd2ViVmlldyBsb2FkU2ltdWxhdGVkUmVxdWVzdDpsb2FkUmVxdWVzdCB3 aXRoUmVzcG9uc2U6cmVzcG9uc2UuZ2V0KCkgcmVzcG9uc2VEYXRhOmRhdGFdOworQUxMT1dfREVQ UkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgW2RlbGVnYXRlIHdhaXRGb3JEaWRGaW5pc2hO YXZpZ2F0aW9uXTsKIH0KIApAQCAtOTIsMTEgKzEwNCwxMSBAQCBURVNUKFdLV2ViVmlldywgTG9h ZFNpbXVsYXRlZFJlcXVlc3RVcGRhdGVzQmFja0ZvcndhcmRMaXN0KQogICAgIFt3ZWJWaWV3IHNl dE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CiAKICAgICBOU1VSTFJlcXVlc3Qg KmxvYWRSZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpleGFtcGxlVVJMXTsK LSAgICBbd2ViVmlldyBsb2FkU2ltdWxhdGVkUmVxdWVzdDpsb2FkUmVxdWVzdCB3aXRoUmVzcG9u c2VIVE1MU3RyaW5nOmh0bWxTdHJpbmddOworICAgIFt3ZWJWaWV3IGxvYWRTaW11bGF0ZWRSZXF1 ZXN0OmxvYWRSZXF1ZXN0IHJlc3BvbnNlSFRNTFN0cmluZzpodG1sU3RyaW5nXTsKICAgICBbZGVs ZWdhdGUgd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOwogCiAgICAgTlNVUkxSZXF1ZXN0ICps b2FkUmVxdWVzdDIgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOmV4YW1wbGVVUkwyXTsK LSAgICBbd2ViVmlldyBsb2FkU2ltdWxhdGVkUmVxdWVzdDpsb2FkUmVxdWVzdDIgd2l0aFJlc3Bv bnNlSFRNTFN0cmluZzpodG1sU3RyaW5nMl07CisgICAgW3dlYlZpZXcgbG9hZFNpbXVsYXRlZFJl cXVlc3Q6bG9hZFJlcXVlc3QyIHJlc3BvbnNlSFRNTFN0cmluZzpodG1sU3RyaW5nMl07CiAgICAg W2RlbGVnYXRlIHdhaXRGb3JEaWRGaW5pc2hOYXZpZ2F0aW9uXTsKICAgICAKICAgICBXS0JhY2tG b3J3YXJkTGlzdCAqbGlzdCA9IFt3ZWJWaWV3IGJhY2tGb3J3YXJkTGlzdF07Cg==