183526 2018-03-09 14:32:59 -0800 Allow NavigationState to intercept requests and send them to SystemPreviewController 2018-03-09 15:39:40 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino aestes beidson ews-watchlist thorton oldest_to_newest 1405319 0 dino 2018-03-09 14:32:59 -0800 Allow NavigationState to intercept requests and send them to SystemPreviewController 1405320 1 dino 2018-03-09 14:33:35 -0800 <rdar://problem/37801140> 1405321 2 335466 dino 2018-03-09 14:40:58 -0800 Created attachment 335466 Patch 1405323 3 ews-watchlist 2018-03-09 14:43:18 -0800 Attachment 335466 did not pass style-queue: ERROR: Source/WebKit/UIProcess/SystemPreviewController.h:33: _WKPreviewControllerDataSource is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] ERROR: Source/WebKit/UIProcess/SystemPreviewController.h:34: _WKPreviewControllerDelegate is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1405353 4 335466 thorton 2018-03-09 15:24:03 -0800 Comment on attachment 335466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=335466&action=review > Source/WebKit/UIProcess/Cocoa/NavigationState.mm:658 > + if (page.systemPreviewController()->canPreview(navigationResponse->response().mimeType())) > + page.systemPreviewController()->showPreview(navigationResponse->response().url()); It seems a bit weird to take over if the client explicitly wants to download, and also weird to then go ahead with the download? 1405360 5 335466 dino 2018-03-09 15:28:20 -0800 Comment on attachment 335466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=335466&action=review >> Source/WebKit/UIProcess/Cocoa/NavigationState.mm:658 >> + page.systemPreviewController()->showPreview(navigationResponse->response().url()); > > It seems a bit weird to take over if the client explicitly wants to download, and also weird to then go ahead with the download? I agree. But we can't nicely cancel the download at this point. Ultimately, we'll have a separate download client or logic that doesn't navigate. 1405361 6 335466 thorton 2018-03-09 15:30:07 -0800 Comment on attachment 335466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=335466&action=review >>> Source/WebKit/UIProcess/Cocoa/NavigationState.mm:658 >>> + page.systemPreviewController()->showPreview(navigationResponse->response().url()); >> >> It seems a bit weird to take over if the client explicitly wants to download, and also weird to then go ahead with the download? > > I agree. But we can't nicely cancel the download at this point. Ultimately, we'll have a separate download client or logic that doesn't navigate. Or a separate policy type? 1405362 7 335466 dino 2018-03-09 15:32:36 -0800 Comment on attachment 335466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=335466&action=review >>>> Source/WebKit/UIProcess/Cocoa/NavigationState.mm:658 >>>> + page.systemPreviewController()->showPreview(navigationResponse->response().url()); >>> >>> It seems a bit weird to take over if the client explicitly wants to download, and also weird to then go ahead with the download? >> >> I agree. But we can't nicely cancel the download at this point. Ultimately, we'll have a separate download client or logic that doesn't navigate. > > Or a separate policy type? Actually, it sort of works if I ignore the download! I originally considered a new policy type, but this one is actually set from Safari. I'll have to do something else for WKWebView clients. 1405368 8 dino 2018-03-09 15:39:40 -0800 Committed r229488: <https://trac.webkit.org/changeset/229488> 335466 2018-03-09 14:40:58 -0800 2018-03-09 15:30:07 -0800 Patch bug-183526-20180310094056.patch text/plain 10181 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5MTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUwOWY0OGNiZjgyNTc4MjBj MTk5ZDNkYzNiZDlmMDM2Y2Q2NDQxY2UuLjA2ODNhMjQ2NmM2YjU3ZTkwY2E1YTk4NzI3MWM2MGJi ZjIyNTNkZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTgtMDMtMDkgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIEFsbG93IE5hdmlnYXRpb25TdGF0ZSB0 byBpbnRlcmNlcHQgcmVxdWVzdHMgYW5kIHNlbmQgdGhlbSB0byBTeXN0ZW1QcmV2aWV3Q29udHJv bGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgz NTI2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzgwMTE0MD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgYSBiaXQgbW9yZSBvZiBT eXN0ZW1QcmV2aWV3Q29udHJvbGxlciwgc3VjaCB0aGF0IGl0IGNhbiBiZSB1c2VkCisgICAgICAg IGZyb20gTmF2aWdhdGlvblN0YXRlIHRvIGlkZW50aWZ5IGFuZCBoYW5kbGUgY29udGVudCB0aGF0 IGNhbiBiZSBwcmV2aWV3ZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlv blN0YXRlLm1tOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25D bGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZSk6CisgICAgICAgICAgICBJ ZiB3ZSdkIGluIGEgZG93bmxvYWQgcmVzcG9uc2UgcG9saWN5LCB0aGVuIGNoZWNrIGlmIFN5c3Rl bVByZXZpZXdDb250cm9sbGVyCisgICAgICAgICAgICBjYW4gc2hvdyB0aGUgY29udGVudC4gV2Ug c3RpbGwgYWxsb3cgdGhlIGRvd25sb2FkIHRvIGNvbnRpbnVlLCBidXQgd2UgcGFzcworICAgICAg ICAgICAgdGhlIG9yaWdpbmFsIFVSTCBvbnRvIHRoZSBwcmV2aWV3LiBVbHRpbWF0ZWx5LCB3ZSdk IHdhbnQgdG8gYXZvaWQgdGhlIG5hdmlnYXRpb24KKyAgICAgICAgICAgIGJ1dCB1c2UgdGhlIGRv d25sb2FkIGRlc3RpbmF0aW9uIFVSTCBmb3IgcHJldmlldy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9Db2NvYS9TeXN0ZW1QcmV2aWV3Q29udHJvbGxlckNvY29hLm1tOgorICAgICAgICAoLVtfV0tQ cmV2aWV3Q29udHJvbGxlckRhdGFTb3VyY2UgaW5pdFdpdGhVUkw6XSk6CisgICAgICAgICAgICBN b3ZlIHRoZSBVUkwgdG8gcHJvcGVydHksIHRvIGhlbHAgdXNlIGEgc2luZ2xlIGRhdGFzb3VyY2Ug b2JqZWN0IGZvciBhbGwgcHJldmlld3MuCisgICAgICAgICgtW19XS1ByZXZpZXdDb250cm9sbGVy RGF0YVNvdXJjZSBwcmV2aWV3Q29udHJvbGxlcjpwcmV2aWV3SXRlbUF0SW5kZXg6XSk6CisgICAg ICAgICgtW19XS1ByZXZpZXdDb250cm9sbGVyRGVsZWdhdGUgaW5pdFdpdGhTeXN0ZW1QcmV2aWV3 Q29udHJvbGxlcjpdKToKKyAgICAgICAgICAgIEFkZCBhIGRlbGVnYXRlIG9iamVjdCwgc28gd2Ug Y2FuIGRldGVjdCB3aGVuIHRoZSBwcmV2aWV3IGlzIGRpc21pc3NlZCBhbmQgcmV0dXJuCisgICAg ICAgICAgICB0byB0aGUgcHJldmlvdXMgcGFnZS4KKyAgICAgICAgKC1bX1dLUHJldmlld0NvbnRy b2xsZXJEZWxlZ2F0ZSBwcmV2aWV3Q29udHJvbGxlcldpbGxEaXNtaXNzOl0pOgorICAgICAgICAo V2ViS2l0OjpTeXN0ZW1QcmV2aWV3Q29udHJvbGxlcjo6c2hvd1ByZXZpZXcpOgorICAgICAgICAg ICAgVXNlIHNpbmdsZSBpbnN0YW5jZXMgb2YgdGhlIFFMUHJldmlld0NvbnRyb2xsZXIsIGl0cyBk YXRhc291cmNlIGFuZCBkZWxlZ2F0ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TeXN0ZW1QcmV2 aWV3Q29udHJvbGxlci5jcHA6CisgICAgICAgICAgICBBZGQgYSBoZWxwZXIgdG8gbmF2aWdhdGUg YmFjay4KKyAgICAgICAgKFdlYktpdDo6U3lzdGVtUHJldmlld0NvbnRyb2xsZXI6OlN5c3RlbVBy ZXZpZXdDb250cm9sbGVyKToKKyAgICAgICAgKFdlYktpdDo6U3lzdGVtUHJldmlld0NvbnRyb2xs ZXI6OnNlbmRQYWdlQmFjayk6CisgICAgICAgICogVUlQcm9jZXNzL1N5c3RlbVByZXZpZXdDb250 cm9sbGVyLmg6CisKIDIwMTgtMDMtMDcgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBTeXN0ZW1QcmV2aWV3Q29udHJvbGxlciBmb3Igc2hvd2luZyBzeXN0ZW0t bGV2ZWwgdmlld3Mgb2Ygc3BlY2lhbCBmaWxlIHR5cGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KaW5kZXggM2VlZTdkMTQ1ZDdlMzY5ZmFj YTI4MzFhZDMyZGJjNjVkY2JmYTYxZS4uN2U1MjNiMGEwZDI1MTkyZGJjYTBkN2ExZjUwYWY5ZWYy MTRlMTY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdh dGlvblN0YXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRp b25TdGF0ZS5tbQpAQCAtNjA3LDcgKzYwNyw3IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZp Z2F0aW9uQ2xpZW50Ojpjb250ZW50UnVsZUxpc3ROb3RpZmljYXRpb24oV2ViUGFnZVByb3h5CiAg ICAgWyhpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlPiluYXZpZ2F0aW9uRGVsZWdhdGUg X3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IFVSTDp1cmwgY29udGVudFJ1bGVM aXN0SWRlbnRpZmllcnM6aWRlbnRpZmllcnMuZ2V0KCkgbm90aWZpY2F0aW9uczpuc05vdGlmaWNh dGlvbnMuZ2V0KCldOwogfQogICAgIAotdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25D bGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZShXZWJQYWdlUHJveHkmLCBS ZWY8QVBJOjpOYXZpZ2F0aW9uUmVzcG9uc2U+JiYgbmF2aWdhdGlvblJlc3BvbnNlLCBSZWY8V2Vi RnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5PiYmIGxpc3RlbmVyLCBBUEk6Ok9iamVjdCogdXNlckRh dGEpCit2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvblJlc3BvbnNlKFdlYlBhZ2VQcm94eSYgcGFnZSwgUmVmPEFQSTo6TmF2aWdh dGlvblJlc3BvbnNlPiYmIG5hdmlnYXRpb25SZXNwb25zZSwgUmVmPFdlYkZyYW1lUG9saWN5TGlz dGVuZXJQcm94eT4mJiBsaXN0ZW5lciwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGlm ICghbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdE ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2VEZWNpc2lvbkhhbmRsZXIpIHsKICAgICAg ICAgTlNVUkwgKnVybCA9IG5hdmlnYXRpb25SZXNwb25zZS0+cmVzcG9uc2UoKS5uc1VSTFJlc3Bv bnNlKCkuVVJMOwpAQCAtNjM1LDcgKzYzNSw4IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZp Z2F0aW9uQ2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2UoV2ViUGFnCiAK ICAgICBSZWZQdHI8V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5PiBsb2NhbExpc3RlbmVyID0g V1RGTW92ZShsaXN0ZW5lcik7CiAgICAgUmVmUHRyPENvbXBsZXRpb25IYW5kbGVyQ2FsbENoZWNr ZXI+IGNoZWNrZXIgPSBDb21wbGV0aW9uSGFuZGxlckNhbGxDaGVja2VyOjpjcmVhdGUobmF2aWdh dGlvbkRlbGVnYXRlLmdldCgpLCBAc2VsZWN0b3Iod2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uUmVzcG9uc2U6ZGVjaXNpb25IYW5kbGVyOikpOwotICAgIFtuYXZpZ2F0aW9uRGVsZWdh dGUgd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvblJlc3BvbnNlOndyYXBwZXIobmF2aWdhdGlvblJlc3BvbnNlKSBkZWNpc2lvbkhhbmRs ZXI6W2xvY2FsTGlzdGVuZXIsIGNoZWNrZXJdKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5IHJl c3BvbnNlUG9saWN5KSB7CisgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvblJlc3BvbnNlPiBuYXZp Z2F0aW9uUmVzcG9uc2VSZWZQdHIobmF2aWdhdGlvblJlc3BvbnNlLnB0cigpKTsKKyAgICBbbmF2 aWdhdGlvbkRlbGVnYXRlIHdlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IGRlY2lk ZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZTp3cmFwcGVyKG5hdmlnYXRpb25SZXNwb25zZSkg ZGVjaXNpb25IYW5kbGVyOltsb2NhbExpc3RlbmVyLCBjaGVja2VyLCBuYXZpZ2F0aW9uUmVzcG9u c2UgPSBXVEZNb3ZlKG5hdmlnYXRpb25SZXNwb25zZVJlZlB0ciksICZwYWdlXShXS05hdmlnYXRp b25SZXNwb25zZVBvbGljeSByZXNwb25zZVBvbGljeSkgewogICAgICAgICBpZiAoY2hlY2tlci0+ Y29tcGxldGlvbkhhbmRsZXJIYXNCZWVuQ2FsbGVkKCkpCiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIGNoZWNrZXItPmRpZENhbGxDb21wbGV0aW9uSGFuZGxlcigpOwpAQCAtNjUzLDggKzY1 NCwxMCBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlKFdlYlBhZwogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGlj IHB1c2gKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkICItV3N3aXRjaCIKICAgICAg ICAgY2FzZSBfV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lCZWNvbWVEb3dubG9hZDoKLSNwcmFn bWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKKyAgICAgICAgICAgIGlmIChwYWdlLnN5c3RlbVByZXZp ZXdDb250cm9sbGVyKCktPmNhblByZXZpZXcobmF2aWdhdGlvblJlc3BvbnNlLT5yZXNwb25zZSgp Lm1pbWVUeXBlKCkpKQorICAgICAgICAgICAgICAgIHBhZ2Uuc3lzdGVtUHJldmlld0NvbnRyb2xs ZXIoKS0+c2hvd1ByZXZpZXcobmF2aWdhdGlvblJlc3BvbnNlLT5yZXNwb25zZSgpLnVybCgpKTsK ICAgICAgICAgICAgIGxvY2FsTGlzdGVuZXItPmRvd25sb2FkKCk7CisjcHJhZ21hIGNsYW5nIGRp YWdub3N0aWMgcG9wCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH1dOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvU3lzdGVtUHJldmlld0NvbnRy b2xsZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1N5c3RlbVByZXZp ZXdDb250cm9sbGVyQ29jb2EubW0KaW5kZXggZDNmNDJiYWRkYzdmOWI3ODg1NmZkZTI1ZTg3ODcy YTk4NDczY2UxYy4uYmRhYjlmZWVlYmQ2M2RmMDQzNjMzOWE2Mjg2YjNiNTQ0ZTNjMDNkNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvU3lzdGVtUHJldmlld0NvbnRy b2xsZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9TeXN0ZW1Q cmV2aWV3Q29udHJvbGxlckNvY29hLm1tCkBAIC00Myw4ICs0MywxMCBAQCBTT0ZUX0xJTktfRlJB TUVXT1JLKFF1aWNrTG9vaykKIFNPRlRfTElOS19DTEFTUyhRdWlja0xvb2ssIFFMUHJldmlld0Nv bnRyb2xsZXIpOwogCiBAaW50ZXJmYWNlIF9XS1ByZXZpZXdDb250cm9sbGVyRGF0YVNvdXJjZSA6 IE5TT2JqZWN0IDxRTFByZXZpZXdDb250cm9sbGVyRGF0YVNvdXJjZT4gewotICAgIFdlYkNvcmU6 OlVSTCBfdXJsOwogfTsKKworQHByb3BlcnR5IChub25hdG9taWMpIFdlYkNvcmU6OlVSTCB1cmw7 CisKIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIF9XS1ByZXZpZXdDb250cm9sbGVyRGF0YVNvdXJj ZQpAQCAtNTQsNyArNTYsNyBAQCBTT0ZUX0xJTktfQ0xBU1MoUXVpY2tMb29rLCBRTFByZXZpZXdD b250cm9sbGVyKTsKICAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0 dXJuIG5pbDsKIAotICAgIF91cmwgPSB1cmw7CisgICAgc2VsZi51cmwgPSB1cmw7CiAgICAgcmV0 dXJuIHNlbGY7CiB9CiAKQEAgLTY1LDExICs2NywzNCBAQCBTT0ZUX0xJTktfQ0xBU1MoUXVpY2tM b29rLCBRTFByZXZpZXdDb250cm9sbGVyKTsKIAogLSAoaWQ8UUxQcmV2aWV3SXRlbT4pcHJldmll d0NvbnRyb2xsZXI6KFFMUHJldmlld0NvbnRyb2xsZXIgKiljb250cm9sbGVyIHByZXZpZXdJdGVt QXRJbmRleDooTlNJbnRlZ2VyKWluZGV4CiB7Ci0gICAgcmV0dXJuIChOU1VSTCopc2VsZi0+X3Vy bDsKKyAgICByZXR1cm4gKE5TVVJMKilzZWxmLnVybDsKIH0KIAogQGVuZAogCitAaW50ZXJmYWNl IF9XS1ByZXZpZXdDb250cm9sbGVyRGVsZWdhdGUgOiBOU09iamVjdCA8UUxQcmV2aWV3Q29udHJv bGxlckRlbGVnYXRlPiB7CisgICAgV2ViS2l0OjpTeXN0ZW1QcmV2aWV3Q29udHJvbGxlciogX3By ZXZpZXdDb250cm9sbGVyOworfTsKK0BlbmQKKworQGltcGxlbWVudGF0aW9uIF9XS1ByZXZpZXdD b250cm9sbGVyRGVsZWdhdGUKKworLSAoaWQpaW5pdFdpdGhTeXN0ZW1QcmV2aWV3Q29udHJvbGxl cjooV2ViS2l0OjpTeXN0ZW1QcmV2aWV3Q29udHJvbGxlciopcHJldmlld0NvbnRyb2xsZXIKK3sK KyAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKwor ICAgIF9wcmV2aWV3Q29udHJvbGxlciA9IHByZXZpZXdDb250cm9sbGVyOworICAgIHJldHVybiBz ZWxmOworfQorCistICh2b2lkKXByZXZpZXdDb250cm9sbGVyV2lsbERpc21pc3M6KFFMUHJldmll d0NvbnRyb2xsZXIgKiljb250cm9sbGVyCit7CisgICAgaWYgKF9wcmV2aWV3Q29udHJvbGxlcikK KyAgICAgICAgX3ByZXZpZXdDb250cm9sbGVyLT5zZW5kUGFnZUJhY2soKTsKK30KK0BlbmQKKwog bmFtZXNwYWNlIFdlYktpdCB7CiAKIGJvb2wgU3lzdGVtUHJldmlld0NvbnRyb2xsZXI6OmNhblBy ZXZpZXcoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkgY29uc3QKQEAgLTkxLDEyICsxMTYsMjAgQEAg dm9pZCBTeXN0ZW1QcmV2aWV3Q29udHJvbGxlcjo6c2hvd1ByZXZpZXcoY29uc3QgV2ViQ29yZTo6 VVJMJiB1cmwpCiAgICAgaWYgKCFwcmVzZW50aW5nVmlld0NvbnRyb2xsZXIpCiAgICAgICAgIHJl dHVybjsKIAotICAgIFJldGFpblB0cjxRTFByZXZpZXdDb250cm9sbGVyPiBxbFByZXZpZXdDb250 cm9sbGVyID0gYWRvcHROUyhbYWxsb2NRTFByZXZpZXdDb250cm9sbGVySW5zdGFuY2UoKSBpbml0 XSk7Ci0gICAgUmV0YWluUHRyPF9XS1ByZXZpZXdDb250cm9sbGVyRGF0YVNvdXJjZT4gZGF0YVNv dXJjZSA9IGFkb3B0TlMoW1tfV0tQcmV2aWV3Q29udHJvbGxlckRhdGFTb3VyY2UgYWxsb2NdIGlu aXRXaXRoVVJMOnVybF0pOworICAgIGlmICghbV9xbFByZXZpZXdDb250cm9sbGVyKSB7CisgICAg ICAgIG1fcWxQcmV2aWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW2FsbG9jUUxQcmV2aWV3Q29udHJv bGxlckluc3RhbmNlKCkgaW5pdF0pOworCisgICAgICAgIG1fcWxQcmV2aWV3Q29udHJvbGxlckRl bGVnYXRlID0gYWRvcHROUyhbW19XS1ByZXZpZXdDb250cm9sbGVyRGVsZWdhdGUgYWxsb2NdIGlu aXRXaXRoU3lzdGVtUHJldmlld0NvbnRyb2xsZXI6dGhpc10pOworICAgICAgICBbbV9xbFByZXZp ZXdDb250cm9sbGVyIHNldERlbGVnYXRlOm1fcWxQcmV2aWV3Q29udHJvbGxlckRlbGVnYXRlLmdl dCgpXTsKKworICAgICAgICBtX3FsUHJldmlld0NvbnRyb2xsZXJEYXRhU291cmNlID0gYWRvcHRO UyhbW19XS1ByZXZpZXdDb250cm9sbGVyRGF0YVNvdXJjZSBhbGxvY10gaW5pdFdpdGhVUkw6dXJs XSk7CisgICAgICAgIFttX3FsUHJldmlld0NvbnRyb2xsZXIgc2V0RGF0YVNvdXJjZTptX3FsUHJl dmlld0NvbnRyb2xsZXJEYXRhU291cmNlLmdldCgpXTsKKyAgICB9IGVsc2UKKyAgICAgICAgbV9x bFByZXZpZXdDb250cm9sbGVyRGF0YVNvdXJjZS5nZXQoKS51cmwgPSB1cmw7CiAKLSAgICBbcWxQ cmV2aWV3Q29udHJvbGxlciBzZXREYXRhU291cmNlOmRhdGFTb3VyY2UuZ2V0KCldOworICAgIFtt X3FsUHJldmlld0NvbnRyb2xsZXIgcmVsb2FkRGF0YV07CiAKLSAgICBbcHJlc2VudGluZ1ZpZXdD b250cm9sbGVyIHByZXNlbnRWaWV3Q29udHJvbGxlcjpxbFByZXZpZXdDb250cm9sbGVyLmdldCgp IGFuaW1hdGVkOllFUyBjb21wbGV0aW9uOm51bGxwdHJdOworICAgIFtwcmVzZW50aW5nVmlld0Nv bnRyb2xsZXIgcHJlc2VudFZpZXdDb250cm9sbGVyOm1fcWxQcmV2aWV3Q29udHJvbGxlci5nZXQo KSBhbmltYXRlZDpZRVMgY29tcGxldGlvbjpudWxscHRyXTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3lzdGVtUHJldmlld0NvbnRyb2xsZXIuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvU3lzdGVtUHJldmlld0NvbnRyb2xsZXIuY3BwCmluZGV4IGM1 MjZkZGEzZTM3YTE4ZTIxZjA3NzM0MDhkM2E1NzhhZDY3NTBiMWEuLjQ4ZTUxMmExZTlhNGM2YjVj ZGQ2NDgyZDA4ZjM1OGUxMmQ4YmJlOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1N5c3RlbVByZXZpZXdDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9TeXN0ZW1QcmV2aWV3Q29udHJvbGxlci5jcHAKQEAgLTI2LDEyICsyNiwxOCBAQAogI2lt cG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJTeXN0ZW1QcmV2aWV3Q29udHJvbGxlci5oIgogCisj aW1wb3J0ICJXZWJQYWdlUHJveHkuaCIKKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIFN5c3RlbVBy ZXZpZXdDb250cm9sbGVyOjpTeXN0ZW1QcmV2aWV3Q29udHJvbGxlcihXZWJQYWdlUHJveHkmIHdl YlBhZ2VQcm94eSkKICAgICA6IG1fd2ViUGFnZVByb3h5KHdlYlBhZ2VQcm94eSkKIHsKLSAgICAo dm9pZCltX3dlYlBhZ2VQcm94eTsgLy8gVGhpcyB3aWxsIGJlIHVzZWQgZXZlbnR1YWxseS4gVXNp bmcgaXQgaGVyZSB0byBrZWVwIHRoZSBjb21waWxlciBmcm9tIGNvbXBsYWluaW5nLgorfQorCit2 b2lkIFN5c3RlbVByZXZpZXdDb250cm9sbGVyOjpzZW5kUGFnZUJhY2soKQoreworICAgIG1fd2Vi UGFnZVByb3h5LmdvQmFjaygpOwogfQogCiAjaWYgIVBMQVRGT1JNKElPUykKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N5c3RlbVByZXZpZXdDb250cm9sbGVyLmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9TeXN0ZW1QcmV2aWV3Q29udHJvbGxlci5oCmluZGV4IDI2MWQ0 OGYyZjdiMTA5OWY5YmFjMjk5ODcyZjdiYTZmZWEzY2Y1MWMuLjgxNDE4MTA3MDJlNmYwZDBjZTdl NDc1MGIwMWQxMWM1NGFjMjcyNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1N5c3RlbVByZXZpZXdDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv U3lzdGVtUHJldmlld0NvbnRyb2xsZXIuaApAQCAtMjYsNiArMjYsMTMgQEAKICNwcmFnbWEgb25j ZQogCiAjaW5jbHVkZSA8V2ViQ29yZS9VUkwuaD4KKyNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+ CisKKyNpZiBQTEFURk9STShJT1MpICYmIFVTRShRVUlDS19MT09LKQorT0JKQ19DTEFTUyBRTFBy ZXZpZXdDb250cm9sbGVyOworT0JKQ19DTEFTUyBfV0tQcmV2aWV3Q29udHJvbGxlckRhdGFTb3Vy Y2U7CitPQkpDX0NMQVNTIF9XS1ByZXZpZXdDb250cm9sbGVyRGVsZWdhdGU7CisjZW5kaWYKIAog bmFtZXNwYWNlIFdlYktpdCB7CiAKQEAgLTM4LDggKzQ1LDE2IEBAIHB1YmxpYzoKICAgICBib29s IGNhblByZXZpZXcoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkgY29uc3Q7CiAgICAgdm9pZCBzaG93 UHJldmlldyhjb25zdCBXZWJDb3JlOjpVUkwmKTsKIAorICAgIHZvaWQgc2VuZFBhZ2VCYWNrKCk7 CisKIHByaXZhdGU6CiAgICAgV2ViUGFnZVByb3h5JiBtX3dlYlBhZ2VQcm94eTsKKworI2lmIFBM QVRGT1JNKElPUykgJiYgVVNFKFFVSUNLX0xPT0spCisgICAgUmV0YWluUHRyPFFMUHJldmlld0Nv bnRyb2xsZXI+IG1fcWxQcmV2aWV3Q29udHJvbGxlcjsKKyAgICBSZXRhaW5QdHI8X1dLUHJldmll d0NvbnRyb2xsZXJEZWxlZ2F0ZT4gbV9xbFByZXZpZXdDb250cm9sbGVyRGVsZWdhdGU7CisgICAg UmV0YWluUHRyPF9XS1ByZXZpZXdDb250cm9sbGVyRGF0YVNvdXJjZT4gbV9xbFByZXZpZXdDb250 cm9sbGVyRGF0YVNvdXJjZTsKKyNlbmRpZgogfTsKIAogfQo=