140515 2015-01-15 15:09:17 -0800 [WK2] Add support for fully editable WKWebView 2015-01-15 15:42:20 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified OS X 10.10 RESOLVED FIXED P2 Normal --- 1 enrica enrica andersca sam oldest_to_newest 1061652 0 enrica 2015-01-15 15:09:17 -0800 This tracks the work required to support in WebKit2 the mode where the WKWebView is fully editable. 1061660 1 244718 enrica 2015-01-15 15:24:38 -0800 Created attachment 244718 Patch 1061661 2 244718 andersca 2015-01-15 15:29:52 -0800 Comment on attachment 244718 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=244718&action=review What's up with the WKView.mm changes? > Source/WebKit2/UIProcess/WebPageProxy.cpp:1403 > + m_process->send(Messages::WebPage::SetEditable(editable), m_pageID); I think you can bail if m_process->isValid() is false. > Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h:85 > +@property (nonatomic, setter=_setEditable:) BOOL _editable; getter should be _isEditable here. Property should still be _editable. > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:931 > + // If the WKWebView is made editable and the selection is empty, set it to something. I'd just say "page" instead of WKWebView here. 1061665 3 enrica 2015-01-15 15:38:48 -0800 Thanks for the review. I'll address your comments before landing. > > What's up with the WKView.mm changes? > I noticed that some of the methods listed in the comment had been implemented. 1061667 4 enrica 2015-01-15 15:42:20 -0800 Committed revision 178536. 244718 2015-01-15 15:24:38 -0800 2015-01-15 15:32:42 -0800 Patch wkwebviewEditable.txt text/plain 9523 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3ODUzNSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE1LTAxLTE1ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gQWRkIHN1cHBvcnQg Zm9yIGZ1bGx5IGVkaXRhYmxlIFdLV2ViVmlldy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDUxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdLV2ViVmlldyBoYXMgbm93IGEgbmV3IHByb3BlcnR5IChf ZWRpdGFibGUpIHRvIGNvbnRyb2wKKyAgICAgICAgdGhlIGVkaXRhYmlsaXR5IG9mIHRoZSBlbnRp cmUgY29udGVudC4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2Rl KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToK KyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcg X2VkaXRhYmxlXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfc2V0RWRpdGFibGU6XSk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0RWRpdGFibGUpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6CisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Omlz RWRpdGFibGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0RWRpdGFibGUpOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UubWVzc2FnZXMuaW46CisKIDIwMTUtMDEtMTUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVhcmluZyB0aGUgd2Vic2l0ZSBkYXRhIHN0b3JlIHNo b3VsZCBjbGVhciBsb2NhbCBzdG9yYWdlCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCShyZXZpc2lvbiAxNzg0NjEpCisr KyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAgdm9pZCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzOjplbmNvZGUoSQogICAgIGVuY29kZXIuZW5jb2RlRW51bShkcmF3aW5nQXJlYVR5cGUpOwog ICAgIGVuY29kZXIgPDwgcGFnZUdyb3VwRGF0YTsKICAgICBlbmNvZGVyIDw8IGRyYXdzQmFja2dy b3VuZDsKKyAgICBlbmNvZGVyIDw8IGlzRWRpdGFibGU7CiAgICAgZW5jb2RlciA8PCBkcmF3c1Ry YW5zcGFyZW50QmFja2dyb3VuZDsKICAgICBlbmNvZGVyIDw8IHVuZGVybGF5Q29sb3I7CiAgICAg ZW5jb2RlciA8PCB1c2VGaXhlZExheW91dDsKQEAgLTk1LDYgKzk2LDggQEAgYm9vbCBXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg aWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmRyYXdzQmFja2dyb3VuZCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNFZGl0 YWJsZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBh cmFtZXRlcnMuZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLnVuZGVybGF5Q29sb3IpKQpJ bmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1l dGVycy5oCShyZXZpc2lvbiAxNzg0NjEpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC02Niw2ICs2Niw3IEBAIHN0 cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKIAogICAgIGJvb2wgZHJhd3NCYWNrZ3Jv dW5kOwogICAgIGJvb2wgZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQ7CisgICAgYm9vbCBpc0Vk aXRhYmxlOwogCiAgICAgV2ViQ29yZTo6Q29sb3IgdW5kZXJsYXlDb2xvcjsKIApJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE3ODQ2MSkK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yOTEsNiArMjkxLDcgQEAgV2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkoUGFnZUNs aWVudCYgcAogI2lmIFBMQVRGT1JNKE1BQykgJiYgIVVTRShBU1lOQ19OU1RFWFRJTlBVVENMSUVO VCkKICAgICAsIG1fdGVtcG9yYXJpbHlDbG9zZWRDb21wb3NpdGlvbihmYWxzZSkKICNlbmRpZgor ICAgICwgbV9pc0VkaXRhYmxlKGZhbHNlKQogICAgICwgbV90ZXh0Wm9vbUZhY3RvcigxKQogICAg ICwgbV9wYWdlWm9vbUZhY3RvcigxKQogICAgICwgbV9wYWdlU2NhbGVGYWN0b3IoMSkKQEAgLTEz OTQsNiArMTM5NSwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZXhlY3V0ZUVkaXRDb21tYW5kKGNv CiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpFeGVjdXRlRWRpdENvbW1h bmQoY29tbWFuZE5hbWUpLCBtX3BhZ2VJRCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRF ZGl0YWJsZShib29sIGVkaXRhYmxlKQoreworICAgIGlmIChlZGl0YWJsZSA9PSBtX2lzRWRpdGFi bGUpCisgICAgICAgIHJldHVybjsKKyAgICBtX2lzRWRpdGFibGUgPSBlZGl0YWJsZTsKKyAgICBt X3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEVkaXRhYmxlKGVkaXRhYmxlKSwg bV9wYWdlSUQpOworfQorCiAjaWYgIVBMQVRGT1JNKElPUykKIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRDb21taXRMYXllclRyZWUoY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mKQogewpA QCAtNDYxNSw2ICs0NjI0LDcgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJv eHk6OgogICAgIHBhcmFtZXRlcnMuc3RvcmUgPSBwcmVmZXJlbmNlc1N0b3JlKCk7CiAgICAgcGFy YW1ldGVycy5wYWdlR3JvdXBEYXRhID0gbV9wYWdlR3JvdXAtPmRhdGEoKTsKICAgICBwYXJhbWV0 ZXJzLmRyYXdzQmFja2dyb3VuZCA9IG1fZHJhd3NCYWNrZ3JvdW5kOworICAgIHBhcmFtZXRlcnMu aXNFZGl0YWJsZSA9IG1faXNFZGl0YWJsZTsKICAgICBwYXJhbWV0ZXJzLmRyYXdzVHJhbnNwYXJl bnRCYWNrZ3JvdW5kID0gbV9kcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZDsKICAgICBwYXJhbWV0 ZXJzLnVuZGVybGF5Q29sb3IgPSBtX3VuZGVybGF5Q29sb3I7CiAgICAgcGFyYW1ldGVycy51c2VG aXhlZExheW91dCA9IG1fdXNlRml4ZWRMYXlvdXQ7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAxNzg0NjEpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQwOSw2ICs0MDksOCBA QCBwdWJsaWM6CiAgICAgCiAgICAgYm9vbCBtYWludGFpbnNJbmFjdGl2ZVNlbGVjdGlvbigpIGNv bnN0IHsgcmV0dXJuIG1fbWFpbnRhaW5zSW5hY3RpdmVTZWxlY3Rpb247IH0KICAgICB2b2lkIHNl dE1haW50YWluc0luYWN0aXZlU2VsZWN0aW9uKGJvb2wpOworICAgIHZvaWQgc2V0RWRpdGFibGUo Ym9vbCk7CisgICAgYm9vbCBpc0VkaXRhYmxlKCkgY29uc3QgeyByZXR1cm4gbV9pc0VkaXRhYmxl OyB9CiAKICNpZiBQTEFURk9STShJT1MpCiAgICAgdm9pZCBleGVjdXRlRWRpdENvbW1hbmQoY29u c3QgU3RyaW5nJiBjb21tYW5kTmFtZSwgc3RkOjpmdW5jdGlvbjx2b2lkIChDYWxsYmFja0Jhc2U6 OkVycm9yKT4pOwpAQCAtMTQ0NCw2ICsxNDQ2LDcgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgbV90 b29sVGlwOwogCiAgICAgRWRpdG9yU3RhdGUgbV9lZGl0b3JTdGF0ZTsKKyAgICBib29sIG1faXNF ZGl0YWJsZTsKICNpZiBQTEFURk9STShNQUMpICYmICFVU0UoQVNZTkNfTlNURVhUSU5QVVRDTElF TlQpCiAgICAgYm9vbCBtX3RlbXBvcmFyaWx5Q2xvc2VkQ29tcG9zaXRpb247IC8vIEVkaXRvciBz dGF0ZSBjaGFuZ2VkIGZyb20gaGFzQ29tcG9zaXRpb24gdG8gIWhhc0NvbXBvc2l0aW9uLCBidXQg dGhhdCB3YXMgb25seSB3aXRoIHNob3VsZElnbm9yZUNvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdl IHlldC4KICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW0JKHJldmlzaW9uIDE3ODQ2MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjA1LDYg KzE2MDUsMTYgQEAgLSAodm9pZClfc2V0SWdub3Jlc05vbldoZWVsRXZlbnRzOihCT09MKQogCiBA aW1wbGVtZW50YXRpb24gV0tXZWJWaWV3IChXS1ByaXZhdGUpCiAKKy0gKEJPT0wpX2VkaXRhYmxl Cit7CisgICAgcmV0dXJuIF9wYWdlLT5pc0VkaXRhYmxlKCk7Cit9CisKKy0gKHZvaWQpX3NldEVk aXRhYmxlOihCT09MKWVkaXRhYmxlCit7CisgICAgX3BhZ2UtPnNldEVkaXRhYmxlKGVkaXRhYmxl KTsKK30KKwogLSAoX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkgKilfcmVtb3RlT2JqZWN0UmVnaXN0 cnkKIHsKICAgICBpZiAoIV9yZW1vdGVPYmplY3RSZWdpc3RyeSkgewpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgJ KHJldmlzaW9uIDE3ODQ2MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3UHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04Miw2ICs4Miw4IEBAIHR5cGVk ZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tGaW5kT3AKIAogQHByb3BlcnR5IChub25hdG9t aWMsIHJlYWRvbmx5KSBwaWRfdCBfd2ViUHJvY2Vzc0lkZW50aWZpZXI7CiAKK0Bwcm9wZXJ0eSAo bm9uYXRvbWljLCBzZXR0ZXI9X3NldEVkaXRhYmxlOikgQk9PTCBfZWRpdGFibGU7CisKIC8vIEZJ WE1FOiBSZW1vdmUgdGhlc2Ugb25jZSBub2JvZHkgaXMgdXNpbmcgdGhlbS4KIEBwcm9wZXJ0eSAo bm9uYXRvbWljLCByZWFkb25seSkgTlNEYXRhICpfc2Vzc2lvblN0YXRlRGF0YTsKIC0gKHZvaWQp X3Jlc3RvcmVGcm9tU2Vzc2lvblN0YXRlRGF0YTooTlNEYXRhICopc2Vzc2lvblN0YXRlRGF0YTsK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0JKHJldmlz aW9uIDE3ODQ2MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bQkod29ya2luZyBjb3B5KQpAQCAtNzQzLDExICs3NDMsOSBAQCBpbmRpdmlkdWFsIG1ldGhvZHMg aGVyZSB3aXRoIE1hYy1zcGVjaWZpCiAKIEVkaXRpbmctcmVsYXRlZCBtZXRob2RzIHN0aWxsIHVu aW1wbGVtZW50ZWQgdGhhdCBhcmUgaW1wbGVtZW50ZWQgaW4gV2ViS2l0MToKIAotLSAodm9pZClj YXBpdGFsaXplV29yZDooaWQpc2VuZGVyOwogLSAodm9pZCljaGFuZ2VGb250OihpZClzZW5kZXI7 CiAtICh2b2lkKWNvbXBsZXRlOihpZClzZW5kZXI7CiAtICh2b2lkKWNvcHlGb250OihpZClzZW5k ZXI7Ci0tICh2b2lkKWxvd2VyY2FzZVdvcmQ6KGlkKXNlbmRlcjsKIC0gKHZvaWQpbWFrZUJhc2VX cml0aW5nRGlyZWN0aW9uTGVmdFRvUmlnaHQ6KGlkKXNlbmRlcjsKIC0gKHZvaWQpbWFrZUJhc2VX cml0aW5nRGlyZWN0aW9uTmF0dXJhbDooaWQpc2VuZGVyOwogLSAodm9pZCltYWtlQmFzZVdyaXRp bmdEaXJlY3Rpb25SaWdodFRvTGVmdDooaWQpc2VuZGVyOwpAQCAtNzU1LDcgKzc1Myw2IEBAIC0g KHZvaWQpcGFzdGVGb250OihpZClzZW5kZXI7CiAtICh2b2lkKXNjcm9sbExpbmVEb3duOihpZClz ZW5kZXI7CiAtICh2b2lkKXNjcm9sbExpbmVVcDooaWQpc2VuZGVyOwogLSAodm9pZClzaG93R3Vl c3NQYW5lbDooaWQpc2VuZGVyOwotLSAodm9pZCl1cHBlcmNhc2VXb3JkOihpZClzZW5kZXI7CiAK IFNvbWUgb3RoZXIgZWRpdGluZy1yZWxhdGVkIG1ldGhvZHMgc3RpbGwgdW5pbXBsZW1lbnRlZDoK IApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAkocmV2aXNpb24gMTc4NDYxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MjEsNiArOTIxLDE5IEBAIHZvaWQgV2Vi UGFnZTo6ZXhlY3V0ZUVkaXRpbmdDb21tYW5kKGNvbnMKICAgICBmcmFtZS5lZGl0b3IoKS5jb21t YW5kKGNvbW1hbmROYW1lKS5leGVjdXRlKGFyZ3VtZW50KTsKIH0KIAordm9pZCBXZWJQYWdlOjpz ZXRFZGl0YWJsZShib29sIGVkaXRhYmxlKQoreworICAgIG1fcGFnZS0+c2V0RWRpdGFibGUoZWRp dGFibGUpOworICAgIG1fcGFnZS0+c2V0VGFiS2V5Q3ljbGVzVGhyb3VnaEVsZW1lbnRzKCFlZGl0 YWJsZSk7CisgICAgRnJhbWUmIGZyYW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1 c2VkT3JNYWluRnJhbWUoKTsKKyAgICBpZiAoZWRpdGFibGUpIHsKKyAgICAgICAgZnJhbWUuZWRp dG9yKCkuYXBwbHlFZGl0aW5nU3R5bGVUb0JvZHlFbGVtZW50KCk7CisgICAgICAgIC8vIElmIHRo ZSBXS1dlYlZpZXcgaXMgbWFkZSBlZGl0YWJsZSBhbmQgdGhlIHNlbGVjdGlvbiBpcyBlbXB0eSwg c2V0IGl0IHRvIHNvbWV0aGluZy4KKyAgICAgICAgaWYgKGZyYW1lLnNlbGVjdGlvbigpLmlzTm9u ZSgpKQorICAgICAgICAgICAgZnJhbWUuc2VsZWN0aW9uKCkuc2V0U2VsZWN0aW9uRnJvbU5vbmUo KTsKKyAgICB9Cit9CisKIGJvb2wgV2ViUGFnZTo6aXNFZGl0aW5nQ29tbWFuZEVuYWJsZWQoY29u c3QgU3RyaW5nJiBjb21tYW5kTmFtZSkKIHsKICAgICBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZv Y3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwpJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiAxNzg0NjEpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCSh3b3JraW5nIGNvcHkp CkBAIC05MzMsNiArOTMzLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldFZpZXdTdGF0ZShXZWJD b3JlOjpWaWV3U3RhdGU6OkZsYWdzLCBib29sIHdhbnRzRGlkVXBkYXRlVmlld1N0YXRlLCBjb25z dCBWZWN0b3I8dWludDY0X3Q+JiBjYWxsYmFja0lEcyk7CiAgICAgdm9pZCB2YWxpZGF0ZUNvbW1h bmQoY29uc3QgU3RyaW5nJiwgdWludDY0X3QpOwogICAgIHZvaWQgZXhlY3V0ZUVkaXRDb21tYW5k KGNvbnN0IFN0cmluZyYpOworICAgIHZvaWQgc2V0RWRpdGFibGUoYm9vbCk7CiAKICAgICB2b2lk IHVwZGF0ZVVzZXJBY3Rpdml0eSgpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTc4NDYx KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMu aW4JKHdvcmtpbmcgY29weSkKQEAgLTE3OSw2ICsxNzksNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdl IExlZ2FjeVJlY2VpdmVyIHsKICAgICBDbG9zZSgpCiAgICAgVHJ5Q2xvc2UoKQogCisgICAgU2V0 RWRpdGFibGUoYm9vbCBlZGl0YWJsZSkKICAgICBWYWxpZGF0ZUNvbW1hbmQoU3RyaW5nIG5hbWUs IHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAgICAgRXhlY3V0ZUVkaXRDb21tYW5kKFN0cmluZyBuYW1l KQogCg==