157561 2016-05-10 22:14:28 -0700 Optimize DataDetection's searchForLinkRemovingExistingDDLinks() 2016-05-12 21:50:50 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez darin enrica rniwa oldest_to_newest 1191838 0 cdumez 2016-05-10 22:14:28 -0700 Optimize DataDetection's searchForLinkRemovingExistingDDLinks() 1191840 1 278587 cdumez 2016-05-10 22:26:31 -0700 Created attachment 278587 Patch 1191862 2 278587 rniwa 2016-05-10 23:41:14 -0700 Comment on attachment 278587 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=278587&action=review > Source/WebCore/ChangeLog:17 > + 2. The second loop was using again Node::childNodes() and kept calling It looks like 2 here is one space outdented. 1192640 3 cdumez 2016-05-12 21:50:50 -0700 Landed in r200690. 278587 2016-05-10 22:26:31 -0700 2016-05-11 09:30:51 -0700 Patch bug-157561-20160510222719.patch text/plain 6892 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwNjYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThmOWIwMmYzM2VlYjEy YWU3OTNiZDk2M2M0NDAxMjYzMTI4MDk3NC4uOTM1YTcxNzg0MGZjODBmYjQ2OWNlYzlmZjMwYjMx OTVmYzA0MjM3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE2LTA1LTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgT3B0aW1pemUgRGF0YURldGVj dGlvbidzIHNlYXJjaEZvckxpbmtSZW1vdmluZ0V4aXN0aW5nRERMaW5rcygpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc1NjEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPcHRpbWl6ZSBEYXRhRGV0ZWN0 aW9uJ3Mgc2VhcmNoRm9yTGlua1JlbW92aW5nRXhpc3RpbmdERExpbmtzKCk6CisgICAgICAgIDEu IFRoZSBmaXJzdCBsb29wIHdhcyB1c2luZyBOb2RlOjpjaGlsZE5vZGVzKCkgdG8gaXRlcmF0ZSBv dmVyIHRoZSBjaGlsZAorICAgICAgICAgICBlbGVtZW50cy4gQmVjYXVzZSBvZiB0aGUgcmVjdXJz aXZlIGNhbGwsIHdlIG1heSBlbmQgdXAgcHJlcGVuZGluZworICAgICAgICAgICBjaGlsZHJlbiBh cyB3ZSBpdGVyYXRlIG92ZXIgdGhlbS4gVGhpcyBpcyBhbiBpc3N1ZSBiZWNhdXNlIHRoZQorICAg ICAgICAgICBjaGlsZENvdW50IHdhcyBjYWNoZWQgYmVmb3JlIHRoZSBsb29wIGFuZCB2ZWN0b3Ig aXQgd291bGQgYmxvdyBhd2F5CisgICAgICAgICAgIHRoZSBjYWNoZSBpbnNpZGUgdGhlIE5vZGVM aXN0LiBTd2l0Y2ggdG8gdXNpbmcgRWxlbWVudFRyYXZlcnNhbCB3aGljaAorICAgICAgICAgICBz aG91bGQgYmUgYm90aCBzYWZlciBhbmQgbW9yZSBlZmZpY2llbnQuIEkgZG9uJ3QgYmVsaWV2ZSB3 ZSBjYW4gdXNlCisgICAgICAgICAgIG91ciBuaWNlIEVsZW1lbnRDaGlsZEl0ZXJhdG9yIGhlcmUg dW5mb3J0dW5hdGVseSBhcyB3ZSB3b3VsZCBoaXQKKyAgICAgICAgICAgYXNzZXJ0aW9ucyBkdWUg dGhlIHRoZSBET00gbXV0YXRpb25zIHdoaWxlIGl0ZXJhdGluZy4KKyAgICAgICAyLiBUaGUgc2Vj b25kIGxvb3Agd2FzIHVzaW5nIGFnYWluIE5vZGU6OmNoaWxkTm9kZXMoKSBhbmQga2VwdCBjYWxs aW5nCisgICAgICAgICAgaXRlbSgwKSB0byBnZXQgdGhlIGZpcnN0IGNoaWxkIGFuZCBtb3ZlIGl0 IHRvIG1ha2UgaXQgdGhlIHByZXZpb3VzCisgICAgICAgICAgc2libGluZyBvZiBpdHMgb2xkIHBh cmVudC4gQWdhaW4sIHVzaW5nIGNoaWxkTm9kZXMoKSBoZXJlIGlzIHN1cGVyCisgICAgICAgICAg aW5lZmZpY2llbnQgYmVjYXVzZSB3ZSBrZWVwIG1vZGlmeWluZyB0aGUgY2hpbGRyZW4gYW5kIGNo aWxkTm9kZXMoKQorICAgICAgICAgIHJldHVybnMgYSBsaXZlIE5vZGVMaXN0LiBUaGUgY2FsbCB0 byBOb2RlTGlzdDo6bGVuZ3RoKCkgd291bGQgY2FjaGUKKyAgICAgICAgICBhbGwgdGhlIGNoaWxk cmVuIGluIGEgVmVjdG9yLCBvbmx5IHRvIGJsb3cgdGhhdCBjYWNoZSBhd2F5IGFmdGVyCisgICAg ICAgICAgcmVtb3ZpbmcgdGhlIGZpcnN0IGNoaWxkLiBTd2l0Y2ggdG8gdXNpbmcgQ29udGFpbmVy Tm9kZTo6Zmlyc3RDaGlsZCgpLgorICAgICAgIDMuIERyb3AgdGhlIHBhcmVudEVsZW1lbnQgcGFy YW1ldGVyIGFzIHdlIGNhbiBqdXN0IGdldCBpdCBmcm9tIHRoZSBjaGlsZC4KKyAgICAgICA0LiBV c2UgdGlnaHRlciB0eXBpbmcgc28gd2UgZG9uJ3QgZW5kIHVwIGNhbGxpbmcgdGhlIGltcGxlbWVu dGF0aW9ucyBvZgorICAgICAgICAgIGluc2VydEJlZm9yZSgpIC8gcmVtb3ZlQ2hpbGQoKSB0aGF0 IGFyZSBvbiBOb2RlLCB0aHVzIHVubmVjZXNzYXJpbHkKKyAgICAgICAgICBkb2luZyBhIGlzPENv bnRhaW5lck5vZGU+KCkgY2hlY2sgZXZlcnkgdGltZS4KKyAgICAgICA1LiBQYXNzIGVsZW1lbnQg YnkgcmVmZXJlbmNlIGluc3RlYWQgb2YgcG9pbnRlciBhcyBpdCBjYW5ub3QgYmUgbnVsbC4KKwor ICAgICAgICAqIGVkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5tbToKKyAgICAgICAgKFdlYkNv cmU6OnJlbW92ZVJlc3VsdExpbmtzRnJvbUFuY2hvcik6CisgICAgICAgIChXZWJDb3JlOjpzZWFy Y2hGb3JMaW5rUmVtb3ZpbmdFeGlzdGluZ0RETGlua3MpOgorCiAyMDE2LTA1LTEwICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgTnVtZXJvdXMgYmxvY2sgc2Vs ZWN0aW9uIGlzc3VlcyBvbiBpT1MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L2NvY29hL0RhdGFEZXRlY3Rpb24ubW0gYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0Rh dGFEZXRlY3Rpb24ubW0KaW5kZXggOTM3YjQ3ZDIyZmQ1ODAxMjc4NzY3YjdkYjRjODI0YzBlNDg2 MmVkYy4uYWVlYjJlZjdiYWQyZjA0NzgyYzhlZWE1ZmQxZGY1Nzg3YWJiOGIxYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9EYXRhRGV0ZWN0aW9uLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5tbQpAQCAtMjksNiArMjks NyBAQAogI2ltcG9ydCAiQXR0ci5oIgogI2ltcG9ydCAiQ1NTU3R5bGVEZWNsYXJhdGlvbi5oIgog I2ltcG9ydCAiRGF0YURldGVjdG9yc1NQSS5oIgorI2ltcG9ydCAiRWxlbWVudFRyYXZlcnNhbC5o IgogI2ltcG9ydCAiRnJhbWVWaWV3LmgiCiAjaW1wb3J0ICJIVE1MQW5jaG9yRWxlbWVudC5oIgog I2ltcG9ydCAiSFRNTE5hbWVzLmgiCkBAIC0yNDgsMzcgKzI0OSwyOCBAQCBzdGF0aWMgTlNTdHJp bmcgKmNvbnN0cnVjdFVSTFN0cmluZ0ZvclJlc3VsdChERFJlc3VsdFJlZiBjdXJyZW50UmVzdWx0 LCBOU1N0cmluZwogICAgIHJldHVybiBuaWw7CiB9CiAKLXN0YXRpYyB2b2lkIHJlbW92ZVJlc3Vs dExpbmtzRnJvbUFuY2hvcihOb2RlKiBub2RlLCBOb2RlKiBub2RlUGFyZW50KQorc3RhdGljIHZv aWQgcmVtb3ZlUmVzdWx0TGlua3NGcm9tQW5jaG9yKEVsZW1lbnQmIGVsZW1lbnQpCiB7CiAgICAg Ly8gUGVyZm9ybSBhIGRlcHRoLWZpcnN0IHNlYXJjaCBmb3IgYW5jaG9yIG5vZGVzLCB3aGljaCBo YXZlIHRoZSBERFVSTFNjaGVtZSBhdHRyaWJ1dGUgc2V0IHRvIHRydWUsCi0gICAgLy8gdGFrZSB0 aGVpciBjaGlsZHJlbiBhbmQgaW5zZXJ0IHRoZW0gYmVmb3JlIHRoZSBhbmNob3IsCi0gICAgLy8g YW5kIHRoZW4gcmVtb3ZlIHRoZSBhbmNob3IuCi0gICAgCi0gICAgaWYgKCFub2RlKQorICAgIC8v IHRha2UgdGhlaXIgY2hpbGRyZW4gYW5kIGluc2VydCB0aGVtIGJlZm9yZSB0aGUgYW5jaG9yLCBh bmQgdGhlbiByZW1vdmUgdGhlIGFuY2hvci4KKworICAgIC8vIE5vdGUgdGhhdCB0aGlzIGlzIG5v dCB1c2luZyBFbGVtZW50Q2hpbGRJdGVyYXRvciBiZWNhdXNlIHdlIHBvdGVudGlhbGx5IHByZXBl bmQgY2hpbGRyZW4gYXMgd2UgaXRlcmF0ZSBvdmVyIHRoZW0uCisgICAgZm9yIChhdXRvKiBjaGls ZCA9IEVsZW1lbnRUcmF2ZXJzYWw6OmZpcnN0Q2hpbGQoZWxlbWVudCk7IGNoaWxkOyBjaGlsZCA9 IEVsZW1lbnRUcmF2ZXJzYWw6Om5leHRTaWJsaW5nKCpjaGlsZCkpCisgICAgICAgIHJlbW92ZVJl c3VsdExpbmtzRnJvbUFuY2hvcigqY2hpbGQpOworCisgICAgYXV0byogZWxlbWVudFBhcmVudCA9 IGVsZW1lbnQucGFyZW50RWxlbWVudCgpOworICAgIGlmICghZWxlbWVudFBhcmVudCkKICAgICAg ICAgcmV0dXJuOwogICAgIAotICAgIEJPT0wgbm9kZUlzRERBbmNob3IgPSBpczxIVE1MQW5jaG9y RWxlbWVudD4oKm5vZGUpICYmIGVxdWFsSWdub3JpbmdBU0NJSUNhc2UoZG93bmNhc3Q8RWxlbWVu dD4oKm5vZGUpLmZhc3RHZXRBdHRyaWJ1dGUoeF9hcHBsZV9kYXRhX2RldGVjdG9yc0F0dHIpLCAi dHJ1ZSIpOwotICAgIAotICAgIFJlZlB0cjxOb2RlTGlzdD4gY2hpbGRyZW4gPSBub2RlLT5jaGls ZE5vZGVzKCk7Ci0gICAgdW5zaWduZWQgY2hpbGRDb3VudCA9IGNoaWxkcmVuLT5sZW5ndGgoKTsK LSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNoaWxkQ291bnQ7IGkrKykgewotICAgICAgICBO b2RlKiBjaGlsZCA9IGNoaWxkcmVuLT5pdGVtKGkpOwotICAgICAgICBpZiAoaXM8RWxlbWVudD4o KmNoaWxkKSkKLSAgICAgICAgICAgIHJlbW92ZVJlc3VsdExpbmtzRnJvbUFuY2hvcihjaGlsZCwg bm9kZSk7Ci0gICAgfQotICAgIAotICAgIGlmIChub2RlSXNEREFuY2hvciAmJiBub2RlUGFyZW50 KSB7Ci0gICAgICAgIGNoaWxkcmVuID0gbm9kZS0+Y2hpbGROb2RlcygpOwotICAgICAgICBjaGls ZENvdW50ID0gY2hpbGRyZW4tPmxlbmd0aCgpOwotICAgICAgICAKLSAgICAgICAgLy8gSXRlcmF0 ZSBvdmVyIHRoZSBjaGlsZHJlbiBhbmQgbW92ZSB0aGVtIGFsbCBvbnRvIHRoZSBzYW1lIGxldmVs IGFzIHRoaXMgYW5jaG9yLgotICAgICAgICAvLyBSZW1vdmUgdGhlIGFuY2hvciBhZnRlcndhcmRz LgotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNoaWxkQ291bnQ7IGkrKykgewotICAg ICAgICAgICAgTm9kZSogY2hpbGQgPSBjaGlsZHJlbi0+aXRlbSgwKTsKLSAgICAgICAgICAgIG5v ZGVQYXJlbnQtPmluc2VydEJlZm9yZShjaGlsZCwgbm9kZSwgQVNTRVJUX05PX0VYQ0VQVElPTik7 Ci0gICAgICAgIH0KLSAgICAgICAgbm9kZVBhcmVudC0+cmVtb3ZlQ2hpbGQobm9kZSwgQVNTRVJU X05PX0VYQ0VQVElPTik7Ci0gICAgfQorICAgIGJvb2wgZWxlbWVudElzRERBbmNob3IgPSBpczxI VE1MQW5jaG9yRWxlbWVudD4oZWxlbWVudCkgJiYgZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShlbGVt ZW50LmZhc3RHZXRBdHRyaWJ1dGUoeF9hcHBsZV9kYXRhX2RldGVjdG9yc0F0dHIpLCAidHJ1ZSIp OworICAgIGlmICghZWxlbWVudElzRERBbmNob3IpCisgICAgICAgIHJldHVybjsKKworICAgIC8v IEl0ZXJhdGUgb3ZlciB0aGUgY2hpbGRyZW4gYW5kIG1vdmUgdGhlbSBhbGwgb250byB0aGUgc2Ft ZSBsZXZlbCBhcyB0aGlzIGFuY2hvci4gUmVtb3ZlIHRoZSBhbmNob3IgYWZ0ZXJ3YXJkcy4KKyAg ICB3aGlsZSAoYXV0byogY2hpbGQgPSBlbGVtZW50LmZpcnN0Q2hpbGQoKSkKKyAgICAgICAgZWxl bWVudFBhcmVudC0+aW5zZXJ0QmVmb3JlKCpjaGlsZCwgJmVsZW1lbnQpOworCisgICAgZWxlbWVu dFBhcmVudC0+cmVtb3ZlQ2hpbGQoZWxlbWVudCk7CiB9CiAKIHN0YXRpYyBib29sIHNlYXJjaEZv ckxpbmtSZW1vdmluZ0V4aXN0aW5nRERMaW5rcyhOb2RlJiBzdGFydE5vZGUsIE5vZGUmIGVuZE5v ZGUsIGJvb2wmIGRpZE1vZGlmeURPTSkKQEAgLTI4Nyw5ICsyNzksMTAgQEAgc3RhdGljIGJvb2wg c2VhcmNoRm9yTGlua1JlbW92aW5nRXhpc3RpbmdERExpbmtzKE5vZGUmIHN0YXJ0Tm9kZSwgTm9k ZSYgZW5kTm9kZSwKICAgICBOb2RlKiBub2RlID0gJnN0YXJ0Tm9kZTsKICAgICB3aGlsZSAobm9k ZSkgewogICAgICAgICBpZiAoaXM8SFRNTEFuY2hvckVsZW1lbnQ+KCpub2RlKSkgewotICAgICAg ICAgICAgaWYgKCFlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGRvd25jYXN0PEVsZW1lbnQ+KCpub2Rl KS5mYXN0R2V0QXR0cmlidXRlKHhfYXBwbGVfZGF0YV9kZXRlY3RvcnNBdHRyKSwgInRydWUiKSkK KyAgICAgICAgICAgIGF1dG8mIGFuY2hvciA9IGRvd25jYXN0PEhUTUxBbmNob3JFbGVtZW50Pigq bm9kZSk7CisgICAgICAgICAgICBpZiAoIWVxdWFsSWdub3JpbmdBU0NJSUNhc2UoYW5jaG9yLmZh c3RHZXRBdHRyaWJ1dGUoeF9hcHBsZV9kYXRhX2RldGVjdG9yc0F0dHIpLCAidHJ1ZSIpKQogICAg ICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgcmVtb3ZlUmVzdWx0TGlua3NG cm9tQW5jaG9yKG5vZGUsIG5vZGUtPnBhcmVudEVsZW1lbnQoKSk7CisgICAgICAgICAgICByZW1v dmVSZXN1bHRMaW5rc0Zyb21BbmNob3IoYW5jaG9yKTsKICAgICAgICAgICAgIGRpZE1vZGlmeURP TSA9IHRydWU7CiAgICAgICAgIH0KICAgICAgICAgCkBAIC0yOTksOSArMjkyLDEwIEBAIHN0YXRp YyBib29sIHNlYXJjaEZvckxpbmtSZW1vdmluZ0V4aXN0aW5nRERMaW5rcyhOb2RlJiBzdGFydE5v ZGUsIE5vZGUmIGVuZE5vZGUsCiAgICAgICAgICAgICBub2RlID0gc3RhcnROb2RlLnBhcmVudE5v ZGUoKTsKICAgICAgICAgICAgIHdoaWxlIChub2RlKSB7CiAgICAgICAgICAgICAgICAgaWYgKGlz PEhUTUxBbmNob3JFbGVtZW50Pigqbm9kZSkpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKCFl cXVhbElnbm9yaW5nQVNDSUlDYXNlKGRvd25jYXN0PEVsZW1lbnQ+KCpub2RlKS5mYXN0R2V0QXR0 cmlidXRlKHhfYXBwbGVfZGF0YV9kZXRlY3RvcnNBdHRyKSwgInRydWUiKSkKKyAgICAgICAgICAg ICAgICAgICAgYXV0byYgYW5jaG9yID0gZG93bmNhc3Q8SFRNTEFuY2hvckVsZW1lbnQ+KCpub2Rl KTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGFuY2hv ci5mYXN0R2V0QXR0cmlidXRlKHhfYXBwbGVfZGF0YV9kZXRlY3RvcnNBdHRyKSwgInRydWUiKSkK ICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgICAgICAg ICByZW1vdmVSZXN1bHRMaW5rc0Zyb21BbmNob3Iobm9kZSwgbm9kZS0+cGFyZW50RWxlbWVudCgp KTsKKyAgICAgICAgICAgICAgICAgICAgcmVtb3ZlUmVzdWx0TGlua3NGcm9tQW5jaG9yKGFuY2hv cik7CiAgICAgICAgICAgICAgICAgICAgIGRpZE1vZGlmeURPTSA9IHRydWU7CiAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgICAgIG5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCk7Cg==