54610 2011-02-16 19:42:17 -0800 Share code between elementFromPoint and caretRangeFromPoint in Document. 2011-02-24 04:31:36 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P2 Minor --- 0 eae webkit-unassigned commit-queue oldest_to_newest 352551 0 eae 2011-02-16 19:42:17 -0800 Document::elementFromPoint and Document::caretRangeFromPoint has quite a bit of code duplication and could use a shared helper function. 352552 1 82743 eae 2011-02-16 19:43:39 -0800 Created attachment 82743 Patch 356841 2 82743 eric 2011-02-24 03:20:23 -0800 Comment on attachment 82743 Patch Yay! 356864 3 82743 commit-queue 2011-02-24 04:31:32 -0800 Comment on attachment 82743 Patch Clearing flags on attachment: 82743 Committed r79543: <http://trac.webkit.org/changeset/79543> 356865 4 commit-queue 2011-02-24 04:31:36 -0800 All reviewed patches have been landed. Closing bug. 82743 2011-02-16 19:43:39 -0800 2011-02-24 04:31:32 -0800 Patch patch text/plain 4213 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4Nzc2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDItMTYgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNoYXJlIGNvZGUgYmV0d2VlbiBlbGVtZW50RnJvbVBvaW50IGFu ZCBjYXJldFJhbmdlRnJvbVBvaW50IGluIERvY3VtZW50LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ2MTAKKworICAgICAgICBFbGltaW5hdGUgZHVw bGljYXRlIGNvZGUgYnkgbW92aW5nIHNoYXJlZCBsb2dpYyBmcm9tIGVsZW1lbnRGcm9tUG9pbnQg YW5kCisgICAgICAgIGNhcmV0UmFuZ2VGcm9tUG9pbnQgaW50byBoZWxwZXIgZnVuY3Rpb24uCisK KyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bm9kZUZyb21Q b2ludCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZWxlbWVudEZyb21Qb2ludCk6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6Y2FyZXRSYW5nZUZyb21Qb2ludCk6CisKIDIwMTEt MDItMTYgIEFiaGlzaGVrIEFyeWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAko cmV2aXNpb24gNzg3MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMTUxLDEyICsxMTUxLDggQEAgUGFzc1JlZlB0cjxOb2RlTGlzdD4gRG9j dW1lbnQ6OmhhbmRsZVplcgogICAgIHJldHVybiBTdGF0aWNIYXNoU2V0Tm9kZUxpc3Q6OmFkb3B0 KGxpc3QpOwogfQogCi1FbGVtZW50KiBEb2N1bWVudDo6ZWxlbWVudEZyb21Qb2ludChpbnQgeCwg aW50IHkpIGNvbnN0CitzdGF0aWMgTm9kZSogbm9kZUZyb21Qb2ludChGcmFtZSogZnJhbWUsIFJl bmRlclZpZXcqIHJlbmRlclZpZXcsIGludCB4LCBpbnQgeSwgSW50UG9pbnQqIGxvY2FsUG9pbnQg PSAwKQogewotICAgIC8vIEZJWE1FOiBTaGFyZSBjb2RlIGJldHdlZW4gdGhpcyBhbmQgY2FyZXRS YW5nZUZyb21Qb2ludC4KLSAgICBpZiAoIXJlbmRlcmVyKCkpCi0gICAgICAgIHJldHVybiAwOwot ICAgIEZyYW1lKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAg ICAgcmV0dXJuIDA7CiAgICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBmcmFtZS0+dmlldygpOwpA QCAtMTE2NCw0NiArMTE2MCwzOSBAQCBFbGVtZW50KiBEb2N1bWVudDo6ZWxlbWVudEZyb21Qb2lu dChpbnQgCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgZmxvYXQgem9vbUZhY3RvciA9IGZyYW1l LT5wYWdlWm9vbUZhY3RvcigpOwotICAgIEludFBvaW50IHBvaW50ID0gcm91bmRlZEludFBvaW50 KEZsb2F0UG9pbnQoeCAqIHpvb21GYWN0b3IgICsgdmlldygpLT5zY3JvbGxYKCksIHkgKiB6b29t RmFjdG9yICsgdmlldygpLT5zY3JvbGxZKCkpKTsKKyAgICBJbnRQb2ludCBwb2ludCA9IHJvdW5k ZWRJbnRQb2ludChGbG9hdFBvaW50KHggKiB6b29tRmFjdG9yICArIGZyYW1lVmlldy0+c2Nyb2xs WCgpLCB5ICogem9vbUZhY3RvciArIGZyYW1lVmlldy0+c2Nyb2xsWSgpKSk7CiAKICAgICBpZiAo IWZyYW1lVmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0KCkuY29udGFpbnMocG9pbnQpKQogICAgICAg ICByZXR1cm4gMDsKIAogICAgIEhpdFRlc3RSZXF1ZXN0IHJlcXVlc3QoSGl0VGVzdFJlcXVlc3Q6 OlJlYWRPbmx5IHwgSGl0VGVzdFJlcXVlc3Q6OkFjdGl2ZSk7CiAgICAgSGl0VGVzdFJlc3VsdCBy ZXN1bHQocG9pbnQpOwotICAgIHJlbmRlclZpZXcoKS0+bGF5ZXIoKS0+aGl0VGVzdChyZXF1ZXN0 LCByZXN1bHQpOworICAgIHJlbmRlclZpZXctPmxheWVyKCktPmhpdFRlc3QocmVxdWVzdCwgcmVz dWx0KTsKIAotICAgIE5vZGUqIG4gPSByZXN1bHQuaW5uZXJOb2RlKCk7Ci0gICAgd2hpbGUgKG4g JiYgIW4tPmlzRWxlbWVudE5vZGUoKSkKLSAgICAgICAgbiA9IG4tPnBhcmVudE5vZGUoKTsKLSAg ICBpZiAobikKLSAgICAgICAgbiA9IG4tPnNoYWRvd0FuY2VzdG9yTm9kZSgpOwotICAgIHJldHVy biBzdGF0aWNfY2FzdDxFbGVtZW50Kj4obik7CisgICAgaWYgKGxvY2FsUG9pbnQpCisgICAgICAg ICpsb2NhbFBvaW50ID0gcmVzdWx0LmxvY2FsUG9pbnQoKTsKKworICAgIHJldHVybiByZXN1bHQu aW5uZXJOb2RlKCk7CiB9CiAKLVBhc3NSZWZQdHI8UmFuZ2U+IERvY3VtZW50OjpjYXJldFJhbmdl RnJvbVBvaW50KGludCB4LCBpbnQgeSkKK0VsZW1lbnQqIERvY3VtZW50OjplbGVtZW50RnJvbVBv aW50KGludCB4LCBpbnQgeSkgY29uc3QKIHsKLSAgICAvLyBGSVhNRTogU2hhcmUgY29kZSBiZXR3 ZWVuIHRoaXMgYW5kIGVsZW1lbnRGcm9tUG9pbnQuCiAgICAgaWYgKCFyZW5kZXJlcigpKQogICAg ICAgICByZXR1cm4gMDsKLSAgICBGcmFtZSogZnJhbWUgPSB0aGlzLT5mcmFtZSgpOwotICAgIGlm ICghZnJhbWUpCi0gICAgICAgIHJldHVybiAwOwotICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0g ZnJhbWUtPnZpZXcoKTsKLSAgICBpZiAoIWZyYW1lVmlldykKLSAgICAgICAgcmV0dXJuIDA7Ci0K LSAgICBmbG9hdCB6b29tRmFjdG9yID0gZnJhbWUtPnBhZ2Vab29tRmFjdG9yKCk7Ci0gICAgSW50 UG9pbnQgcG9pbnQgPSByb3VuZGVkSW50UG9pbnQoRmxvYXRQb2ludCh4ICogem9vbUZhY3RvciAr IHZpZXcoKS0+c2Nyb2xsWCgpLCB5ICogem9vbUZhY3RvciArIHZpZXcoKS0+c2Nyb2xsWSgpKSk7 CisgICAgTm9kZSogbm9kZSA9IG5vZGVGcm9tUG9pbnQoZnJhbWUoKSwgcmVuZGVyVmlldygpLCB4 LCB5KTsKKyAgICB3aGlsZSAobm9kZSAmJiAhbm9kZS0+aXNFbGVtZW50Tm9kZSgpKQorICAgICAg ICBub2RlID0gbm9kZS0+cGFyZW50Tm9kZSgpOworICAgIGlmIChub2RlKQorICAgICAgICBub2Rl ID0gbm9kZS0+c2hhZG93QW5jZXN0b3JOb2RlKCk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PEVs ZW1lbnQqPihub2RlKTsKK30KIAotICAgIGlmICghZnJhbWVWaWV3LT52aXNpYmxlQ29udGVudFJl Y3QoKS5jb250YWlucyhwb2ludCkpCitQYXNzUmVmUHRyPFJhbmdlPiBEb2N1bWVudDo6Y2FyZXRS YW5nZUZyb21Qb2ludChpbnQgeCwgaW50IHkpCit7CisgICAgaWYgKCFyZW5kZXJlcigpKQogICAg ICAgICByZXR1cm4gMDsKLQotICAgIEhpdFRlc3RSZXF1ZXN0IHJlcXVlc3QoSGl0VGVzdFJlcXVl c3Q6OlJlYWRPbmx5IHwgSGl0VGVzdFJlcXVlc3Q6OkFjdGl2ZSk7Ci0gICAgSGl0VGVzdFJlc3Vs dCByZXN1bHQocG9pbnQpOwotICAgIHJlbmRlclZpZXcoKS0+bGF5ZXIoKS0+aGl0VGVzdChyZXF1 ZXN0LCByZXN1bHQpOwotCi0gICAgTm9kZSogbm9kZSA9IHJlc3VsdC5pbm5lck5vZGUoKTsKKyAg ICBJbnRQb2ludCBsb2NhbFBvaW50OworICAgIE5vZGUqIG5vZGUgPSBub2RlRnJvbVBvaW50KGZy YW1lKCksIHJlbmRlclZpZXcoKSwgeCwgeSwgJmxvY2FsUG9pbnQpOwogICAgIGlmICghbm9kZSkK ICAgICAgICAgcmV0dXJuIDA7CiAKQEAgLTEyMTcsNyArMTIwNiw3IEBAIFBhc3NSZWZQdHI8UmFu Z2U+IERvY3VtZW50OjpjYXJldFJhbmdlRnIKICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0g bm9kZS0+cmVuZGVyZXIoKTsKICAgICBpZiAoIXJlbmRlcmVyKQogICAgICAgICByZXR1cm4gMDsK LSAgICBWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uID0gcmVuZGVyZXItPnBvc2l0aW9u Rm9yUG9pbnQocmVzdWx0LmxvY2FsUG9pbnQoKSk7CisgICAgVmlzaWJsZVBvc2l0aW9uIHZpc2li bGVQb3NpdGlvbiA9IHJlbmRlcmVyLT5wb3NpdGlvbkZvclBvaW50KGxvY2FsUG9pbnQpOwogICAg IGlmICh2aXNpYmxlUG9zaXRpb24uaXNOdWxsKCkpCiAgICAgICAgIHJldHVybiAwOwogCg==