209107 2020-03-14 10:31:39 -0700 Share HitTestResult::addNodeToListBasedTestResult() impl for LayoutRect and FloatRect overloads 2020-03-14 12:20:02 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 209110 1 dbates dbates beidson esprehn+autocc ews-watchlist glenn kondapallykalyan pdr webkit-bug-importer oldest_to_newest 1630054 0 dbates 2020-03-14 10:31:39 -0700 There are two overloads HitTestResult::addNodeToListBasedTestResult(): one for LayoutRect and one for FloatRect. Maybe one of the overloads is not necessary. I don't know, yet, but the implementation of these overloads are identical. As a first step towards future simplifications let's share the implementation and thus remove duplication. 1630056 1 393585 dbates 2020-03-14 10:46:25 -0700 Created attachment 393585 Patch 1630057 2 393585 dbates 2020-03-14 10:48:25 -0700 Comment on attachment 393585 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393585&action=review > Source/WebCore/rendering/HitTestResult.h:152 > + template<typename RectType> HitTestProgress addNodeToListBasedTestResultCommon(Node*, const HitTestRequest&, const HitTestLocation&, const RectType&); Could also make node const....I'll try and maybe fold it into this patch. 1630058 3 393585 dbates 2020-03-14 10:50:38 -0700 Comment on attachment 393585 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393585&action=review >> Source/WebCore/rendering/HitTestResult.h:152 >> + template<typename RectType> HitTestProgress addNodeToListBasedTestResultCommon(Node*, const HitTestRequest&, const HitTestLocation&, const RectType&); > > Could also make node const....I'll try and maybe fold it into this patch. Actually, I am not going to do this in this patch as I would need to fix up more things.... 1630064 4 dbates 2020-03-14 11:59:21 -0700 Thanks for the review! 1630066 5 393585 dbates 2020-03-14 12:01:52 -0700 Comment on attachment 393585 Patch Clearing flags on attachment: 393585 Committed r258468: <https://trac.webkit.org/changeset/258468> 1630067 6 dbates 2020-03-14 12:01:53 -0700 All reviewed patches have been landed. Closing bug. 1630068 7 webkit-bug-importer 2020-03-14 12:02:14 -0700 <rdar://problem/60457690> 393585 2020-03-14 10:46:25 -0700 2020-03-14 12:01:52 -0700 Patch bug-209107-20200314104625.patch text/plain 4055 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJlOGQ0ZDc1NmYwNmQ3 NjlhNTU4OTMwNDY3MThkYjhjM2RkNjU0ZC4uZjYwYjIzYmJiZjQ4ZjJiMGNmYTEwYzczN2Y5MGFk OWExOTA4N2Q3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAzLTE0ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBTaGFyZSBIaXRUZXN0UmVz dWx0OjphZGROb2RlVG9MaXN0QmFzZWRUZXN0UmVzdWx0KCkgaW1wbCBmb3IgTGF5b3V0UmVjdCBh bmQgRmxvYXRSZWN0IG92ZXJsb2FkcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjA5MTA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVtb3ZlIGNvZGUgZHVwbGljYXRpb24gZm9yIGFkZGluZyBhIG5vZGUg dG8gdGhlIHJlc3VsdCBzZXQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIaXRUZXN0UmVzdWx0OjphZGROb2RlVG9MaXN0QmFzZWRU ZXN0UmVzdWx0Q29tbW9uKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpIaXRUZXN0UmVzdWx0 OjphZGROb2RlVG9MaXN0QmFzZWRUZXN0UmVzdWx0KTogV3JpdGUgaW4gdGVybXMgb2YgYWRkTm9k ZVRvTGlzdEJhc2VkVGVzdFJlc3VsdENvbW1vbigpLgorICAgICAgICAqIHJlbmRlcmluZy9IaXRU ZXN0UmVzdWx0Lmg6CisKIDIwMjAtMDMtMTMgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CiAKICAgICAgICAgQ3Jhc2ggaW4gVGV4dEl0ZXJhdG9yOjpub2RlIHZpYSBUZXh0TWFuaXB1 bGF0aW9uQ29udHJvbGxlcjo6cmVwbGFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRl c3RSZXN1bHQuY3BwCmluZGV4IDMxZDBmODkxZjA0YWNjOTdhYWQ5NzBkOTliYWQyZmUzNmRkZTM2 NTkuLmMxNWM3NGQxMmZlNGM2YjgxMDRhOGY5YzUyZmJiNzE5N2JmMWYwNjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHAKQEAgLTYxNSw3ICs2MTUsOCBAQCBi b29sIEhpdFRlc3RSZXN1bHQ6OmlzQ29udGVudEVkaXRhYmxlKCkgY29uc3QKICAgICByZXR1cm4g bV9pbm5lck5vblNoYXJlZE5vZGUtPmhhc0VkaXRhYmxlU3R5bGUoKTsKIH0KIAotSGl0VGVzdFBy b2dyZXNzIEhpdFRlc3RSZXN1bHQ6OmFkZE5vZGVUb0xpc3RCYXNlZFRlc3RSZXN1bHQoTm9kZSog bm9kZSwgY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IEhpdFRlc3RMb2NhdGlv biYgbG9jYXRpb25JbkNvbnRhaW5lciwgY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkKK3RlbXBsYXRl PHR5cGVuYW1lIFJlY3RUeXBlPgoraW5saW5lIEhpdFRlc3RQcm9ncmVzcyBIaXRUZXN0UmVzdWx0 OjphZGROb2RlVG9MaXN0QmFzZWRUZXN0UmVzdWx0Q29tbW9uKE5vZGUqIG5vZGUsIGNvbnN0IEhp dFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBIaXRUZXN0TG9jYXRpb24mIGxvY2F0aW9uSW5D b250YWluZXIsIGNvbnN0IFJlY3RUeXBlJiByZWN0KQogewogICAgIC8vIElmIGl0IGlzIG5vdCBh IGxpc3QtYmFzZWQgaGl0IHRlc3QsIHRoaXMgbWV0aG9kIGhhcyB0byBiZSBuby1vcC4KICAgICBp ZiAoIXJlcXVlc3QucmVzdWx0SXNFbGVtZW50TGlzdCgpKSB7CkBAIC02MzgsMjcgKzYzOSwxNCBA QCBIaXRUZXN0UHJvZ3Jlc3MgSGl0VGVzdFJlc3VsdDo6YWRkTm9kZVRvTGlzdEJhc2VkVGVzdFJl c3VsdChOb2RlKiBub2RlLCBjb25zdCBIaQogICAgIHJldHVybiByZWdpb25GaWxsZWQgPyBIaXRU ZXN0UHJvZ3Jlc3M6OlN0b3AgOiBIaXRUZXN0UHJvZ3Jlc3M6OkNvbnRpbnVlOwogfQogCitIaXRU ZXN0UHJvZ3Jlc3MgSGl0VGVzdFJlc3VsdDo6YWRkTm9kZVRvTGlzdEJhc2VkVGVzdFJlc3VsdChO b2RlKiBub2RlLCBjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgSGl0VGVzdExv Y2F0aW9uJiBsb2NhdGlvbkluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRSZWN0JiByZWN0KQorewor ICAgIHJldHVybiBhZGROb2RlVG9MaXN0QmFzZWRUZXN0UmVzdWx0Q29tbW9uKG5vZGUsIHJlcXVl c3QsIGxvY2F0aW9uSW5Db250YWluZXIsIHJlY3QpOworfQorCiBIaXRUZXN0UHJvZ3Jlc3MgSGl0 VGVzdFJlc3VsdDo6YWRkTm9kZVRvTGlzdEJhc2VkVGVzdFJlc3VsdChOb2RlKiBub2RlLCBjb25z dCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgSGl0VGVzdExvY2F0aW9uJiBsb2NhdGlv bkluQ29udGFpbmVyLCBjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiB7Ci0gICAgLy8gSWYgaXQgaXMg bm90IGEgbGlzdC1iYXNlZCBoaXQgdGVzdCwgdGhpcyBtZXRob2QgaGFzIHRvIGJlIG5vLW9wLgot ICAgIGlmICghcmVxdWVzdC5yZXN1bHRJc0VsZW1lbnRMaXN0KCkpIHsKLSAgICAgICAgQVNTRVJU KCFpc1JlY3RCYXNlZFRlc3QoKSk7Ci0gICAgICAgIHJldHVybiBIaXRUZXN0UHJvZ3Jlc3M6OlN0 b3A7Ci0gICAgfQotCi0gICAgaWYgKCFub2RlKQotICAgICAgICByZXR1cm4gSGl0VGVzdFByb2dy ZXNzOjpDb250aW51ZTsKLQotICAgIGlmIChyZXF1ZXN0LmRpc2FsbG93c1VzZXJBZ2VudFNoYWRv d0NvbnRlbnQoKSAmJiBub2RlLT5pc0luVXNlckFnZW50U2hhZG93VHJlZSgpKQotICAgICAgICBu b2RlID0gbm9kZS0+ZG9jdW1lbnQoKS5hbmNlc3Rvck5vZGVJblRoaXNTY29wZShub2RlKTsKLQot ICAgIG11dGFibGVMaXN0QmFzZWRUZXN0UmVzdWx0KCkuYWRkKG5vZGUpOwotCi0gICAgaWYgKHJl cXVlc3QuaW5jbHVkZXNBbGxFbGVtZW50c1VuZGVyUG9pbnQoKSkKLSAgICAgICAgcmV0dXJuIEhp dFRlc3RQcm9ncmVzczo6Q29udGludWU7Ci0KLSAgICBib29sIHJlZ2lvbkZpbGxlZCA9IHJlY3Qu Y29udGFpbnMobG9jYXRpb25JbkNvbnRhaW5lci5ib3VuZGluZ0JveCgpKTsKLSAgICByZXR1cm4g cmVnaW9uRmlsbGVkID8gSGl0VGVzdFByb2dyZXNzOjpTdG9wIDogSGl0VGVzdFByb2dyZXNzOjpD b250aW51ZTsKKyAgICByZXR1cm4gYWRkTm9kZVRvTGlzdEJhc2VkVGVzdFJlc3VsdENvbW1vbihu b2RlLCByZXF1ZXN0LCBsb2NhdGlvbkluQ29udGFpbmVyLCByZWN0KTsKIH0KIAogdm9pZCBIaXRU ZXN0UmVzdWx0OjphcHBlbmQoY29uc3QgSGl0VGVzdFJlc3VsdCYgb3RoZXIsIGNvbnN0IEhpdFRl c3RSZXF1ZXN0JiByZXF1ZXN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0hpdFRlc3RSZXN1bHQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0 LmgKaW5kZXggNjRkZTNlZTIyNzBkZWZhMmIxMGJlY2YxNjc4ODBkZDU1MjRlZDRjNy4uMjVmOTIw Mzk2NzJkMDc0NzllMWQwMTEwYzExMzFlZWQ2ZDU2MDI2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvSGl0VGVzdFJlc3VsdC5oCkBAIC0xNDksNiArMTQ5LDggQEAgcHVibGljOgogcHJpdmF0 ZToKICAgICBOb2RlU2V0JiBtdXRhYmxlTGlzdEJhc2VkVGVzdFJlc3VsdCgpOyAvLyBTZWUgYWJv dmUuCiAKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBSZWN0VHlwZT4gSGl0VGVzdFByb2dyZXNzIGFk ZE5vZGVUb0xpc3RCYXNlZFRlc3RSZXN1bHRDb21tb24oTm9kZSosIGNvbnN0IEhpdFRlc3RSZXF1 ZXN0JiwgY29uc3QgSGl0VGVzdExvY2F0aW9uJiwgY29uc3QgUmVjdFR5cGUmKTsKKwogI2lmIEVO QUJMRShWSURFTykKICAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQoKSBjb25zdDsK ICNlbmRpZgo=