122892 2013-10-16 06:45:18 -0700 Move code for finding rendered character offset to RenderTextLineBoxes 2013-10-16 07:32:30 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc glenn kangil.han kondapallykalyan oldest_to_newest 940363 0 koivisto 2013-10-16 06:45:18 -0700 that's where text boxes live 940367 1 214359 koivisto 2013-10-16 06:53:31 -0700 Created attachment 214359 patch 940368 2 214359 kling 2013-10-16 06:56:25 -0700 Comment on attachment 214359 patch Great! r=me 940372 3 koivisto 2013-10-16 07:32:30 -0700 https://trac.webkit.org/r157517 (with a logic fix) 214359 2013-10-16 06:53:31 -0700 2013-10-16 06:56:25 -0700 patch rendertextlineboxes-count-rendered-offset.patch text/plain 6587 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzUxNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTEwLTE2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIGNvZGUgZm9yIGZpbmRp bmcgcmVuZGVyZWQgY2hhcmFjdGVyIG9mZnNldCB0byBSZW5kZXJUZXh0TGluZUJveGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI4OTIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmNvdW50UmVuZGVy ZWRDaGFyYWN0ZXJPZmZzZXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmNvbnRh aW5zUmVuZGVyZWRDaGFyYWN0ZXJPZmZzZXQpOgorICAgICAgICAKKyAgICAgICAgICAgIFJlbmFt ZWQgZm9yIGNvbnNpc3RlbmN5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRMaW5l Qm94ZXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dExpbmVCb3hlczo6Y291bnRD aGFyYWN0ZXJPZmZzZXRzKToKKyAgICAgICAgCisgICAgICAgICAgICBUaGlzIHVzZWQgdG8gYmUg UG9zaXRpb246OnJlbmRlcmVkUG9zaXRpb24uCisKIDIwMTMtMTAtMTYgIEFuZHJlYXMgS2xpbmcg IDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmRlckVsZW1lbnQ6OnJlbW92ZUNoaWxk KCkgc2hvdWxkIHRha2UgY2hpbGQgYXMgYSByZWZlcmVuY2UuCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9kb20vUG9zaXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3Np dGlvbi5jcHAJKHJldmlzaW9uIDE1NzUxNCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlv bi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3OSwzMCArNDc5LDYgQEAgYm9vbCBQb3NpdGlvbjo6 YXRFbmRPZlRyZWUoKSBjb25zdAogICAgIHJldHVybiAhZmluZFBhcmVudChkZXByZWNhdGVkTm9k ZSgpKSAmJiBtX29mZnNldCA+PSBsYXN0T2Zmc2V0Rm9yRWRpdGluZyhkZXByZWNhdGVkTm9kZSgp KTsKIH0KIAotaW50IFBvc2l0aW9uOjpyZW5kZXJlZE9mZnNldCgpIGNvbnN0Ci17Ci0gICAgaWYg KCFkZXByZWNhdGVkTm9kZSgpLT5pc1RleHROb2RlKCkpCi0gICAgICAgIHJldHVybiBtX29mZnNl dDsKLSAgIAotICAgIGlmICghZGVwcmVjYXRlZE5vZGUoKS0+cmVuZGVyZXIoKSkKLSAgICAgICAg cmV0dXJuIG1fb2Zmc2V0OwotICAgICAgICAgICAgICAgICAgICAKLSAgICBpbnQgcmVzdWx0ID0g MDsKLSAgICBSZW5kZXJUZXh0KiB0ZXh0UmVuZGVyZXIgPSB0b1RleHQoZGVwcmVjYXRlZE5vZGUo KSktPnJlbmRlcmVyKCk7Ci0gICAgZm9yIChJbmxpbmVUZXh0Qm94ICpib3ggPSB0ZXh0UmVuZGVy ZXItPmZpcnN0VGV4dEJveCgpOyBib3g7IGJveCA9IGJveC0+bmV4dFRleHRCb3goKSkgewotICAg ICAgICBpbnQgc3RhcnQgPSBib3gtPnN0YXJ0KCk7Ci0gICAgICAgIGludCBlbmQgPSBib3gtPnN0 YXJ0KCkgKyBib3gtPmxlbigpOwotICAgICAgICBpZiAobV9vZmZzZXQgPCBzdGFydCkKLSAgICAg ICAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgICAgIGlmIChtX29mZnNldCA8PSBlbmQpIHsKLSAg ICAgICAgICAgIHJlc3VsdCArPSBtX29mZnNldCAtIHN0YXJ0OwotICAgICAgICAgICAgcmV0dXJu IHJlc3VsdDsKLSAgICAgICAgfQotICAgICAgICByZXN1bHQgKz0gYm94LT5sZW4oKTsKLSAgICB9 Ci0gICAgcmV0dXJuIHJlc3VsdDsKLX0KLQogLy8gcmV0dXJuIGZpcnN0IHByZWNlZGluZyBET00g cG9zaXRpb24gcmVuZGVyZWQgYXQgYSBkaWZmZXJlbnQgbG9jYXRpb24sIG9yICJ0aGlzIgogUG9z aXRpb24gUG9zaXRpb246OnByZXZpb3VzQ2hhcmFjdGVyUG9zaXRpb24oRUFmZmluaXR5IGFmZmlu aXR5KSBjb25zdAogewpAQCAtOTc1LDcgKzk1MSw3IEBAIGJvb2wgUG9zaXRpb246OmlzUmVuZGVy ZWRDaGFyYWN0ZXIoKSBjb24KICAgICBpZiAoIXJlbmRlcmVyKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgCi0gICAgcmV0dXJuIHJlbmRlcmVyLT5jb250YWluc0NoYXJhY3Rlck9mZnNldCht X29mZnNldCk7CisgICAgcmV0dXJuIHJlbmRlcmVyLT5jb250YWluc1JlbmRlcmVkQ2hhcmFjdGVy T2Zmc2V0KG1fb2Zmc2V0KTsKIH0KIAogc3RhdGljIGJvb2wgaW5TYW1lRW5jbG9zaW5nQmxvY2tG bG93RWxlbWVudChOb2RlKiBhLCBOb2RlKiBiKQpAQCAtMTAyOCw4ICsxMDA0LDggQEAgYm9vbCBQ b3NpdGlvbjo6cmVuZGVyc0luRGlmZmVyZW50UG9zaXRpbwogICAgIGlmIChwb3NSZW5kZXJlci0+ aXNUZXh0KCkgJiYgIXRvUmVuZGVyVGV4dChwb3NSZW5kZXJlciktPmNvbnRhaW5zQ2FyZXRPZmZz ZXQocG9zLm1fb2Zmc2V0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaW50IHRoaXNS ZW5kZXJlZE9mZnNldCA9IHJlbmRlcmVkT2Zmc2V0KCk7Ci0gICAgaW50IHBvc1JlbmRlcmVkT2Zm c2V0ID0gcG9zLnJlbmRlcmVkT2Zmc2V0KCk7CisgICAgaW50IHRoaXNSZW5kZXJlZE9mZnNldCA9 IHJlbmRlcmVyLT5pc1RleHQoKSA/IHRvUmVuZGVyVGV4dChyZW5kZXJlciktPmNvdW50UmVuZGVy ZWRDaGFyYWN0ZXJPZmZzZXRzVW50aWwobV9vZmZzZXQpIDogbV9vZmZzZXQ7CisgICAgaW50IHBv c1JlbmRlcmVkT2Zmc2V0ID0gcG9zUmVuZGVyZXItPmlzVGV4dCgpID8gdG9SZW5kZXJUZXh0KHBv c1JlbmRlcmVyKS0+Y291bnRSZW5kZXJlZENoYXJhY3Rlck9mZnNldHNVbnRpbChtX29mZnNldCkg OiBtX29mZnNldDsKIAogICAgIGlmIChyZW5kZXJlciA9PSBwb3NSZW5kZXJlciAmJiB0aGlzUmVu ZGVyZWRPZmZzZXQgPT0gcG9zUmVuZGVyZWRPZmZzZXQpCiAgICAgICAgIHJldHVybiBmYWxzZTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5oCShyZXZpc2lvbiAxNTc1MTQpCisrKyBTb3VyY2UvV2Vi Q29yZS9kb20vUG9zaXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMjA3LDkgKzIwNyw2IEBAIHB1 YmxpYzoKICAgICAKIHByaXZhdGU6CiAgICAgaW50IG9mZnNldEZvclBvc2l0aW9uQWZ0ZXJBbmNo b3IoKSBjb25zdDsKLQotICAgIGludCByZW5kZXJlZE9mZnNldCgpIGNvbnN0OwotCiAgICAgCiAg ICAgUG9zaXRpb24gcHJldmlvdXNDaGFyYWN0ZXJQb3NpdGlvbihFQWZmaW5pdHkpIGNvbnN0Owog ICAgIFBvc2l0aW9uIG5leHRDaGFyYWN0ZXJQb3NpdGlvbihFQWZmaW5pdHkpIGNvbnN0OwpJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAkocmV2aXNpb24gMTU3NTE0 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMTUxLDcgKzExNTEsMTIgQEAgaW50IFJlbmRlclRleHQ6OmNhcmV0TWF4T2Zmc2V0 KCkgY29uc3QKICAgICByZXR1cm4gbV9saW5lQm94ZXMuY2FyZXRNYXhPZmZzZXQoKnRoaXMpOwog fQogCi1ib29sIFJlbmRlclRleHQ6OmNvbnRhaW5zQ2hhcmFjdGVyT2Zmc2V0KHVuc2lnbmVkIG9m ZnNldCkgY29uc3QKK3Vuc2lnbmVkIFJlbmRlclRleHQ6OmNvdW50UmVuZGVyZWRDaGFyYWN0ZXJP ZmZzZXRzVW50aWwodW5zaWduZWQgb2Zmc2V0KSBjb25zdAoreworICAgIHJldHVybiBtX2xpbmVC b3hlcy5jb3VudENoYXJhY3Rlck9mZnNldHNVbnRpbChvZmZzZXQpOworfQorCitib29sIFJlbmRl clRleHQ6OmNvbnRhaW5zUmVuZGVyZWRDaGFyYWN0ZXJPZmZzZXQodW5zaWduZWQgb2Zmc2V0KSBj b25zdAogewogICAgIHJldHVybiBtX2xpbmVCb3hlcy5jb250YWluc09mZnNldCgqdGhpcywgb2Zm c2V0LCBSZW5kZXJUZXh0TGluZUJveGVzOjpDaGFyYWN0ZXJPZmZzZXQpOwogfQpJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCShyZXZpc2lvbiAxNTc1MTQpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjAs NyArMTIwLDggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBpbnQgY2FyZXRNaW5PZmZzZXQoKSBj b25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFsIGludCBjYXJldE1heE9mZnNldCgpIGNvbnN0IE9W RVJSSURFOwotICAgIGJvb2wgY29udGFpbnNDaGFyYWN0ZXJPZmZzZXQodW5zaWduZWQpIGNvbnN0 OworICAgIHVuc2lnbmVkIGNvdW50UmVuZGVyZWRDaGFyYWN0ZXJPZmZzZXRzVW50aWwodW5zaWdu ZWQpIGNvbnN0OworICAgIGJvb2wgY29udGFpbnNSZW5kZXJlZENoYXJhY3Rlck9mZnNldCh1bnNp Z25lZCkgY29uc3Q7CiAgICAgYm9vbCBjb250YWluc0NhcmV0T2Zmc2V0KHVuc2lnbmVkKSBjb25z dDsKICAgICBib29sIGhhc1JlbmRlcmVkVGV4dCgpIGNvbnN0OwogCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRMaW5lQm94ZXMuY3BwCShyZXZpc2lvbiAx NTc1MTQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTI0Myw2ICsyNDMsMjEgQEAgYm9vbCBSZW5kZXJUZXh0TGlu ZUJveGVzOjpjb250YWluc09mZnNldAogICAgIHJldHVybiBmYWxzZTsKIH0KIAordW5zaWduZWQg UmVuZGVyVGV4dExpbmVCb3hlczo6Y291bnRDaGFyYWN0ZXJPZmZzZXRzVW50aWwodW5zaWduZWQg b2Zmc2V0KSBjb25zdAoreworICAgIHVuc2lnbmVkIHJlc3VsdCA9IDA7CisgICAgZm9yIChhdXRv IGJveCA9IG1fZmlyc3Q7IGJveDsgYm94ID0gYm94LT5uZXh0VGV4dEJveCgpKSB7CisgICAgICAg IGlmIChvZmZzZXQgPCBib3gtPnN0YXJ0KCkpCisgICAgICAgICAgICByZXR1cm4gcmVzdWx0Owor ICAgICAgICBpZiAob2Zmc2V0IDw9IGJveC0+c3RhcnQoKSArIGJveC0+bGVuKCkpIHsKKyAgICAg ICAgICAgIHJlc3VsdCArPSBvZmZzZXQgLSBib3gtPnN0YXJ0KCk7CisgICAgICAgICAgICByZXR1 cm4gcmVzdWx0OworICAgICAgICB9CisgICAgICAgIHJlc3VsdCArPSBib3gtPmxlbigpOworICAg IH0KKyAgICByZXR1cm4gcmVzdWx0OworfQorCiBlbnVtIFNob3VsZEFmZmluaXR5QmVEb3duc3Ry ZWFtIHsgQWx3YXlzRG93bnN0cmVhbSwgQWx3YXlzVXBzdHJlYW0sIFVwc3RyZWFtSWZQb3NpdGlv bklzTm90QXRTdGFydCB9OwogCiBzdGF0aWMgYm9vbCBsaW5lRGlyZWN0aW9uUG9pbnRGaXRzSW5C b3goaW50IHBvaW50TGluZURpcmVjdGlvbiwgY29uc3QgSW5saW5lVGV4dEJveCYgYm94LCBTaG91 bGRBZmZpbml0eUJlRG93bnN0cmVhbSYgc2hvdWxkQWZmaW5pdHlCZURvd25zdHJlYW0pCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0TGluZUJveGVzLmgJKHJl dmlzaW9uIDE1NzUxNCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0TGlu ZUJveGVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTYyLDYgKzYyLDcgQEAgcHVibGljOgogICAgIGlu dCBjYXJldE1heE9mZnNldChjb25zdCBSZW5kZXJUZXh0JikgY29uc3Q7CiAgICAgZW51bSBPZmZz ZXRUeXBlIHsgQ2FyZXRPZmZzZXQsIENoYXJhY3Rlck9mZnNldCB9OwogICAgIGJvb2wgY29udGFp bnNPZmZzZXQoY29uc3QgUmVuZGVyVGV4dCYsIHVuc2lnbmVkLCBPZmZzZXRUeXBlKSBjb25zdDsK KyAgICB1bnNpZ25lZCBjb3VudENoYXJhY3Rlck9mZnNldHNVbnRpbCh1bnNpZ25lZCkgY29uc3Q7 CiAKICAgICBWaXNpYmxlUG9zaXRpb24gcG9zaXRpb25Gb3JQb2ludChjb25zdCBSZW5kZXJUZXh0 JiwgY29uc3QgTGF5b3V0UG9pbnQmKSBjb25zdDsKIAo=