60991 2011-05-17 14:47:25 -0700 WebKit2: Needs API to set a custom drop target 2011-05-17 16:17:35 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC All RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 bweinstein bweinstein aroben jeffm sfalken oldest_to_newest 405297 0 bweinstein 2011-05-17 14:47:25 -0700 WebKit2 needs an API to set a custom drop target for a view. It exists in WebKit1. <rdar://problem/9090868> 405305 1 93821 bweinstein 2011-05-17 14:54:41 -0700 Created attachment 93821 [PATCH] Fix 405307 2 93821 aroben 2011-05-17 14:56:07 -0700 Comment on attachment 93821 [PATCH] Fix View in context: https://bugs.webkit.org/attachment.cgi?id=93821&action=review > Source/WebKit2/UIProcess/win/WebView.cpp:1128 > +void WebView::setCustomDropTarget(IDropTarget* dropTarget) > +{ > + ::RevokeDragDrop(m_window); > + ::RegisterDragDrop(m_window, dropTarget); > +} If someone passes in 0 here, we should set the drop target back to our standard one. Otherwise clients will have no way to clear their custom drop target. 405311 3 bweinstein 2011-05-17 14:58:49 -0700 (In reply to comment #2) > (From update of attachment 93821 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=93821&action=review > > > Source/WebKit2/UIProcess/win/WebView.cpp:1128 > > +void WebView::setCustomDropTarget(IDropTarget* dropTarget) > > +{ > > + ::RevokeDragDrop(m_window); > > + ::RegisterDragDrop(m_window, dropTarget); > > +} > > If someone passes in 0 here, we should set the drop target back to our standard one. Otherwise clients will have no way to clear their custom drop target. Fixed. New patch coming soon. 405333 4 93832 bweinstein 2011-05-17 15:21:44 -0700 Created attachment 93832 [PATCH] Fix v2 405334 5 93832 aroben 2011-05-17 15:24:31 -0700 Comment on attachment 93832 [PATCH] Fix v2 View in context: https://bugs.webkit.org/attachment.cgi?id=93832&action=review > Source/WebKit2/UIProcess/win/WebView.cpp:1132 > +void WebView::setCustomDropTarget(IDropTarget* dropTarget) > +{ > + ::RevokeDragDrop(m_window); > + > + if (dropTarget) > + ::RegisterDragDrop(m_window, dropTarget); > + else > + ::RegisterDragDrop(m_window, this); > +} This won't work correctly if m_window has been destroyed or the page has already been closed. We shouldn't do anything in those cases. 405338 6 93834 bweinstein 2011-05-17 15:30:32 -0700 Created attachment 93834 [PATCH] Fix v3 405373 7 bweinstein 2011-05-17 16:17:35 -0700 Landed in r86717. 93821 2011-05-17 14:54:41 -0700 2011-05-17 15:21:44 -0700 [PATCH] Fix set_custom_drop_target.patch text/plain 3225 bweinstein SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NzA4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDUtMTcgIEJyaWFuIFdl aW5zdGVpbiAgPGJ3ZWluc3RlaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdDI6IE5lZWRzIEFQSSB0byBzZXQgYSBjdXN0 b20gZHJvcCB0YXJnZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTYwOTkxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MDkwODY4PgorICAgICAgICAK KyAgICAgICAgQWRkIEFQSSB0byBzZXQgYSBjdXN0b20gZHJvcCB0YXJnZXQgb24gYSBXS1ZpZXcu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5jcHA6CisgICAgICAgIChX S1ZpZXdTZXRDdXN0b21Ecm9wVGFyZ2V0KTogQ2FsbCB0aHJvdWdoIHRvIFdlYlZpZXc6OnNldEN1 c3RvbURyb3BUYXJnZXQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaDoK KyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJWaWV3OjpzZXRDdXN0b21Ecm9wVGFyZ2V0KTogUmV2b2tlIHRoZSBjdXJyZW50IGRyb3AgdGFy Z2V0LCBhbmQgcmVnaXN0ZXIgdGhlCisgICAgICAgICAgICBjdXN0b20gb25lLgorICAgICAgICAq IFVJUHJvY2Vzcy93aW4vV2ViVmlldy5oOgorCiAyMDExLTA1LTE3ICBBbmRyZWFzIEtsaW5nICA8 a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENo cmlzdGlhbnNlbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy93aW4vV0tW aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mvd2lu L1dLVmlldy5jcHAJKHJldmlzaW9uIDg2NTgxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL3dpbi9XS1ZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTksMyArMTE5LDggQEAg Ym9vbCBXS1ZpZXdEcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChXSwogICAgIHJldHVybiB0b0lt cGwodmlld1JlZiktPnBhZ2UoKS0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKTsKIH0KIAor dm9pZCBXS1ZpZXdTZXRDdXN0b21Ecm9wVGFyZ2V0KFdLVmlld1JlZiB2aWV3UmVmLCBJRHJvcFRh cmdldCogZHJvcFRhcmdldCkKK3sKKyAgICByZXR1cm4gdG9JbXBsKHZpZXdSZWYpLT5zZXRDdXN0 b21Ecm9wVGFyZ2V0KGRyb3BUYXJnZXQpOworfQorCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy93aW4vV0tWaWV3LmgJKHJldmlzaW9uIDg2NTgxKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtODMs NiArODMsOCBAQCBXS19FWFBPUlQgYm9vbCBXS1ZpZXdJc1BhZ2VPdmVybGF5SW5zdGFsCiBXS19F WFBPUlQgdm9pZCBXS1ZpZXdTZXREcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChXS1ZpZXdSZWYg dmlldywgYm9vbCBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCk7CiBXS19FWFBPUlQgYm9vbCBX S1ZpZXdEcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChXS1ZpZXdSZWYgdmlldyk7CiAKK1dLX0VY UE9SVCB2b2lkIFdLVmlld1NldEN1c3RvbURyb3BUYXJnZXQoV0tWaWV3UmVmIHZpZXcsIElEcm9w VGFyZ2V0Kik7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDg2NTgxKQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTEyMSw2ICsxMTIxLDEyIEBAIHZvaWQgV2ViVmlldzo6dW5hcHBseUVkaXRDb21tYW5kKFdlYkVk aXQKICAgICBjb21tYW5kLT51bmFwcGx5KCk7CiB9CiAKK3ZvaWQgV2ViVmlldzo6c2V0Q3VzdG9t RHJvcFRhcmdldChJRHJvcFRhcmdldCogZHJvcFRhcmdldCkKK3sKKyAgICA6OlJldm9rZURyYWdE cm9wKG1fd2luZG93KTsKKyAgICA6OlJlZ2lzdGVyRHJhZ0Ryb3AobV93aW5kb3csIGRyb3BUYXJn ZXQpOworfQorCiBGbG9hdFJlY3QgV2ViVmlldzo6Y29udmVydFRvRGV2aWNlU3BhY2UoY29uc3Qg RmxvYXRSZWN0JiByZWN0KQogewogICAgIHJldHVybiByZWN0OwpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgJKHJldmlzaW9uIDg2NTgxKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTg5LDYgKzg5LDgg QEAgcHVibGljOgogICAgIHZvaWQgcmVhcHBseUVkaXRDb21tYW5kKFdlYkVkaXRDb21tYW5kUHJv eHkqKTsKICAgICB2b2lkIHVuYXBwbHlFZGl0Q29tbWFuZChXZWJFZGl0Q29tbWFuZFByb3h5Kik7 CiAKKyAgICB2b2lkIHNldEN1c3RvbURyb3BUYXJnZXQoSURyb3BUYXJnZXQqKTsKKwogICAgIC8v IElVbmtub3duCiAgICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFF1ZXJ5SW50 ZXJmYWNlKFJFRklJRCByaWlkLCB2b2lkKiogcHB2T2JqZWN0KTsKICAgICB2aXJ0dWFsIFVMT05H IFNURE1FVEhPRENBTExUWVBFIEFkZFJlZih2b2lkKTsK 93832 2011-05-17 15:21:44 -0700 2011-05-17 15:30:32 -0700 [PATCH] Fix v2 set_custom_drop_target.patch text/plain 3307 bweinstein SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NzA4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDUtMTcgIEJyaWFuIFdl aW5zdGVpbiAgPGJ3ZWluc3RlaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdDI6IE5lZWRzIEFQSSB0byBzZXQgYSBjdXN0 b20gZHJvcCB0YXJnZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTYwOTkxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MDkwODY4PgorICAgICAgICAK KyAgICAgICAgQWRkIEFQSSB0byBzZXQgYSBjdXN0b20gZHJvcCB0YXJnZXQgb24gYSBXS1ZpZXcu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5jcHA6CisgICAgICAgIChX S1ZpZXdTZXRDdXN0b21Ecm9wVGFyZ2V0KTogQ2FsbCB0aHJvdWdoIHRvIFdlYlZpZXc6OnNldEN1 c3RvbURyb3BUYXJnZXQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaDoK KyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJWaWV3OjpzZXRDdXN0b21Ecm9wVGFyZ2V0KTogUmV2b2tlIHRoZSBjdXJyZW50IGRyb3AgdGFy Z2V0LCBhbmQgcmVnaXN0ZXIgdGhlCisgICAgICAgICAgICBjdXN0b20gb25lLgorICAgICAgICAq IFVJUHJvY2Vzcy93aW4vV2ViVmlldy5oOgorCiAyMDExLTA1LTE3ICBBbmRyZWFzIEtsaW5nICA8 a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENo cmlzdGlhbnNlbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy93aW4vV0tW aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mvd2lu L1dLVmlldy5jcHAJKHJldmlzaW9uIDg2NTgxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL3dpbi9XS1ZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTksMyArMTE5LDggQEAg Ym9vbCBXS1ZpZXdEcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChXSwogICAgIHJldHVybiB0b0lt cGwodmlld1JlZiktPnBhZ2UoKS0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKTsKIH0KIAor dm9pZCBXS1ZpZXdTZXRDdXN0b21Ecm9wVGFyZ2V0KFdLVmlld1JlZiB2aWV3UmVmLCBJRHJvcFRh cmdldCogZHJvcFRhcmdldCkKK3sKKyAgICByZXR1cm4gdG9JbXBsKHZpZXdSZWYpLT5zZXRDdXN0 b21Ecm9wVGFyZ2V0KGRyb3BUYXJnZXQpOworfQorCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy93aW4vV0tWaWV3LmgJKHJldmlzaW9uIDg2NTgxKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtODMs NiArODMsOCBAQCBXS19FWFBPUlQgYm9vbCBXS1ZpZXdJc1BhZ2VPdmVybGF5SW5zdGFsCiBXS19F WFBPUlQgdm9pZCBXS1ZpZXdTZXREcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChXS1ZpZXdSZWYg dmlldywgYm9vbCBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCk7CiBXS19FWFBPUlQgYm9vbCBX S1ZpZXdEcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChXS1ZpZXdSZWYgdmlldyk7CiAKK1dLX0VY UE9SVCB2b2lkIFdLVmlld1NldEN1c3RvbURyb3BUYXJnZXQoV0tWaWV3UmVmIHZpZXcsIElEcm9w VGFyZ2V0Kik7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDg2NTgxKQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTEyMSw2ICsxMTIxLDE2IEBAIHZvaWQgV2ViVmlldzo6dW5hcHBseUVkaXRDb21tYW5kKFdlYkVk aXQKICAgICBjb21tYW5kLT51bmFwcGx5KCk7CiB9CiAKK3ZvaWQgV2ViVmlldzo6c2V0Q3VzdG9t RHJvcFRhcmdldChJRHJvcFRhcmdldCogZHJvcFRhcmdldCkKK3sKKyAgICA6OlJldm9rZURyYWdE cm9wKG1fd2luZG93KTsKKworICAgIGlmIChkcm9wVGFyZ2V0KQorICAgICAgICA6OlJlZ2lzdGVy RHJhZ0Ryb3AobV93aW5kb3csIGRyb3BUYXJnZXQpOworICAgIGVsc2UKKyAgICAgICAgOjpSZWdp c3RlckRyYWdEcm9wKG1fd2luZG93LCB0aGlzKTsKK30KKwogRmxvYXRSZWN0IFdlYlZpZXc6OmNv bnZlcnRUb0RldmljZVNwYWNlKGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKIHsKICAgICByZXR1cm4g cmVjdDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCShyZXZpc2lv biA4NjU4MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC04OSw2ICs4OSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlYXBwbHlFZGl0 Q29tbWFuZChXZWJFZGl0Q29tbWFuZFByb3h5Kik7CiAgICAgdm9pZCB1bmFwcGx5RWRpdENvbW1h bmQoV2ViRWRpdENvbW1hbmRQcm94eSopOwogCisgICAgdm9pZCBzZXRDdXN0b21Ecm9wVGFyZ2V0 KElEcm9wVGFyZ2V0Kik7CisKICAgICAvLyBJVW5rbm93bgogICAgIHZpcnR1YWwgSFJFU1VMVCBT VERNRVRIT0RDQUxMVFlQRSBRdWVyeUludGVyZmFjZShSRUZJSUQgcmlpZCwgdm9pZCoqIHBwdk9i amVjdCk7CiAgICAgdmlydHVhbCBVTE9ORyBTVERNRVRIT0RDQUxMVFlQRSBBZGRSZWYodm9pZCk7 Cg== 93834 2011-05-17 15:30:32 -0700 2011-05-17 15:32:46 -0700 [PATCH] Fix v3 set_custom_drop_target.patch text/plain 3368 bweinstein SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NzA4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDUtMTcgIEJyaWFuIFdl aW5zdGVpbiAgPGJ3ZWluc3RlaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdDI6IE5lZWRzIEFQSSB0byBzZXQgYSBjdXN0 b20gZHJvcCB0YXJnZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTYwOTkxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MDkwODY4PgorICAgICAgICAK KyAgICAgICAgQWRkIEFQSSB0byBzZXQgYSBjdXN0b20gZHJvcCB0YXJnZXQgb24gYSBXS1ZpZXcu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5jcHA6CisgICAgICAgIChX S1ZpZXdTZXRDdXN0b21Ecm9wVGFyZ2V0KTogQ2FsbCB0aHJvdWdoIHRvIFdlYlZpZXc6OnNldEN1 c3RvbURyb3BUYXJnZXQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaDoK KyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJWaWV3OjpzZXRDdXN0b21Ecm9wVGFyZ2V0KTogUmV2b2tlIHRoZSBjdXJyZW50IGRyb3AgdGFy Z2V0LCBhbmQgcmVnaXN0ZXIgdGhlCisgICAgICAgICAgICBjdXN0b20gb25lLgorICAgICAgICAq IFVJUHJvY2Vzcy93aW4vV2ViVmlldy5oOgorCiAyMDExLTA1LTE3ICBBbmRyZWFzIEtsaW5nICA8 a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENo cmlzdGlhbnNlbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy93aW4vV0tW aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mvd2lu L1dLVmlldy5jcHAJKHJldmlzaW9uIDg2NTgxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL3dpbi9XS1ZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTksMyArMTE5LDggQEAg Ym9vbCBXS1ZpZXdEcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChXSwogICAgIHJldHVybiB0b0lt cGwodmlld1JlZiktPnBhZ2UoKS0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKTsKIH0KIAor dm9pZCBXS1ZpZXdTZXRDdXN0b21Ecm9wVGFyZ2V0KFdLVmlld1JlZiB2aWV3UmVmLCBJRHJvcFRh cmdldCogZHJvcFRhcmdldCkKK3sKKyAgICByZXR1cm4gdG9JbXBsKHZpZXdSZWYpLT5zZXRDdXN0 b21Ecm9wVGFyZ2V0KGRyb3BUYXJnZXQpOworfQorCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy93aW4vV0tWaWV3LmgJKHJldmlzaW9uIDg2NTgxKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtODMs NiArODMsOCBAQCBXS19FWFBPUlQgYm9vbCBXS1ZpZXdJc1BhZ2VPdmVybGF5SW5zdGFsCiBXS19F WFBPUlQgdm9pZCBXS1ZpZXdTZXREcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChXS1ZpZXdSZWYg dmlldywgYm9vbCBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCk7CiBXS19FWFBPUlQgYm9vbCBX S1ZpZXdEcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChXS1ZpZXdSZWYgdmlldyk7CiAKK1dLX0VY UE9SVCB2b2lkIFdLVmlld1NldEN1c3RvbURyb3BUYXJnZXQoV0tWaWV3UmVmIHZpZXcsIElEcm9w VGFyZ2V0Kik7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDg2NTgxKQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTEyMSw2ICsxMTIxLDE5IEBAIHZvaWQgV2ViVmlldzo6dW5hcHBseUVkaXRDb21tYW5kKFdlYkVk aXQKICAgICBjb21tYW5kLT51bmFwcGx5KCk7CiB9CiAKK3ZvaWQgV2ViVmlldzo6c2V0Q3VzdG9t RHJvcFRhcmdldChJRHJvcFRhcmdldCogZHJvcFRhcmdldCkKK3sKKyAgICBpZiAoIW1fcGFnZS0+ aXNWYWxpZCgpIHx8ICFtX3dpbmRvdykKKyAgICAgICAgcmV0dXJuOworCisgICAgOjpSZXZva2VE cmFnRHJvcChtX3dpbmRvdyk7CisKKyAgICBpZiAoZHJvcFRhcmdldCkKKyAgICAgICAgOjpSZWdp c3RlckRyYWdEcm9wKG1fd2luZG93LCBkcm9wVGFyZ2V0KTsKKyAgICBlbHNlCisgICAgICAgIDo6 UmVnaXN0ZXJEcmFnRHJvcChtX3dpbmRvdywgdGhpcyk7Cit9CisKIEZsb2F0UmVjdCBXZWJWaWV3 Ojpjb252ZXJ0VG9EZXZpY2VTcGFjZShjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiB7CiAgICAgcmV0 dXJuIHJlY3Q7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAkocmV2 aXNpb24gODY1ODEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtODksNiArODksOCBAQCBwdWJsaWM6CiAgICAgdm9pZCByZWFwcGx5 RWRpdENvbW1hbmQoV2ViRWRpdENvbW1hbmRQcm94eSopOwogICAgIHZvaWQgdW5hcHBseUVkaXRD b21tYW5kKFdlYkVkaXRDb21tYW5kUHJveHkqKTsKIAorICAgIHZvaWQgc2V0Q3VzdG9tRHJvcFRh cmdldChJRHJvcFRhcmdldCopOworCiAgICAgLy8gSVVua25vd24KICAgICB2aXJ0dWFsIEhSRVNV TFQgU1RETUVUSE9EQ0FMTFRZUEUgUXVlcnlJbnRlcmZhY2UoUkVGSUlEIHJpaWQsIHZvaWQqKiBw cHZPYmplY3QpOwogICAgIHZpcnR1YWwgVUxPTkcgU1RETUVUSE9EQ0FMTFRZUEUgQWRkUmVmKHZv aWQpOwo=