152189 2015-12-11 14:33:55 -0800 _touchEventRegions should return regions in the view's coordinates 2015-12-11 17:23:03 -0800 1 1 1 Unclassified WebKit WebKit API Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin bdakin bdakin mitz simon.fraser oldest_to_newest 1148543 0 bdakin 2015-12-11 14:33:55 -0800 _touchEventRegions should return regions in the view's coordinates rdar://problem/23188605 1148550 1 267191 bdakin 2015-12-11 14:43:51 -0800 Created attachment 267191 Patch 1148556 2 267191 mitz 2015-12-11 14:57:42 -0800 Comment on attachment 267191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=267191&action=review > Source/WebKit/mac/WebView/WebView.mm:3745 > + IntRect viewRect = IntRect([[[[self _selectedOrMainFrame] frameView] documentView] convertRect:rect toView:self]); I think this should always be the main frame. 1148568 3 267191 simon.fraser 2015-12-11 15:28:23 -0800 Comment on attachment 267191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=267191&action=review > Source/WebKit/mac/WebView/WebView.mm:3745 > + IntRect viewRect = IntRect([[[[self _selectedOrMainFrame] frameView] documentView] convertRect:rect toView:self]); You should fetch [[[[self _selectedOrMainFrame] frameView] documentView] outside the loop, rather than calling it once per rect (possibly thousands of them). 1148623 4 bdakin 2015-12-11 17:23:03 -0800 Thank you! http://trac.webkit.org/changeset/193997 267191 2015-12-11 14:43:51 -0800 2015-12-11 14:57:42 -0800 Patch for-review-os.txt text/plain 6590 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5Mzk4MikKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE1LTEyLTEx ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBfdG91Y2hFdmVudFJl Z2lvbnMgc2hvdWxkIHJldHVybiByZWdpb25zIGluIHRoZSB2aWV3J3MgY29vcmRpbmF0ZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjE4OQorICAg ICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzIzMTg4NjA1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGNv bW1lbnQgaGVyZSB3YXMgYWN0dWFsbHkgb3V0IG9mIGRhdGUuIEl0IGNsYWltZWQgdGhhdCB0b3Vj aCByZWN0YW5nbGVzIAorICAgICAgICBhcmUgaW4gdGhlIGNvb3JkaW5hdGUgc3lzdGVtIG9mIHRo ZSBkb2N1bWVudCwgYnV0IHdlIGhhZCBhY3R1YWxseSBjaGFuZ2VkIAorICAgICAgICB0aGVtIHRv IGJlIGluIHRoZSB2aWV34oCZcyBjb29yZGluYXRlIHN5c3RlbSBpbiBvcmRlciB0byBmaXggaXNz dWVzIHdpdGggCisgICAgICAgIGhhbmRsaW5nIHRvdWNoIGV2ZW50cyBpbiBVSVdlYlZpZXcuIEJ1 dCBub3cgd2UgYXJlIGdvaW5nIGJhY2sgdG8gaGF2aW5nIHRoZSAKKyAgICAgICAgdG91Y2ggcmVj dGFuZ2xlcyBiZSBpbiB0aGUgZG9jdW1lbnTigJlzIGNvb3JkaW5hdGUgc3lzdGVtLCBzbyB3ZSBz aG91bGQgZml4IHRoZSAKKyAgICAgICAgcnRsIGJ1Z3MgaGVyZSBieSBjb252ZXJ0aW5nIHRvIHZp ZXcgY29vcmRpbmF0ZXMgYmVmb3JlIGhhbmRpbmcgdGhlIHJlY3RzIG9mZiAKKyAgICAgICAgdG8g aU9TIFdLMSBjbGllbnRzLgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAg KC1bV2ViVmlldyBfdG91Y2hFdmVudFJlZ2lvbnNdKToKKwogMjAxNS0xMi0xMCAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWVkaWFTdHJlYW1dIEV4 cG9zZSBtZWRpYSBjYXB0dXJlIGRldmljZXMgcGVyc2lzdGVudCBwZXJtaXNzaW9ucyB0byBXZWJD b3JlCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCShyZXZpc2lvbiAxOTM4 NzEpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29w eSkKQEAgLTM3MzksMjAgKzM3MzksMjAgQEAgLSAoTlNBcnJheSAqKV90b3VjaEV2ZW50UmVnaW9u cwogICAgICAgICBpZiAocmVjdC5pc0VtcHR5KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAot ICAgICAgICAvLyBOb3RlIHRoYXQgdGhlc2UgcmVjdGFuZ2xlcyBhcmUgaW4gdGhlIGNvb3JkaW5h dGUgc3lzdGVtIG9mIHRoZSBkb2N1bWVudCAoaW5zaWRlIHRoZSBXZWJIVE1MVmlldyksIHdoaWNo IGlzIG5vdAotICAgICAgICAvLyB0aGUgc2FtZSBhcyB0aGUgY29vcmRpbmF0ZSBzeXN0ZW0gb2Yg dGhlIFdlYlZpZXcuIElmIHlvdSB3YW50IHRvIGRvIGNvbXBhcmlzb25zIHdpdGggbG9jYXRpb25z IGluIHRoZSBXZWJWaWV3LAotICAgICAgICAvLyB5b3UgbXVzdCBjb252ZXJ0IGJldHdlZW4gdGhl IHR3byB1c2luZyBXQUtWaWV3J3MgY29udmVydFJlY3Q6dG9WaWV3OiBzZWxlY3Rvci4gVGhpcyB3 aWxsIHRha2UgY2FyZSBvZiBzY2FsaW5nCi0gICAgICAgIC8vIGFuZCB0cmFuc2xhdGlvbnMgKHdo aWNoIGFyZSByZWxldmFudCBmb3IgcmlnaHQtdG8tbGVmdCBjb2x1bW4gbGF5b3V0KS4KKyAgICAg ICAgLy8gVGhlIHRvdWNoIHJlY3RhbmdsZXMgYXJlIGluIHRoZSBjb29yZGluYXRlIHN5c3RlbSBv ZiB0aGUgZG9jdW1lbnQgKGluc2lkZSB0aGUgV2ViSFRNTFZpZXcpLCB3aGljaCBpcyBub3QKKyAg ICAgICAgLy8gdGhlIHNhbWUgYXMgdGhlIGNvb3JkaW5hdGUgc3lzdGVtIG9mIHRoZSBXZWJWaWV3 LiBVSVdlYlZpZXcgY3VycmVudGx5IGV4cGVjdHMgdmlldyBjb29yZGluYXRlcywgc28gd2UnbGwK KyAgICAgICAgLy8gY29udmVydCB0aGVtIGhlcmUgbm93LgorICAgICAgICBJbnRSZWN0IHZpZXdS ZWN0ID0gSW50UmVjdChbW1tbc2VsZiBfc2VsZWN0ZWRPck1haW5GcmFtZV0gZnJhbWVWaWV3XSBk b2N1bWVudFZpZXddIGNvbnZlcnRSZWN0OnJlY3QgdG9WaWV3OnNlbGZdKTsKIAogICAgICAgICAv LyBUaGUgZXZlbnQgcmVnaW9uIHdhbnRzIHRoaXMgcG9pbnRzIGluIHRoaXMgb3JkZXI6CiAgICAg ICAgIC8vICBwMi0tLS0tLXAzCiAgICAgICAgIC8vICB8ICAgICAgIHwKICAgICAgICAgLy8gIHAx LS0tLS0tcDQKICAgICAgICAgLy8KLSAgICAgICAgV2ViRXZlbnRSZWdpb24gKmV2ZW50UmVnaW9u ID0gW1tXZWJFdmVudFJlZ2lvbiBhbGxvY10gaW5pdFdpdGhQb2ludHM6RmxvYXRQb2ludChyZWN0 LngoKSwgcmVjdC5tYXhZKCkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOkZsb2F0UG9pbnQocmVjdC54 KCksIHJlY3QueSgpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDpGbG9hdFBvaW50KHJlY3QubWF4WCgp LCByZWN0LnkoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6RmxvYXRQb2ludChyZWN0Lm1heFgoKSwg cmVjdC5tYXhZKCkpXTsKKyAgICAgICAgV2ViRXZlbnRSZWdpb24gKmV2ZW50UmVnaW9uID0gW1tX ZWJFdmVudFJlZ2lvbiBhbGxvY10gaW5pdFdpdGhQb2ludHM6RmxvYXRQb2ludCh2aWV3UmVjdC54 KCksIHZpZXdSZWN0Lm1heFkoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6RmxvYXRQb2ludCh2aWV3 UmVjdC54KCksIHZpZXdSZWN0LnkoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6RmxvYXRQb2ludCh2 aWV3UmVjdC5tYXhYKCksIHZpZXdSZWN0LnkoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6RmxvYXRQ b2ludCh2aWV3UmVjdC5tYXhYKCksIHZpZXdSZWN0Lm1heFkoKSldOwogICAgICAgICBpZiAoZXZl bnRSZWdpb24pIHsKICAgICAgICAgICAgIFtldmVudFJlZ2lvbkFycmF5IGFkZE9iamVjdDpldmVu dFJlZ2lvbl07CiAgICAgICAgICAgICBbZXZlbnRSZWdpb24gcmVsZWFzZV07CkluZGV4OiBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiAxOTM5ODIpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNSBAQAorMjAxNS0xMi0xMSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5j b20+CisKKyAgICAgICAgX3RvdWNoRXZlbnRSZWdpb25zIHNob3VsZCByZXR1cm4gcmVnaW9ucyBp biB0aGUgdmlldydzIGNvb3JkaW5hdGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNTIxODkKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAg ICAgICByZGFyOi8vcHJvYmxlbS8yMzE4ODYwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9ldmVudHMvdG91Y2gvaW9zL3RvdWNoLWV2ZW50 LXJ0bC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZXZlbnRzL3RvdWNoL2lv cy90b3VjaC1ldmVudC1ydGwuaHRtbDogQWRkZWQuCisKIDIwMTUtMTItMTEgIFJ5YW4gSGFkZGFk ICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgTWFya2luZyBmYXN0L2V2ZW50cy9p b3MgdGVzdHMgYXMgZmxha3kgb24gaW9zLXNpbXVsYXRvciBkdWUgdG8gdGltZW91dHMKSW5kZXg6 IExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL2lvcy90b3VjaC1ldmVudC1ydGwtZXhwZWN0 ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL2lvcy90 b3VjaC1ldmVudC1ydGwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMv ZmFzdC9ldmVudHMvdG91Y2gvaW9zL3RvdWNoLWV2ZW50LXJ0bC1leHBlY3RlZC50eHQJKHdvcmtp bmcgY29weSkKQEAgLTAsMCArMSwzIEBACitUYXAgbWUKK1JlY2VpdmVkIGV2ZW50IHRvdWNoc3Rh cnQgYXQgNTgsIDUwCitEb25lCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC9p b3MvdG91Y2gtZXZlbnQtcnRsLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9l dmVudHMvdG91Y2gvaW9zL3RvdWNoLWV2ZW50LXJ0bC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvaW9zL3RvdWNoLWV2ZW50LXJ0bC5odG1sCSh3b3Jr aW5nIGNvcHkpCkBAIC0wLDAgKzEsNjAgQEAKKzxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9y Zy8xOTk5L3hodG1sIiBsYW5nPSJlbi1VUyIgZGlyPSJydGwiPgorPGhlYWQ+Cis8bWV0YSBjaGFy c2V0PSJ1dGYtOCI+Cis8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNl LXdpZHRoLCBpbml0aWFsLXNjYWxlPTEuMCwgbWF4aW11bS1zY2FsZT0xLjAsIHVzZXItc2NhbGFi bGU9bm8sIHNocmluay10by1maXQ9bm8iPgorPHN0eWxlPgorYm9keSB7CisgICAgd2lkdGg6IDkw MHB4OworfQorLmJ1dHRvbiB7CisgICAgcGFkZGluZzogNDBweDsKKyAgICBiYWNrZ3JvdW5kOiAj Y2NjOworfQorLmJ1dHRvbi50YXBwZWQgeworICAgIGJhY2tncm91bmQ6IGdyZWVuOworfQorPC9z dHlsZT4KKworPHNjcmlwdD4KKworaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgdGVzdFJ1 bm5lci5kdW1wQXNUZXh0KCk7CisgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7Cit9CisK K2Z1bmN0aW9uIGdldFVJU2NyaXB0KCkKK3sKKyAgICByZXR1cm4gYAorICAgIChmdW5jdGlvbigp IHsKKyAgICAgICAgdWlDb250cm9sbGVyLnNpbmdsZVRhcEF0UG9pbnQoLTUwLCA1MCwgZnVuY3Rp b24oKSB7CisgICAgICAgICAgICB1aUNvbnRyb2xsZXIudWlTY3JpcHRDb21wbGV0ZSgiRG9uZSIp OworICAgICAgICAgICAgICAgIH0pOworICAgIH0pKCk7YAorfQorCitmdW5jdGlvbiBzZXRVcCgp Cit7CisgICAgdmFyIG91dHB1dCA9ICcnOworICAgIHZhciB0YXJnZXQgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgndGFyZ2V0Jyk7CisgICAgdGFyZ2V0LmFkZEV2ZW50TGlzdGVuZXIoJ3RvdWNo c3RhcnQnLCBmdW5jdGlvbihldmVudCkgeworICAgICAgICBvdXRwdXQgKz0gJ1JlY2VpdmVkIGV2 ZW50ICcgKyBldmVudC50eXBlICsgJyBhdCAnICsgZXZlbnQudG91Y2hlc1swXS5jbGllbnRYICsg JywgJyArIGV2ZW50LnRvdWNoZXNbMF0uY2xpZW50WSArICc8YnI+JzsKKyAgICAgICAgdGFyZ2V0 LmNsYXNzTGlzdC50b2dnbGUoJ3RhcHBlZCcpOworICAgIH0pOworCisgICAgaWYgKHRlc3RSdW5u ZXIucnVuVUlTY3JpcHQpIHsKKyAgICAgICAgdGVzdFJ1bm5lci5ydW5VSVNjcmlwdChnZXRVSVNj cmlwdCgpLCBmdW5jdGlvbihyZXN1bHQpIHsKKyAgICAgICAgICAgIG91dHB1dCArPSByZXN1bHQ7 CisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29uc29sZScpLmlubmVySFRN TCA9IG91dHB1dDsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAg ICB9KTsKKyAgICB9Cit9CisKK3dpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgc2V0VXAs IGZhbHNlKTsKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBjbGFzcz0iYnV0 dG9uIiBpZD0idGFyZ2V0Ij5UYXAgbWU8L2Rpdj4KKyAgICA8cHJlIGlkPSJjb25zb2xlIj5UbyB0 ZXN0IG1hbnVhbGx5LCB0YXAgdGhlIGJveC4gSWYgaXQgdHVybnMgZ3JlZW4sIHRoZW4gdGhlIHRl c3QgcGFzc2VzLjwvcHJlPgorPC9ib2R5PgorPC9odG1sPgo=