197122 2019-04-19 14:55:31 -0700 Use RetainPtr and rename +autocorrectionRectsWithRects:lastRect: to +autocorrectionRectsWithFirstCGRect:lastCGRect: 2019-04-19 16:50:20 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build iPhone / iPad iOS 12 RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1528895 0 dbates 2019-04-19 14:55:31 -0700 Smarter code uses smart pointers :) (Sounded better in my head) and why not rename +autocorrectionRectsWithRects to autocorrectionRectsWithCGRects to make it clear what kinds of rects we expect: CGRects of course! 1528901 1 dbates 2019-04-19 15:00:57 -0700 I still don't like the name.... +autocorrectionRectsWithCGRects... hmm. 1528902 2 dbates 2019-04-19 15:02:09 -0700 +autocorrectionRectsWithFirstCGRect:lastCGRect:? 1528911 3 367841 dbates 2019-04-19 15:17:59 -0700 Created attachment 367841 Patch Went with +autocorrectionRectsWithFirstCGRect:lastCGRect:. It is a bit more verbose than I would like. I would need to understand the purpose of these rects to have a chance at a coming up with a better name I think. 1528959 4 367841 dbates 2019-04-19 16:49:13 -0700 Comment on attachment 367841 Patch Clearing flags on attachment: 367841 Committed r244474: <https://trac.webkit.org/changeset/244474> 1528960 5 dbates 2019-04-19 16:49:14 -0700 All reviewed patches have been landed. Closing bug. 1528962 6 webkit-bug-importer 2019-04-19 16:50:20 -0700 <rdar://problem/50064037> 367841 2019-04-19 15:17:59 -0700 2019-04-19 16:49:13 -0700 Patch bug-197122-20190419151758.patch text/plain 5594 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNmN2RhNTA3YjQ1NGFmNzNk YjlmODc5OTFkZGMzOGY4ZTc5MmQ4YmMuLjNhMmQ3ZTM0NjYxM2JkYTQ2NTcwMTdlMWEwNmYxYjQ3 OGZhMGZlZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDQtMTkgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBSZXRhaW5QdHIgYW5kIHJl bmFtZSArYXV0b2NvcnJlY3Rpb25SZWN0c1dpdGhSZWN0czpsYXN0UmVjdDogdG8gK2F1dG9jb3Jy ZWN0aW9uUmVjdHNXaXRoRmlyc3RDR1JlY3Q6bGFzdENHUmVjdDoKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzEyMgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgcmVxdWVzdEF1dG9j b3JyZWN0aW9uUmVjdHNGb3JTdHJpbmc6d2l0aENvbXBsZXRpb25IYW5kbGVyOl0pOiBSZW5hbWVk OyBmb3JtZXJseSBuYW1lZCArYXV0b2NvcnJlY3Rpb25SZWN0c1dpdGhSZWN0czpsYXN0UmVjdDou CisgICAgICAgIFdoaWxlIEkgYW0gaGVyZSB1c2UgZWxzZS1icmFuY2ggdG8gaW5pdGlhbGl6ZSBm aXJzdFJlY3QgYW5kIGxhc3RSZWN0IGp1c3QgdG8gbWFrZSB0aGUgY29kZSBjbG9zZXIgdG8gdGhl IG9wdGltYWwKKyAgICAgICAgYXNzZW1ibHkuIEFsc28gdXNlIFZlY3Rvcjo6e2lzRW1wdHksIGZp cnN0LCBsYXN0fSgpIGluc3RlYWQgb2YgdXNpbmcgdGhlIGluZGV4IG9wZXJhdG9yIG92ZXJsb2Fk IGFuZCBzaXplKCkgZm9yCisgICAgICAgIGVtcHRpbmVzcyBjaGVja3MuIFRoZSBjb2RlIGlzIG1v cmUgcmVhZGFibGUgYXQgdGhlIGNvc3QgYmVpbmcgZXZlciBzbyBzbGlnaHRseSBzbG93ZXIgKGR1 ZSB0byB0aGUgb3ZlcmZsb3cgY2hlY2tzCisgICAgICAgIGluIGZpcnN0KCkgYW5kIGxhc3QoKSks IGJ1dCB0aGlzIGNvZGUgaXMgbGlrZWx5IG5vdCBob3QgZW5vdWdoIGZvciBpdCB0byBtYXR0ZXIu CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgYXBwbHlBdXRvY29ycmVjdGlvbjp0b1N0cmluZzp3 aXRoQ29tcGxldGlvbkhhbmRsZXI6XSk6IFVwZGF0ZSBmb3IgcmVuYW1pbmcuCisgICAgICAgICgr W1dLQXV0b2NvcnJlY3Rpb25SZWN0cyBhdXRvY29ycmVjdGlvblJlY3RzV2l0aEZpcnN0Q0dSZWN0 Omxhc3RDR1JlY3Q6XSk6IERpdHRvLgorICAgICAgICAoK1tXS0F1dG9jb3JyZWN0aW9uUmVjdHMg YXV0b2NvcnJlY3Rpb25SZWN0c1dpdGhSZWN0czpsYXN0UmVjdDpdKTogRGVsZXRlZC4KKwogMjAx OS0wNC0xOSAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgLVtX S0F1dG9jb3JyZWN0aW9uQ29udGV4dCBlbXB0eUF1dG9jb3JyZWN0aW9uQ29udGV4dDpdIGdlbmVy YXRlcyBpbnZhbGlkIGVtcHR5IGNvbnRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IGIxZGU4M2FlNTJl MDYxNmRiNWI5ZTE5Y2MxZDhiYzgyNzllNTQ0ODMuLjJmNDBmZDUxYjU1ZjUyZThkOGNkYjRhNzZm NWY5MDM5ZjBhZjliZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtMjg1LDcgKzI4NSw3IEBAICsgKE5T QXJyYXkgKil0ZXh0U2VsZWN0aW9uUmVjdHNXaXRoV2ViUmVjdHM6KE5TQXJyYXkgKil3ZWJSZWN0 czsKIEBlbmQKIAogQGludGVyZmFjZSBXS0F1dG9jb3JyZWN0aW9uUmVjdHMgOiBVSVdLQXV0b2Nv cnJlY3Rpb25SZWN0cwotKyAoV0tBdXRvY29ycmVjdGlvblJlY3RzICopYXV0b2NvcnJlY3Rpb25S ZWN0c1dpdGhSZWN0czooQ0dSZWN0KWZpcnN0UmVjdCBsYXN0UmVjdDooQ0dSZWN0KWxhc3RSZWN0 OworKyAoV0tBdXRvY29ycmVjdGlvblJlY3RzICopYXV0b2NvcnJlY3Rpb25SZWN0c1dpdGhGaXJz dENHUmVjdDooQ0dSZWN0KWZpcnN0UmVjdCBsYXN0Q0dSZWN0OihDR1JlY3QpbGFzdFJlY3Q7CiBA ZW5kCiAKIEBpbnRlcmZhY2UgV0tBdXRvY29ycmVjdGlvbkNvbnRleHQgOiBVSVdLQXV0b2NvcnJl Y3Rpb25Db250ZXh0CkBAIC0zNDY3LDIwICszNDY3LDIzIEBAIC0gKHZvaWQpcmVxdWVzdEF1dG9j b3JyZWN0aW9uUmVjdHNGb3JTdHJpbmc6KE5TU3RyaW5nICopaW5wdXQgd2l0aENvbXBsZXRpb25I YW5kCiAgICAgfQogCiAgICAgX3BhZ2UtPnJlcXVlc3RBdXRvY29ycmVjdGlvbkRhdGEoaW5wdXQs IFt2aWV3ID0gcmV0YWluUHRyKHNlbGYpLCBjb21wbGV0aW9uID0gbWFrZUJsb2NrUHRyKGNvbXBs ZXRpb25IYW5kbGVyKV0oYXV0byYgcmVjdHMsIGF1dG8mIGZvbnROYW1lLCBkb3VibGUgZm9udFNp emUsIHVpbnQ2NF90IHRyYWl0cywgYXV0bykgewotICAgICAgICBDR1JlY3QgZmlyc3RSZWN0ID0g Q0dSZWN0WmVybzsKLSAgICAgICAgQ0dSZWN0IGxhc3RSZWN0ID0gQ0dSZWN0WmVybzsKLSAgICAg ICAgaWYgKHJlY3RzLnNpemUoKSkgewotICAgICAgICAgICAgZmlyc3RSZWN0ID0gcmVjdHNbMF07 Ci0gICAgICAgICAgICBsYXN0UmVjdCA9IHJlY3RzW3JlY3RzLnNpemUoKSAtIDFdOworICAgICAg ICBDR1JlY3QgZmlyc3RSZWN0OworICAgICAgICBDR1JlY3QgbGFzdFJlY3Q7CisgICAgICAgIGlm IChyZWN0cy5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGZpcnN0UmVjdCA9IENHUmVjdFplcm87 CisgICAgICAgICAgICBsYXN0UmVjdCA9IENHUmVjdFplcm87CisgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICBmaXJzdFJlY3QgPSByZWN0cy5maXJzdCgpOworICAgICAgICAgICAgbGFzdFJl Y3QgPSByZWN0cy5sYXN0KCk7CiAgICAgICAgIH0KLSAgICAgICAgCisKICAgICAgICAgdmlldy0+ X2F1dG9jb3JyZWN0aW9uRGF0YS5mb250TmFtZSA9IGZvbnROYW1lOwogICAgICAgICB2aWV3LT5f YXV0b2NvcnJlY3Rpb25EYXRhLmZvbnRTaXplID0gZm9udFNpemU7CiAgICAgICAgIHZpZXctPl9h dXRvY29ycmVjdGlvbkRhdGEuZm9udFRyYWl0cyA9IHRyYWl0czsKICAgICAgICAgdmlldy0+X2F1 dG9jb3JyZWN0aW9uRGF0YS50ZXh0Rmlyc3RSZWN0ID0gZmlyc3RSZWN0OwogICAgICAgICB2aWV3 LT5fYXV0b2NvcnJlY3Rpb25EYXRhLnRleHRMYXN0UmVjdCA9IGxhc3RSZWN0OwogCi0gICAgICAg IGNvbXBsZXRpb24ocmVjdHMuc2l6ZSgpID8gW1dLQXV0b2NvcnJlY3Rpb25SZWN0cyBhdXRvY29y cmVjdGlvblJlY3RzV2l0aFJlY3RzOmZpcnN0UmVjdCBsYXN0UmVjdDpsYXN0UmVjdF0gOiBuaWwp OworICAgICAgICBjb21wbGV0aW9uKCFyZWN0cy5pc0VtcHR5KCkgPyBbV0tBdXRvY29ycmVjdGlv blJlY3RzIGF1dG9jb3JyZWN0aW9uUmVjdHNXaXRoRmlyc3RDR1JlY3Q6Zmlyc3RSZWN0IGxhc3RD R1JlY3Q6bGFzdFJlY3RdIDogbmlsKTsKICAgICB9KTsKIH0KIApAQCAtMzY3MSwxMyArMzY3NCwx MyBAQCAtICh2b2lkKWFwcGx5QXV0b2NvcnJlY3Rpb246KE5TU3RyaW5nICopY29ycmVjdGlvbiB0 b1N0cmluZzooTlNTdHJpbmcgKilpbnB1dCB3aQogCiAgICAgaWYgKHVzZVN5bmNSZXF1ZXN0KSB7 CiAgICAgICAgIGlmIChjb21wbGV0aW9uSGFuZGxlcikKLSAgICAgICAgICAgIGNvbXBsZXRpb25I YW5kbGVyKF9wYWdlLT5hcHBseUF1dG9jb3JyZWN0aW9uKGNvcnJlY3Rpb24sIGlucHV0KSA/IFtX S0F1dG9jb3JyZWN0aW9uUmVjdHMgYXV0b2NvcnJlY3Rpb25SZWN0c1dpdGhSZWN0czpfYXV0b2Nv cnJlY3Rpb25EYXRhLnRleHRGaXJzdFJlY3QgbGFzdFJlY3Q6X2F1dG9jb3JyZWN0aW9uRGF0YS50 ZXh0TGFzdFJlY3RdIDogbmlsKTsKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKF9wYWdl LT5hcHBseUF1dG9jb3JyZWN0aW9uKGNvcnJlY3Rpb24sIGlucHV0KSA/IFtXS0F1dG9jb3JyZWN0 aW9uUmVjdHMgYXV0b2NvcnJlY3Rpb25SZWN0c1dpdGhGaXJzdENHUmVjdDpfYXV0b2NvcnJlY3Rp b25EYXRhLnRleHRGaXJzdFJlY3QgbGFzdENHUmVjdDpfYXV0b2NvcnJlY3Rpb25EYXRhLnRleHRM YXN0UmVjdF0gOiBuaWwpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgX3BhZ2UtPmFw cGx5QXV0b2NvcnJlY3Rpb24oY29ycmVjdGlvbiwgaW5wdXQsIFt2aWV3ID0gcmV0YWluUHRyKHNl bGYpLCBjb21wbGV0aW9uID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKV0oYXV0byYg c3RyaW5nLCBhdXRvIGVycm9yKSB7CiAgICAgICAgIGlmIChjb21wbGV0aW9uKQotICAgICAgICAg ICAgY29tcGxldGlvbighc3RyaW5nLmlzTnVsbCgpID8gW1dLQXV0b2NvcnJlY3Rpb25SZWN0cyBh dXRvY29ycmVjdGlvblJlY3RzV2l0aFJlY3RzOnZpZXctPl9hdXRvY29ycmVjdGlvbkRhdGEudGV4 dEZpcnN0UmVjdCBsYXN0UmVjdDp2aWV3LT5fYXV0b2NvcnJlY3Rpb25EYXRhLnRleHRMYXN0UmVj dF0gOiBuaWwpOworICAgICAgICAgICAgY29tcGxldGlvbighc3RyaW5nLmlzTnVsbCgpID8gW1dL QXV0b2NvcnJlY3Rpb25SZWN0cyBhdXRvY29ycmVjdGlvblJlY3RzV2l0aEZpcnN0Q0dSZWN0OnZp ZXctPl9hdXRvY29ycmVjdGlvbkRhdGEudGV4dEZpcnN0UmVjdCBsYXN0Q0dSZWN0OnZpZXctPl9h dXRvY29ycmVjdGlvbkRhdGEudGV4dExhc3RSZWN0XSA6IG5pbCk7CiAgICAgfSk7CiB9CiAKQEAg LTc3MTcsMTIgKzc3MjAsMTIgQEAgQGVuZAogCiBAaW1wbGVtZW50YXRpb24gV0tBdXRvY29ycmVj dGlvblJlY3RzCiAKLSsgKFdLQXV0b2NvcnJlY3Rpb25SZWN0cyAqKWF1dG9jb3JyZWN0aW9uUmVj dHNXaXRoUmVjdHM6KENHUmVjdClmaXJzdFJlY3QgbGFzdFJlY3Q6KENHUmVjdClsYXN0UmVjdAor KyAoV0tBdXRvY29ycmVjdGlvblJlY3RzICopYXV0b2NvcnJlY3Rpb25SZWN0c1dpdGhGaXJzdENH UmVjdDooQ0dSZWN0KWZpcnN0UmVjdCBsYXN0Q0dSZWN0OihDR1JlY3QpbGFzdFJlY3QKIHsKLSAg ICBXS0F1dG9jb3JyZWN0aW9uUmVjdHMgKnJlY3RzID1bW1dLQXV0b2NvcnJlY3Rpb25SZWN0cyBh bGxvY10gaW5pdF07Ci0gICAgcmVjdHMuZmlyc3RSZWN0ID0gZmlyc3RSZWN0OwotICAgIHJlY3Rz Lmxhc3RSZWN0ID0gbGFzdFJlY3Q7Ci0gICAgcmV0dXJuIFtyZWN0cyBhdXRvcmVsZWFzZV07Cisg ICAgYXV0byByZWN0cyA9IGFkb3B0TlMoW1tXS0F1dG9jb3JyZWN0aW9uUmVjdHMgYWxsb2NdIGlu aXRdKTsKKyAgICBbcmVjdHMgc2V0Rmlyc3RSZWN0OmZpcnN0UmVjdF07CisgICAgW3JlY3RzIHNl dExhc3RSZWN0Omxhc3RSZWN0XTsKKyAgICByZXR1cm4gcmVjdHMuYXV0b3JlbGVhc2UoKTsKIH0K IAogQGVuZAo=