140967 2015-01-27 15:54:28 -0800 Immediate action gesture recognizer still doesn't work well with IB 2015-01-27 17:07:18 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin mitz thorton oldest_to_newest 1064711 0 bdakin 2015-01-27 15:54:28 -0800 Immediate action gesture recognizer still doesn't work well with IB rdar://problem/19621509 1064712 1 245489 bdakin 2015-01-27 16:00:11 -0800 Created attachment 245489 Patch 1064719 2 245489 thorton 2015-01-27 16:30:16 -0800 Comment on attachment 245489 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245489&action=review > Source/WebKit2/UIProcess/API/mac/WKView.mm:2571 > +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 It looks to me (with a tiny test app) like you're not guaranteed to move to a nil window when moving between windows, so I think this needs to be restructured to avoid re-adding the GR. > Source/WebKit2/UIProcess/API/mac/WKView.mm:2576 > + [self addGestureRecognizer:_data->_immediateActionGestureRecognizer.get()]; We could keep the controller/GR instantiation in init/commoninit and just add/remove here, for minimal change, if you want. > Source/WebKit2/UIProcess/API/mac/WKView.mm:2593 > + if (NSClassFromString(@"NSImmediateActionGestureRecognizer")) This could check _immediateActionGestureRecognizer instead of this. 1064729 3 245494 bdakin 2015-01-27 16:53:52 -0800 Created attachment 245494 Patch 1064731 4 245494 thorton 2015-01-27 16:59:38 -0800 Comment on attachment 245494 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245494&action=review > Source/WebKit/mac/WebView/WebView.mm:5300 > + if (![[self gestureRecognizers] containsObject:recognizer]) As discussed, I think we should not add the GR if _data->_ignoresNonWheelEvents is true. 1064735 5 bdakin 2015-01-27 17:07:18 -0800 Thank you! http://trac.webkit.org/changeset/179230 245489 2015-01-27 16:00:11 -0800 2015-01-27 16:53:52 -0800 Patch for-review.txt text/plain 7913 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTIyNikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTAxLTI3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBJbW1lZGlhdGUgYWN0aW9uIGdlc3R1 cmUgcmVjb2duaXplciBzdGlsbCBkb2Vzbid0IHdvcmsgd2VsbCB3aXRoIElCCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA5NjcKKyAgICAgICAgLWFu ZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8vcHJvYmxlbS8xOTYyMTUwOQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHNob3VsZCBhZGQg KG9yIHJlbW92ZSkgdGhlIGdlc3R1cmUgcmVjb2duaXplciBpbiB2aWV3RGlkTW92ZVRvV2luZG93 IGJlY2F1c2UgCisgICAgICAgIGluaXRXaXRoRnJhbWUgaXQgdG9vIGVhcmx5IGFuZCBJQiBtaWdo dCBtZXNzIHdpdGggaXQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgor ICAgICAgICAoLVtXS1ZpZXcgdmlld0RpZE1vdmVUb1dpbmRvd10pOgorICAgICAgICAoLVtXS1Zp ZXcgaW5pdFdpdGhGcmFtZTpwcm9jZXNzUG9vbDpjb25maWd1cmF0aW9uOndlYlZpZXc6XSk6CisK IDIwMTUtMDEtMjcgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIElu dm9raW5nIGFuIGltbWVkaWF0ZSBhY3Rpb24gb24gbGluayBvZnRlbiBkaXNtaXNzZXMgc2VsZWN0 aW9uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShy ZXZpc2lvbiAxNzkxMzcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTI1NjcsNiArMjU2NywxNSBAQCAtICh2b2lkKXZpZXdE aWRNb3ZlVG9XaW5kb3cKICAgICAgICAgfQogCiAgICAgICAgIFtzZWxmIF9hY2Nlc3NpYmlsaXR5 UmVnaXN0ZXJVSVByb2Nlc3NUb2tlbnNdOworCisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMDEwMDAKKyAgICAgICAgaWYgKENsYXNzIGdlc3R1cmVDbGFzcyA9IE5TQ2xh c3NGcm9tU3RyaW5nKEAiTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciIpKSB7Cisg ICAgICAgICAgICBfZGF0YS0+X2ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyID0gYWRv cHROUyhbKE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIgKilbZ2VzdHVyZUNsYXNz IGFsbG9jXSBpbml0V2l0aFRhcmdldDpuaWwgYWN0aW9uOk5VTExdKTsKKyAgICAgICAgICAgIF9k YXRhLT5faW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciA9IGFkb3B0TlMoW1tXS0ltbWVkaWF0ZUFj dGlvbkNvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoUGFnZToqX2RhdGEtPl9wYWdlIHZpZXc6c2Vs ZiByZWNvZ25pemVyOl9kYXRhLT5faW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIuZ2V0 KCldKTsKKyAgICAgICAgICAgIFtfZGF0YS0+X2ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25p emVyIHNldERlbGVnYXRlOl9kYXRhLT5faW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5nZXQoKV07 CisgICAgICAgICAgICBbc2VsZiBhZGRHZXN0dXJlUmVjb2duaXplcjpfZGF0YS0+X2ltbWVkaWF0 ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKKyAgICAgICAgfQorI2VuZGlmCiAgICAg fSBlbHNlIHsKICAgICAgICAgVmlld1N0YXRlOjpGbGFncyB2aWV3U3RhdGVDaGFuZ2VzID0gVmll d1N0YXRlOjpXaW5kb3dJc0FjdGl2ZSB8IFZpZXdTdGF0ZTo6SXNWaXNpYmxlOwogICAgICAgICBp ZiAoW3NlbGYgaXNEZWZlcnJpbmdWaWV3SW5XaW5kb3dDaGFuZ2VzXSkKQEAgLTI1NzksNiArMjU4 OCwxMSBAQCAtICh2b2lkKXZpZXdEaWRNb3ZlVG9XaW5kb3cKICAgICAgICAgX2RhdGEtPl9mbGFn c0NoYW5nZWRFdmVudE1vbml0b3IgPSBuaWw7CiAKICAgICAgICAgW3NlbGYgX2Rpc21pc3NDb250 ZW50UmVsYXRpdmVDaGlsZFdpbmRvd3NdOworCisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMDEwMDAKKyAgICAgICAgaWYgKE5TQ2xhc3NGcm9tU3RyaW5nKEAiTlNJbW1l ZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciIpKQorICAgICAgICAgICAgW3NlbGYgcmVtb3Zl R2VzdHVyZVJlY29nbml6ZXI6X2RhdGEtPl9pbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXpl ci5nZXQoKV07CisjZW5kaWYKICAgICB9CiAKICAgICBfZGF0YS0+X3BhZ2UtPnNldEludHJpbnNp Y0RldmljZVNjYWxlRmFjdG9yKFtzZWxmIF9pbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3Rvcl0pOwpA QCAtMzYyMCwxMyArMzYzNCw2IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aEZyYW1lOihOU1Jl Y3QpZnIKICAgICAgICAgc2VsZi5fYWN0aW9uTWVudS5kZWxlZ2F0ZSA9IF9kYXRhLT5fYWN0aW9u TWVudUNvbnRyb2xsZXIuZ2V0KCk7CiAgICAgICAgIHNlbGYuX2FjdGlvbk1lbnUuYXV0b2VuYWJs ZXNJdGVtcyA9IE5POwogICAgIH0KLQotICAgIGlmIChDbGFzcyBnZXN0dXJlQ2xhc3MgPSBOU0Ns YXNzRnJvbVN0cmluZyhAIk5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIiKSkgewot ICAgICAgICBfZGF0YS0+X2ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyID0gYWRvcHRO UyhbKE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIgKilbZ2VzdHVyZUNsYXNzIGFs bG9jXSBpbml0V2l0aFRhcmdldDpuaWwgYWN0aW9uOk5VTExdKTsKLSAgICAgICAgX2RhdGEtPl9p bW1lZGlhdGVBY3Rpb25Db250cm9sbGVyID0gYWRvcHROUyhbW1dLSW1tZWRpYXRlQWN0aW9uQ29u dHJvbGxlciBhbGxvY10gaW5pdFdpdGhQYWdlOipfZGF0YS0+X3BhZ2UgdmlldzpzZWxmIHJlY29n bml6ZXI6X2RhdGEtPl9pbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplci5nZXQoKV0pOwot ICAgICAgICBbX2RhdGEtPl9pbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciBzZXREZWxl Z2F0ZTpfZGF0YS0+X2ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuZ2V0KCldOwotICAgICAgICBb c2VsZiBhZGRHZXN0dXJlUmVjb2duaXplcjpfZGF0YS0+X2ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVS ZWNvZ25pemVyLmdldCgpXTsKLSAgICB9CiAjZW5kaWYKIAogICAgIHJldHVybiBzZWxmOwpJbmRl eDogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMTc5MjI2KQorKysgU291cmNlL1dlYktpdC9tYWMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTUtMDEtMjcgIEJl dGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIEltbWVkaWF0ZSBhY3Rpb24g Z2VzdHVyZSByZWNvZ25pemVyIHN0aWxsIGRvZXNuJ3Qgd29yayB3ZWxsIHdpdGggSUIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDk2NworICAgICAg ICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE5NjIxNTA5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugc2hvdWxk IGFkZCAob3IgcmVtb3ZlKSB0aGUgZ2VzdHVyZSByZWNvZ25pemVyIGluIHZpZXdEaWRNb3ZlVG9X aW5kb3cgYmVjYXVzZSAKKyAgICAgICAgaW5pdFdpdGhGcmFtZSBpdCB0b28gZWFybHkgYW5kIElC IG1pZ2h0IG1lc3Mgd2l0aCBpdC4KKyAgICAgICAgKiBXZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlv bkNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRy b2xsZXIubW06CisgICAgICAgICgtW1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgaW1tZWRp YXRlQWN0aW9uUmVjb2duaXplcl0pOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAg ICAgICAgKC1bV2ViVmlldyBfY29tbW9uSW5pdGlhbGl6YXRpb25XaXRoRnJhbWVOYW1lOmdyb3Vw TmFtZTpdKToKKyAgICAgICAgKC1bV2ViVmlldyB2aWV3RGlkTW92ZVRvV2luZG93XSk6CisKIDIw MTUtMDEtMjcgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXhl ZCBidWlsZGluZyBwcm9qZWN0cyB0aGF0IGltcG9ydCBXZWJWaWV3Lmggd2l0aCBXS19FTkFCTEVf Rk9STUFMX0RFTEVHQVRFX1BST1RPQ09MUy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oCShyZXZpc2lv biAxNzkxMzcpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlv bkNvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNTMsNiArNTMsOCBAQCBAaW50ZXJmYWNl IFdlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgCiAtICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcg Kil3ZWJWaWV3IHdpbGxIYW5kbGVNb3VzZURvd246KE5TRXZlbnQgKilldmVudDsKIC0gKHZvaWQp d2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcgZGlkSGFuZGxlU2Nyb2xsV2hlZWw6KE5TRXZlbnQg KilldmVudDsKIAorLSAoTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciAqKWltbWVk aWF0ZUFjdGlvblJlY29nbml6ZXI7CisKIEBlbmQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykg JiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEwMDAKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNv bnRyb2xsZXIubW0JKHJldmlzaW9uIDE3OTEzNykKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMTA0 LDYgKzEwNCwxMSBAQCAtICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IGRpZEhhCiAg ICAgW3NlbGYgX2NsZWFySW1tZWRpYXRlQWN0aW9uU3RhdGVdOwogfQogCistIChOU0ltbWVkaWF0 ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyICopaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplcgorewor ICAgIHJldHVybiBfaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplci5nZXQoKTsKK30KKwogLSAodm9p ZClfY2FuY2VsSW1tZWRpYXRlQWN0aW9uCiB7CiAgICAgLy8gUmVzZXQgdGhlIHJlY29nbml6ZXIg YnkgdHVybmluZyBpdCBvZmYgYW5kIG9uIGFnYWluLgpJbmRleDogU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlldy5tbQkocmV2aXNpb24gMTc5MTM3KQorKysgU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC04ODgsMTMgKzg4OCw2IEBAIC0gKHZv aWQpX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1lTmEKICAgICAgICAgX3ByaXZhdGUtPmFj dGlvbk1lbnVDb250cm9sbGVyID0gW1tXZWJBY3Rpb25NZW51Q29udHJvbGxlciBhbGxvY10gaW5p dFdpdGhXZWJWaWV3OnNlbGZdOwogICAgICAgICBzZWxmLl9hY3Rpb25NZW51LmF1dG9lbmFibGVz SXRlbXMgPSBOTzsKICAgICB9Ci0KLSAgICBpZiAoQ2xhc3MgZ2VzdHVyZUNsYXNzID0gTlNDbGFz c0Zyb21TdHJpbmcoQCJOU0ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyIikpIHsKLSAg ICAgICAgUmV0YWluUHRyPE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXI+IHJlY29n bml6ZXIgPSBhZG9wdE5TKFsoTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciAqKVtn ZXN0dXJlQ2xhc3MgYWxsb2NdIGluaXRXaXRoVGFyZ2V0Om5pbCBhY3Rpb246TlVMTF0pOwotICAg ICAgICBfcHJpdmF0ZS0+aW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciA9IFtbV2ViSW1tZWRpYXRl QWN0aW9uQ29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhXZWJWaWV3OnNlbGYgcmVjb2duaXplcjpy ZWNvZ25pemVyLmdldCgpXTsKLSAgICAgICAgW3JlY29nbml6ZXIgc2V0RGVsZWdhdGU6X3ByaXZh dGUtPmltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXJdOwotICAgICAgICBbc2VsZiBhZGRHZXN0dXJl UmVjb2duaXplcjpyZWNvZ25pemVyLmdldCgpXTsKLSAgICB9CiAjZW5kaWYKIAogI2lmICFQTEFU Rk9STShJT1MpCkBAIC01Mjk0LDYgKzUyODcsMjAgQEAgLSAodm9pZCl2aWV3RGlkTW92ZVRvV2lu ZG93CiAgICAgX3ByaXZhdGUtPnBhZ2UtPnNldERldmljZVNjYWxlRmFjdG9yKFtzZWxmIF9kZXZp Y2VTY2FsZUZhY3Rvcl0pOwogI2VuZGlmCiAKKyNpZiBQTEFURk9STShNQUMpICYmIF9fTUFDX09T X1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMDAwCisgICAgaWYgKENsYXNzIGdlc3R1cmVD bGFzcyA9IE5TQ2xhc3NGcm9tU3RyaW5nKEAiTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2du aXplciIpKSB7CisgICAgICAgIGlmIChbc2VsZiB3aW5kb3ddKSB7CisgICAgICAgICAgICBSZXRh aW5QdHI8TlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplcj4gcmVjb2duaXplciA9IGFk b3B0TlMoWyhOU0ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyICopW2dlc3R1cmVDbGFz cyBhbGxvY10gaW5pdFdpdGhUYXJnZXQ6bmlsIGFjdGlvbjpOVUxMXSk7CisgICAgICAgICAgICBf cHJpdmF0ZS0+aW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciA9IFtbV2ViSW1tZWRpYXRlQWN0aW9u Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhXZWJWaWV3OnNlbGYgcmVjb2duaXplcjpyZWNvZ25p emVyLmdldCgpXTsKKyAgICAgICAgICAgIFtyZWNvZ25pemVyIHNldERlbGVnYXRlOl9wcml2YXRl LT5pbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyXTsKKyAgICAgICAgICAgIFtzZWxmIGFkZEdlc3R1 cmVSZWNvZ25pemVyOnJlY29nbml6ZXIuZ2V0KCldOworICAgICAgICB9IGVsc2UgeworICAgICAg ICAgICAgTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciAqcmVjb2duaXplciA9IFtf cHJpdmF0ZS0+aW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBpbW1lZGlhdGVBY3Rpb25SZWNvZ25p emVyXTsKKyAgICAgICAgICAgIFtzZWxmIHJlbW92ZUdlc3R1cmVSZWNvZ25pemVyOnJlY29nbml6 ZXJdOworICAgICAgICB9CisgICAgfQorI2VuZGlmCisKICAgICBbc2VsZiBfdXBkYXRlQWN0aXZl U3RhdGVdOwogICAgIFtzZWxmIF91cGRhdGVWaXNpYmlsaXR5U3RhdGVdOwogfQo= 245494 2015-01-27 16:53:52 -0800 2015-01-27 16:59:38 -0800 Patch for-review-2.txt text/plain 6598 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTIyNikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTAxLTI3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBJbW1lZGlhdGUgYWN0aW9uIGdlc3R1 cmUgcmVjb2duaXplciBzdGlsbCBkb2Vzbid0IHdvcmsgd2VsbCB3aXRoIElCCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA5NjcKKyAgICAgICAgLWFu ZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8vcHJvYmxlbS8xOTYyMTUwOQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHNob3VsZCBhZGQg KG9yIHJlbW92ZSkgdGhlIGdlc3R1cmUgcmVjb2duaXplciBpbiB2aWV3RGlkTW92ZVRvV2luZG93 IGJlY2F1c2UgCisgICAgICAgIGluaXRXaXRoRnJhbWUgaXQgdG9vIGVhcmx5IGFuZCBJQiBtaWdo dCBtZXNzIHdpdGggaXQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgor ICAgICAgICAoLVtXS1ZpZXcgdmlld0RpZE1vdmVUb1dpbmRvd10pOgorICAgICAgICAoLVtXS1Zp ZXcgaW5pdFdpdGhGcmFtZTpwcm9jZXNzUG9vbDpjb25maWd1cmF0aW9uOndlYlZpZXc6XSk6CisK IDIwMTUtMDEtMjcgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIElu dm9raW5nIGFuIGltbWVkaWF0ZSBhY3Rpb24gb24gbGluayBvZnRlbiBkaXNtaXNzZXMgc2VsZWN0 aW9uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShy ZXZpc2lvbiAxNzkxMzcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTI1NjcsNiArMjU2NywxMSBAQCAtICh2b2lkKXZpZXdE aWRNb3ZlVG9XaW5kb3cKICAgICAgICAgfQogCiAgICAgICAgIFtzZWxmIF9hY2Nlc3NpYmlsaXR5 UmVnaXN0ZXJVSVByb2Nlc3NUb2tlbnNdOworCisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMDEwMDAKKyAgICAgICAgaWYgKF9kYXRhLT5faW1tZWRpYXRlQWN0aW9uR2Vz dHVyZVJlY29nbml6ZXIgJiYgIVtbc2VsZiBnZXN0dXJlUmVjb2duaXplcnNdIGNvbnRhaW5zT2Jq ZWN0Ol9kYXRhLT5faW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCldKQorICAg ICAgICAgICAgW3NlbGYgYWRkR2VzdHVyZVJlY29nbml6ZXI6X2RhdGEtPl9pbW1lZGlhdGVBY3Rp b25HZXN0dXJlUmVjb2duaXplci5nZXQoKV07CisjZW5kaWYKICAgICB9IGVsc2UgewogICAgICAg ICBWaWV3U3RhdGU6OkZsYWdzIHZpZXdTdGF0ZUNoYW5nZXMgPSBWaWV3U3RhdGU6OldpbmRvd0lz QWN0aXZlIHwgVmlld1N0YXRlOjpJc1Zpc2libGU7CiAgICAgICAgIGlmIChbc2VsZiBpc0RlZmVy cmluZ1ZpZXdJbldpbmRvd0NoYW5nZXNdKQpAQCAtMjU3OSw2ICsyNTg0LDExIEBAIC0gKHZvaWQp dmlld0RpZE1vdmVUb1dpbmRvdwogICAgICAgICBfZGF0YS0+X2ZsYWdzQ2hhbmdlZEV2ZW50TW9u aXRvciA9IG5pbDsKIAogICAgICAgICBbc2VsZiBfZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxk V2luZG93c107CisKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAw MAorICAgICAgICBpZiAoX2RhdGEtPl9pbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplcikK KyAgICAgICAgICAgIFtzZWxmIHJlbW92ZUdlc3R1cmVSZWNvZ25pemVyOl9kYXRhLT5faW1tZWRp YXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCldOworI2VuZGlmCiAgICAgfQogCiAgICAg X2RhdGEtPl9wYWdlLT5zZXRJbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3Rvcihbc2VsZiBfaW50cmlu c2ljRGV2aWNlU2NhbGVGYWN0b3JdKTsKQEAgLTM2MjUsNyArMzYzNSw2IEBAIC0gKGluc3RhbmNl dHlwZSlpbml0V2l0aEZyYW1lOihOU1JlY3QpZnIKICAgICAgICAgX2RhdGEtPl9pbW1lZGlhdGVB Y3Rpb25HZXN0dXJlUmVjb2duaXplciA9IGFkb3B0TlMoWyhOU0ltbWVkaWF0ZUFjdGlvbkdlc3R1 cmVSZWNvZ25pemVyICopW2dlc3R1cmVDbGFzcyBhbGxvY10gaW5pdFdpdGhUYXJnZXQ6bmlsIGFj dGlvbjpOVUxMXSk7CiAgICAgICAgIF9kYXRhLT5faW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciA9 IGFkb3B0TlMoW1tXS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoUGFn ZToqX2RhdGEtPl9wYWdlIHZpZXc6c2VsZiByZWNvZ25pemVyOl9kYXRhLT5faW1tZWRpYXRlQWN0 aW9uR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCldKTsKICAgICAgICAgW19kYXRhLT5faW1tZWRpYXRl QWN0aW9uR2VzdHVyZVJlY29nbml6ZXIgc2V0RGVsZWdhdGU6X2RhdGEtPl9pbW1lZGlhdGVBY3Rp b25Db250cm9sbGVyLmdldCgpXTsKLSAgICAgICAgW3NlbGYgYWRkR2VzdHVyZVJlY29nbml6ZXI6 X2RhdGEtPl9pbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplci5nZXQoKV07CiAgICAgfQog I2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTIyNikKKysrIFNvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisy MDE1LTAxLTI3ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBJbW1l ZGlhdGUgYWN0aW9uIGdlc3R1cmUgcmVjb2duaXplciBzdGlsbCBkb2Vzbid0IHdvcmsgd2VsbCB3 aXRoIElCCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDA5NjcKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8vcHJvYmxl bS8xOTYyMTUwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdlIHNob3VsZCBhZGQgKG9yIHJlbW92ZSkgdGhlIGdlc3R1cmUgcmVjb2duaXplciBpbiB2 aWV3RGlkTW92ZVRvV2luZG93IGJlY2F1c2UgCisgICAgICAgIGluaXRXaXRoRnJhbWUgaXQgdG9v IGVhcmx5IGFuZCBJQiBtaWdodCBtZXNzIHdpdGggaXQuCisgICAgICAgICogV2ViVmlldy9XZWJJ bW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmg6CisgICAgICAgICogV2ViVmlldy9XZWJJbW1lZGlh dGVBY3Rpb25Db250cm9sbGVyLm1tOgorICAgICAgICAoLVtXZWJJbW1lZGlhdGVBY3Rpb25Db250 cm9sbGVyIGltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXJdKToKKyAgICAgICAgKiBXZWJWaWV3L1dl YlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZy YW1lTmFtZTpncm91cE5hbWU6XSk6CisgICAgICAgICgtW1dlYlZpZXcgdmlld0RpZE1vdmVUb1dp bmRvd10pOgorCiAyMDE1LTAxLTI3ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAK ICAgICAgICAgRml4ZWQgYnVpbGRpbmcgcHJvamVjdHMgdGhhdCBpbXBvcnQgV2ViVmlldy5oIHdp dGggV0tfRU5BQkxFX0ZPUk1BTF9ERUxFR0FURV9QUk9UT0NPTFMuCkluZGV4OiBTb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xs ZXIuaAkocmV2aXNpb24gMTc5MTM3KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJJ bW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTUzLDYgKzUzLDgg QEAgQGludGVyZmFjZSBXZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIAogLSAodm9pZCl3ZWJW aWV3OihXZWJWaWV3ICopd2ViVmlldyB3aWxsSGFuZGxlTW91c2VEb3duOihOU0V2ZW50ICopZXZl bnQ7CiAtICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IGRpZEhhbmRsZVNjcm9sbFdo ZWVsOihOU0V2ZW50ICopZXZlbnQ7CiAKKy0gKE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29n bml6ZXIgKilpbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyOworCiBAZW5kCiAKICNlbmRpZiAvLyBQ TEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMDAw CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRy b2xsZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJJbW1l ZGlhdGVBY3Rpb25Db250cm9sbGVyLm1tCShyZXZpc2lvbiAxNzkxMzcpCisrKyBTb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIubW0JKHdvcmtpbmcg Y29weSkKQEAgLTEwNCw2ICsxMDQsMTEgQEAgLSAodm9pZCl3ZWJWaWV3OihXZWJWaWV3ICopd2Vi VmlldyBkaWRIYQogICAgIFtzZWxmIF9jbGVhckltbWVkaWF0ZUFjdGlvblN0YXRlXTsKIH0KIAor LSAoTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciAqKWltbWVkaWF0ZUFjdGlvblJl Y29nbml6ZXIKK3sKKyAgICByZXR1cm4gX2ltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXIuZ2V0KCk7 Cit9CisKIC0gKHZvaWQpX2NhbmNlbEltbWVkaWF0ZUFjdGlvbgogewogICAgIC8vIFJlc2V0IHRo ZSByZWNvZ25pemVyIGJ5IHR1cm5pbmcgaXQgb2ZmIGFuZCBvbiBhZ2Fpbi4KSW5kZXg6IFNvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlzaW9uIDE3OTEzNykKKysrIFNvdXJjZS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtODkzLDcgKzg5 Myw2IEBAIC0gKHZvaWQpX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1lTmEKICAgICAgICAg UmV0YWluUHRyPE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXI+IHJlY29nbml6ZXIg PSBhZG9wdE5TKFsoTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciAqKVtnZXN0dXJl Q2xhc3MgYWxsb2NdIGluaXRXaXRoVGFyZ2V0Om5pbCBhY3Rpb246TlVMTF0pOwogICAgICAgICBf cHJpdmF0ZS0+aW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciA9IFtbV2ViSW1tZWRpYXRlQWN0aW9u Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhXZWJWaWV3OnNlbGYgcmVjb2duaXplcjpyZWNvZ25p emVyLmdldCgpXTsKICAgICAgICAgW3JlY29nbml6ZXIgc2V0RGVsZWdhdGU6X3ByaXZhdGUtPmlt bWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXJdOwotICAgICAgICBbc2VsZiBhZGRHZXN0dXJlUmVjb2du aXplcjpyZWNvZ25pemVyLmdldCgpXTsKICAgICB9CiAjZW5kaWYKIApAQCAtNTI5NCw2ICs1Mjkz LDE3IEBAIC0gKHZvaWQpdmlld0RpZE1vdmVUb1dpbmRvdwogICAgIF9wcml2YXRlLT5wYWdlLT5z ZXREZXZpY2VTY2FsZUZhY3Rvcihbc2VsZiBfZGV2aWNlU2NhbGVGYWN0b3JdKTsKICNlbmRpZgog CisjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDEwMTAwMAorICAgIGlmIChfcHJpdmF0ZS0+aW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlcikgewor ICAgICAgICBOU0ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyICpyZWNvZ25pemVyID0g W19wcml2YXRlLT5pbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIGltbWVkaWF0ZUFjdGlvblJlY29n bml6ZXJdOworICAgICAgICBpZiAoW3NlbGYgd2luZG93XSkgeworICAgICAgICAgICAgaWYgKCFb W3NlbGYgZ2VzdHVyZVJlY29nbml6ZXJzXSBjb250YWluc09iamVjdDpyZWNvZ25pemVyXSkKKyAg ICAgICAgICAgICAgICBbc2VsZiBhZGRHZXN0dXJlUmVjb2duaXplcjpyZWNvZ25pemVyXTsKKyAg ICAgICAgfSBlbHNlCisgICAgICAgICAgICBbc2VsZiByZW1vdmVHZXN0dXJlUmVjb2duaXplcjpy ZWNvZ25pemVyXTsKKyAgICB9CisjZW5kaWYKKwogICAgIFtzZWxmIF91cGRhdGVBY3RpdmVTdGF0 ZV07CiAgICAgW3NlbGYgX3VwZGF0ZVZpc2liaWxpdHlTdGF0ZV07CiB9Cg==