138536 2014-11-08 11:24:41 -0800 WKActionMenuController methods should be more careful to use the best WebHitTestResult 2014-11-08 12:27:39 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin webkit-unassigned bdakin thorton webkit-bug-importer oldest_to_newest 1047296 0 bdakin 2014-11-08 11:24:41 -0800 WKActionMenuController methods should be more careful to use the best WebHitTestResult 1047297 1 webkit-bug-importer 2014-11-08 11:25:59 -0800 <rdar://problem/18919195> 1047299 2 webkit-bug-importer 2014-11-08 11:31:28 -0800 <rdar://problem/18919213> 1047300 3 241232 bdakin 2014-11-08 11:31:32 -0800 Created attachment 241232 Patch 1047303 4 bdakin 2014-11-08 12:27:39 -0800 Thanks Tim! http://trac.webkit.org/changeset/175780 241232 2014-11-08 11:31:32 -0800 2014-11-08 11:45:47 -0800 Patch for-review.txt text/plain 7493 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NTc3OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE0LTExLTA4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXS0FjdGlvbk1lbnVDb250cm9sbGVy IG1ldGhvZHMgc2hvdWxkIGJlIG1vcmUgY2FyZWZ1bCB0byB1c2UgdGhlIGJlc3QgCisgICAgICAg IFdlYkhpdFRlc3RSZXN1bHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzODUzNgorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJk YXI6Ly9wcm9ibGVtLzE4OTE5MTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZS1uYW1lcyBfaGl0VGVzdFJlc3VsdEZvclN0YWdl IHRvIF93ZWJIaXRUZXN0UmVzdWx0LiBUaGUgbWV0aG9kIG5vIAorICAgICAgICBsb25nZXIgdGFr ZXMgYSBzdGFnZSBzaW5jZSB0aGF0IHZhbHVlIGlzIHJlYWxseSBub3QgbmVjZXNzYXJ5IHRvIGRl dGVybWluZSB0aGUgCisgICAgICAgIGNvcnJlY3QgV2ViSGl0VGVzdFJlc3VsdC4gVGhpcyBwYXRj aCBhbHNvIG1ha2VzIGFsbCBzcG90cyBpbiB0aGlzIGZpbGUgdGhhdCBhY2Nlc3MgCisgICAgICAg IGEgV2ViSGl0VGVzdFJlc3VsdCBnbyB0aHJvdWdoIF93ZWJIaXRUZXN0UmVzdWx0IHRvIGVuc3Vy ZSB0aGF0IHRoZXkgZ2V0IHRoZSBtb3N0IAorICAgICAgICB1cC10by1kYXRlIG9wdGlvbi4KKyAg ICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW06CisgICAgICAg ICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgd2lsbE9wZW5NZW51OndpdGhFdmVudDpdKToKKyAg ICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciBfb3BlblVSTEZyb21BY3Rpb25NZW51Ol0p OgorICAgICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIF9hZGRUb1JlYWRpbmdMaXN0RnJv bUFjdGlvbk1lbnU6XSk6CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX3ByZXZp ZXdVUkxGcm9tQWN0aW9uTWVudTpdKToKKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxl ciBfZGVmYXVsdE1lbnVJdGVtc0ZvclZpZGVvXSk6CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNv bnRyb2xsZXIgX2NvcHlWaWRlb1VSTDpdKToKKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJv bGxlciBfc2F2ZVZpZGVvVG9Eb3dubG9hZHM6XSk6CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNv bnRyb2xsZXIgX3NhdmVJbWFnZVRvRG93bmxvYWRzOl0pOgorICAgICAgICAoLVtXS0FjdGlvbk1l bnVDb250cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1zXSk6CisgICAgICAgICgtW1dLQWN0aW9uTWVu dUNvbnRyb2xsZXIgX3VwZGF0ZUFjdGlvbk1lbnVJdGVtc0ZvclN0YWdlOl0pOgorICAgICAgICAo aW1hZ2VGb3JSZXNvdXJjZTpuYW1lOjpzd2l0Y2gpOiBEZWxldGVkLgorICAgICAgICAoLVtXS0Fj dGlvbk1lbnVDb250cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1zOl0pOiBEZWxldGVkLgorCiAyMDE0 LTExLTA4ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1l bnQgYWN0aW9uIG1lbnUgc3VwcG9ydCBmb3IgdmlkZW9zCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tCShyZXZp c2lvbiAxNzU3NzkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVu dUNvbnRyb2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTIxMCw3ICsyMTAsNyBAQCAtICh2b2lk KXdpbGxPcGVuTWVudTooTlNNZW51ICopbWVudSB3aXRoCiAKICAgICAvLyBBY3Rpb24gbWVudXMg Zm9yIHRleHQgc2hvdWxkIGhpZ2hsaWdodCB0aGUgdGV4dCBzbyB0aGF0IGl0IGlzIGNsZWFyIHdo YXQgdGhlIGFjdGlvbiBtZW51IGFjdGlvbnMKICAgICAvLyB3aWxsIGFwcGx5IHRvLiBJZiB0aGUg dGV4dCBpcyBhbHJlYWR5IHNlbGVjdGVkLCB0aGUgbWVudSB3aWxsIHVzZSB0aGUgZXhpc3Rpbmcg c2VsZWN0aW9uLgotICAgIFJlZlB0cjxXZWJIaXRUZXN0UmVzdWx0PiBoaXRUZXN0UmVzdWx0ID0g W3NlbGYgX2hpdFRlc3RSZXN1bHRGb3JTdGFnZTpNZW51VXBkYXRlU3RhZ2U6Ok1lbnVOZWVkc1Vw ZGF0ZV07CisgICAgUmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+IGhpdFRlc3RSZXN1bHQgPSBbc2Vs ZiBfd2ViSGl0VGVzdFJlc3VsdF07CiAgICAgaWYgKCFoaXRUZXN0UmVzdWx0LT5pc1NlbGVjdGVk KCkpCiAgICAgICAgIF9wYWdlLT5zZWxlY3RMYXN0QWN0aW9uTWVudVJhbmdlKCk7CiB9CkBAIC0y ODksMTMgKzI4OSwxMyBAQCAtIChOU0FycmF5ICopX2RlZmF1bHRNZW51SXRlbXNGb3JMaW5rCiAK IC0gKHZvaWQpX29wZW5VUkxGcm9tQWN0aW9uTWVudTooaWQpc2VuZGVyCiB7Ci0gICAgV2ViSGl0 VGVzdFJlc3VsdCogaGl0VGVzdFJlc3VsdCA9IF9wYWdlLT5sYXN0TW91c2VNb3ZlSGl0VGVzdFJl c3VsdCgpOworICAgIFJlZlB0cjxXZWJIaXRUZXN0UmVzdWx0PiBoaXRUZXN0UmVzdWx0ID0gW3Nl bGYgX3dlYkhpdFRlc3RSZXN1bHRdOwogICAgIFtbTlNXb3Jrc3BhY2Ugc2hhcmVkV29ya3NwYWNl XSBvcGVuVVJMOltOU1VSTCBfd2ViX1VSTFdpdGhXVEZTdHJpbmc6aGl0VGVzdFJlc3VsdC0+YWJz b2x1dGVMaW5rVVJMKCldXTsKIH0KIAogLSAodm9pZClfYWRkVG9SZWFkaW5nTGlzdEZyb21BY3Rp b25NZW51OihpZClzZW5kZXIKIHsKLSAgICBXZWJIaXRUZXN0UmVzdWx0KiBoaXRUZXN0UmVzdWx0 ID0gX3BhZ2UtPmxhc3RNb3VzZU1vdmVIaXRUZXN0UmVzdWx0KCk7CisgICAgUmVmUHRyPFdlYkhp dFRlc3RSZXN1bHQ+IGhpdFRlc3RSZXN1bHQgPSBbc2VsZiBfd2ViSGl0VGVzdFJlc3VsdF07CiAg ICAgTlNTaGFyaW5nU2VydmljZSAqc2VydmljZSA9IFtOU1NoYXJpbmdTZXJ2aWNlIHNoYXJpbmdT ZXJ2aWNlTmFtZWQ6TlNTaGFyaW5nU2VydmljZU5hbWVBZGRUb1NhZmFyaVJlYWRpbmdMaXN0XTsK ICAgICBbc2VydmljZSBwZXJmb3JtV2l0aEl0ZW1zOkBbIFtOU1VSTCBfd2ViX1VSTFdpdGhXVEZT dHJpbmc6aGl0VGVzdFJlc3VsdC0+YWJzb2x1dGVMaW5rVVJMKCldIF1dOwogfQpAQCAtMzEyLDcg KzMxMiw3IEBAIC0gKHZvaWQpX3ByZXZpZXdVUkxGcm9tQWN0aW9uTWVudTooaWQpc2UKICAgICBp ZiAoX3ByZXZpZXdQb3BvdmVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBXZWJIaXRUZXN0UmVz dWx0KiBoaXRUZXN0UmVzdWx0ID0gX3BhZ2UtPmxhc3RNb3VzZU1vdmVIaXRUZXN0UmVzdWx0KCk7 CisgICAgUmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+IGhpdFRlc3RSZXN1bHQgPSBbc2VsZiBfd2Vi SGl0VGVzdFJlc3VsdF07CiAgICAgTlNVUkwgKnVybCA9IFtOU1VSTCBfd2ViX1VSTFdpdGhXVEZT dHJpbmc6aGl0VGVzdFJlc3VsdC0+YWJzb2x1dGVMaW5rVVJMKCldOwogICAgIE5TUmVjdCBvcmln aW5SZWN0ID0gaGl0VGVzdFJlc3VsdC0+ZWxlbWVudEJvdW5kaW5nQm94KCk7CiAgICAgW3NlbGYg X2NyZWF0ZVByZXZpZXdQb3BvdmVyRm9yVVJMOnVybCBvcmlnaW5SZWN0Om9yaWdpblJlY3RdOwpA QCAtMzk4LDcgKzM5OCw3IEBAIC0gKE5TQXJyYXkgKilfZGVmYXVsdE1lbnVJdGVtc0ZvclZpZGVv CiAgICAgUmV0YWluUHRyPE5TTWVudUl0ZW0+IGNvcHlWaWRlb1VSTEl0ZW0gPSBbc2VsZiBfY3Jl YXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6a1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdDb3B5VmlkZW9V UkxdOwogCiAgICAgUmV0YWluUHRyPE5TTWVudUl0ZW0+IHNhdmVUb0Rvd25sb2Fkc0l0ZW07Ci0g ICAgUmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+IGhpdFRlc3RSZXN1bHQgPSBXZWJIaXRUZXN0UmVz dWx0OjpjcmVhdGUoX2hpdFRlc3RSZXN1bHQuaGl0VGVzdFJlc3VsdCk7CisgICAgUmVmUHRyPFdl YkhpdFRlc3RSZXN1bHQ+IGhpdFRlc3RSZXN1bHQgPSBbc2VsZiBfd2ViSGl0VGVzdFJlc3VsdF07 CiAgICAgaWYgKGhpdFRlc3RSZXN1bHQtPmlzRG93bmxvYWRhYmxlTWVkaWEoKSkKICAgICAgICAg c2F2ZVRvRG93bmxvYWRzSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpr V0tDb250ZXh0QWN0aW9uSXRlbVRhZ1NhdmVWaWRlb1RvRG93bmxvYWRzXTsKICAgICBlbHNlCkBA IC00MTcsNyArNDE3LDcgQEAgLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVudUl0ZW1zRm9yVmlkZW8K IAogLSAodm9pZClfY29weVZpZGVvVVJMOihpZClzZW5kZXIKIHsKLSAgICBSZWZQdHI8V2ViSGl0 VGVzdFJlc3VsdD4gaGl0VGVzdFJlc3VsdCA9IFdlYkhpdFRlc3RSZXN1bHQ6OmNyZWF0ZShfaGl0 VGVzdFJlc3VsdC5oaXRUZXN0UmVzdWx0KTsKKyAgICBSZWZQdHI8V2ViSGl0VGVzdFJlc3VsdD4g aGl0VGVzdFJlc3VsdCA9IFtzZWxmIF93ZWJIaXRUZXN0UmVzdWx0XTsKIAogICAgIFtbTlNQYXN0 ZWJvYXJkIGdlbmVyYWxQYXN0ZWJvYXJkXSBjbGVhckNvbnRlbnRzXTsKICAgICBbW05TUGFzdGVi b2FyZCBnZW5lcmFsUGFzdGVib2FyZF0gd3JpdGVPYmplY3RzOkBbIGhpdFRlc3RSZXN1bHQtPmFi c29sdXRlTWVkaWFVUkwoKSBdXTsKQEAgLTQyNSw3ICs0MjUsNyBAQCAtICh2b2lkKV9jb3B5Vmlk ZW9VUkw6KGlkKXNlbmRlcgogCiAtICh2b2lkKV9zYXZlVmlkZW9Ub0Rvd25sb2FkczooaWQpc2Vu ZGVyCiB7Ci0gICAgUmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+IGhpdFRlc3RSZXN1bHQgPSBXZWJI aXRUZXN0UmVzdWx0OjpjcmVhdGUoX2hpdFRlc3RSZXN1bHQuaGl0VGVzdFJlc3VsdCk7CisgICAg UmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+IGhpdFRlc3RSZXN1bHQgPSBbc2VsZiBfd2ViSGl0VGVz dFJlc3VsdF07CiAgICAgX3BhZ2UtPnByb2Nlc3MoKS5jb250ZXh0KCkuZG93bmxvYWQoX3BhZ2Us IGhpdFRlc3RSZXN1bHQtPmFic29sdXRlTWVkaWFVUkwoKSk7CiB9CiAKQEAgLTQ2Nyw3ICs0Njcs NyBAQCAtICh2b2lkKV9jb3B5SW1hZ2U6KGlkKXNlbmRlcgogCiAtICh2b2lkKV9zYXZlSW1hZ2VU b0Rvd25sb2FkczooaWQpc2VuZGVyCiB7Ci0gICAgV2ViSGl0VGVzdFJlc3VsdCogaGl0VGVzdFJl c3VsdCA9IF9wYWdlLT5sYXN0TW91c2VNb3ZlSGl0VGVzdFJlc3VsdCgpOworICAgIFJlZlB0cjxX ZWJIaXRUZXN0UmVzdWx0PiBoaXRUZXN0UmVzdWx0ID0gW3NlbGYgX3dlYkhpdFRlc3RSZXN1bHRd OwogICAgIF9wYWdlLT5wcm9jZXNzKCkuY29udGV4dCgpLmRvd25sb2FkKF9wYWdlLCBoaXRUZXN0 UmVzdWx0LT5hYnNvbHV0ZUltYWdlVVJMKCkpOwogfQogCkBAIC04MjUsMjcgKzgyNSwyMCBAQCBz dGF0aWMgTlNJbWFnZSAqd2ViS2l0QnVuZGxlSW1hZ2VOYW1lZChOCiAgICAgcmV0dXJuIFtbTlNC dW5kbGUgYnVuZGxlRm9yQ2xhc3M6W1dLVmlldyBjbGFzc11dIGltYWdlRm9yUmVzb3VyY2U6bmFt ZV07CiB9CiAKLS0gKFBhc3NSZWZQdHI8V2ViSGl0VGVzdFJlc3VsdD4pX2hpdFRlc3RSZXN1bHRG b3JTdGFnZTooTWVudVVwZGF0ZVN0YWdlKXN0YWdlCistIChQYXNzUmVmUHRyPFdlYkhpdFRlc3RS ZXN1bHQ+KV93ZWJIaXRUZXN0UmVzdWx0CiB7CiAgICAgUmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+ IGhpdFRlc3RSZXN1bHQ7Ci0gICAgc3dpdGNoIChzdGFnZSkgewotICAgIGNhc2UgTWVudVVwZGF0 ZVN0YWdlOjpQcmVwYXJlRm9yTWVudToKKyAgICBpZiAoX3N0YXRlID09IEFjdGlvbk1lbnVTdGF0 ZTo6UmVhZHkpCisgICAgICAgIGhpdFRlc3RSZXN1bHQgPSBXZWJIaXRUZXN0UmVzdWx0OjpjcmVh dGUoX2hpdFRlc3RSZXN1bHQuaGl0VGVzdFJlc3VsdCk7CisgICAgZWxzZQogICAgICAgICBoaXRU ZXN0UmVzdWx0ID0gX3BhZ2UtPmxhc3RNb3VzZU1vdmVIaXRUZXN0UmVzdWx0KCk7Ci0gICAgICAg IGJyZWFrOwotICAgIGNhc2UgTWVudVVwZGF0ZVN0YWdlOjpNZW51TmVlZHNVcGRhdGU6Ci0gICAg ICAgIGlmIChfc3RhdGUgPT0gQWN0aW9uTWVudVN0YXRlOjpSZWFkeSkKLSAgICAgICAgICAgIGhp dFRlc3RSZXN1bHQgPSBXZWJIaXRUZXN0UmVzdWx0OjpjcmVhdGUoX2hpdFRlc3RSZXN1bHQuaGl0 VGVzdFJlc3VsdCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGhpdFRlc3RSZXN1bHQgPSBf cGFnZS0+bGFzdE1vdXNlTW92ZUhpdFRlc3RSZXN1bHQoKTsKLSAgICAgICAgYnJlYWs7Ci0gICAg fQogCiAgICAgcmV0dXJuIGhpdFRlc3RSZXN1bHQucmVsZWFzZSgpOwogfQogCi0tIChOU0FycmF5 ICopX2RlZmF1bHRNZW51SXRlbXM6KE1lbnVVcGRhdGVTdGFnZSlzdGFnZQorLSAoTlNBcnJheSAq KV9kZWZhdWx0TWVudUl0ZW1zCiB7Ci0gICAgUmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+IGhpdFRl c3RSZXN1bHQgPSBbc2VsZiBfaGl0VGVzdFJlc3VsdEZvclN0YWdlOnN0YWdlXTsKKyAgICBSZWZQ dHI8V2ViSGl0VGVzdFJlc3VsdD4gaGl0VGVzdFJlc3VsdCA9IFtzZWxmIF93ZWJIaXRUZXN0UmVz dWx0XTsKICAgICBpZiAoIWhpdFRlc3RSZXN1bHQpIHsKICAgICAgICAgX3R5cGUgPSBrV0tBY3Rp b25NZW51Tm9uZTsKICAgICAgICAgcmV0dXJuIF9zdGF0ZSAhPSBBY3Rpb25NZW51U3RhdGU6OlJl YWR5ID8gQFsgW05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV0gXSA6IEBbIF07CkBAIC05MDIsOCAr ODk1LDggQEAgLSAodm9pZClfdXBkYXRlQWN0aW9uTWVudUl0ZW1zRm9yU3RhZ2U6KAogewogICAg IFtfd2tWaWV3LmFjdGlvbk1lbnUgcmVtb3ZlQWxsSXRlbXNdOwogCi0gICAgTlNBcnJheSAqbWVu dUl0ZW1zID0gW3NlbGYgX2RlZmF1bHRNZW51SXRlbXM6c3RhZ2VdOwotICAgIFJlZlB0cjxXZWJI aXRUZXN0UmVzdWx0PiBoaXRUZXN0UmVzdWx0ID0gW3NlbGYgX2hpdFRlc3RSZXN1bHRGb3JTdGFn ZTpzdGFnZV07CisgICAgTlNBcnJheSAqbWVudUl0ZW1zID0gW3NlbGYgX2RlZmF1bHRNZW51SXRl bXNdOworICAgIFJlZlB0cjxXZWJIaXRUZXN0UmVzdWx0PiBoaXRUZXN0UmVzdWx0ID0gW3NlbGYg X3dlYkhpdFRlc3RSZXN1bHRdOwogCiAgICAgaWYgKFtfd2tWaWV3IHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3IoX2FjdGlvbk1lbnVJdGVtc0ZvckhpdFRlc3RSZXN1bHQ6ZGVmYXVsdEFjdGlv bk1lbnVJdGVtczopXSkKICAgICAgICAgbWVudUl0ZW1zID0gW193a1ZpZXcgX2FjdGlvbk1lbnVJ dGVtc0ZvckhpdFRlc3RSZXN1bHQ6dG9BUEkoaGl0VGVzdFJlc3VsdC5nZXQoKSkgZGVmYXVsdEFj dGlvbk1lbnVJdGVtczptZW51SXRlbXNdOwo=