59811 2011-04-29 11:09:57 -0700 Extract a function to obtain VisiblePosition from RenderText::positionForPoint 2011-04-29 18:13:45 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 59435 1 rniwa rniwa commit-queue darin eric hyatt jamesr mitz simon.fraser oldest_to_newest 395370 0 rniwa 2011-04-29 11:09:57 -0700 The part of RenderText::positionForPoint that returns visible positions when various conditions are met can be split into a separate function. 395423 1 91716 rniwa 2011-04-29 12:11:14 -0700 Created attachment 91716 cleanup 395644 2 91716 eric 2011-04-29 17:31:02 -0700 Comment on attachment 91716 cleanup LGTM. 395645 3 rniwa 2011-04-29 17:32:34 -0700 Thanks for the review, Eric. 395685 4 commit-queue 2011-04-29 18:12:28 -0700 The commit-queue encountered the following flaky tests while processing attachment 91716: http/tests/workers/shared-worker-importScripts.html bug 58634 (author: atwilson@chromium.org) The commit-queue is continuing to process your patch. 395686 5 91716 commit-queue 2011-04-29 18:13:39 -0700 Comment on attachment 91716 cleanup Clearing flags on attachment: 91716 Committed r85377: <http://trac.webkit.org/changeset/85377> 395687 6 commit-queue 2011-04-29 18:13:45 -0700 All reviewed patches have been landed. Closing bug. 91716 2011-04-29 12:11:14 -0700 2011-04-29 18:13:39 -0700 cleanup bug-59811-20110429121113.patch text/plain 4504 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MzQyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDQtMjkgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRXh0cmFjdCBhIGZ1bmN0aW9uIHRvIG9idGFpbiBWaXNpYmxlUG9z aXRpb24gZnJvbSBSZW5kZXJUZXh0Ojpwb3NpdGlvbkZvclBvaW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTgxMQorCisgICAgICAgIEV4dHJhY3Rl ZCBsaW5lRGlyZWN0aW9uUG9pbnRGaXRzSW5Cb3ggZnJvbSBwb3NpdGlvbkZvclBvaW50LgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bGlu ZURpcmVjdGlvblBvaW50Rml0c0luQm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6 OnBvc2l0aW9uRm9yUG9pbnQpOgorCiAyMDExLTA0LTI5ICBEZWFuIEphY2tzb24gIDxkaW5vQGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCShyZXZpc2lvbiA4NTM0MSkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDM0LDYgKzQzNCwzOCBAQCBJbmxpbmVUZXh0Qm94KiBSZW5kZXJUZXh0OjpmaW5kTmV4dElubGlu CiAgICAgcmV0dXJuIHM7CiB9CiAKK3N0YXRpYyBib29sIGxpbmVEaXJlY3Rpb25Qb2ludEZpdHNJ bkJveChpbnQgcG9pbnRMaW5lRGlyZWN0aW9uLCBJbmxpbmVUZXh0Qm94KiBib3gsIGludCBvZmZz ZXQsIEVBZmZpbml0eSYgYWZmaW5pdHkpCit7CisgICAgYWZmaW5pdHkgPSBET1dOU1RSRUFNOwor CisgICAgLy8gdGhlIHggY29vcmRpbmF0ZSBpcyBlcXVhbCB0byB0aGUgbGVmdCBlZGdlIG9mIHRo aXMgYm94CisgICAgLy8gdGhlIGFmZmluaXR5IG11c3QgYmUgZG93bnN0cmVhbSBzbyB0aGUgcG9z aXRpb24gZG9lc24ndCBqdW1wIGJhY2sgdG8gdGhlIHByZXZpb3VzIGxpbmUKKyAgICBpZiAocG9p bnRMaW5lRGlyZWN0aW9uID09IGJveC0+bG9naWNhbExlZnQoKSkKKyAgICAgICAgcmV0dXJuIHRy dWU7CisKKyAgICAvLyBhbmQgdGhlIHggY29vcmRpbmF0ZSBpcyB0byB0aGUgbGVmdCBvZiB0aGUg cmlnaHQgZWRnZSBvZiB0aGlzIGJveAorICAgIC8vIGNoZWNrIHRvIHNlZSBpZiBwb3NpdGlvbiBn b2VzIGluIHRoaXMgYm94CisgICAgaWYgKHBvaW50TGluZURpcmVjdGlvbiA8IGJveC0+bG9naWNh bFJpZ2h0KCkpIHsKKyAgICAgICAgYWZmaW5pdHkgPSBvZmZzZXQgPiAwID8gVlBfVVBTVFJFQU1f SUZfUE9TU0lCTEUgOiBET1dOU1RSRUFNOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisK KyAgICAvLyBib3ggaXMgZmlyc3Qgb24gbGluZQorICAgIC8vIGFuZCB0aGUgeCBjb29yZGluYXRl IGlzIHRvIHRoZSBsZWZ0IG9mIHRoZSBmaXJzdCB0ZXh0IGJveCBsZWZ0IGVkZ2UKKyAgICBpZiAo IWJveC0+cHJldk9uTGluZSgpICYmIHBvaW50TGluZURpcmVjdGlvbiA8IGJveC0+bG9naWNhbExl ZnQoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBpZiAoIWJveC0+bmV4dE9uTGluZSgp KSB7CisgICAgICAgIC8vIGJveCBpcyBsYXN0IG9uIGxpbmUKKyAgICAgICAgLy8gYW5kIHRoZSB4 IGNvb3JkaW5hdGUgaXMgdG8gdGhlIHJpZ2h0IG9mIHRoZSBsYXN0IHRleHQgYm94IHJpZ2h0IGVk Z2UKKyAgICAgICAgLy8gZ2VuZXJhdGUgVmlzaWJsZVBvc2l0aW9uLCB1c2UgVVBTVFJFQU0gYWZm aW5pdHkgaWYgcG9zc2libGUKKyAgICAgICAgYWZmaW5pdHkgPSBvZmZzZXQgPiAwID8gVlBfVVBT VFJFQU1fSUZfUE9TU0lCTEUgOiBET1dOU1RSRUFNOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICB9CisKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIFZpc2libGVQb3NpdGlvbiBSZW5kZXJUZXh0 Ojpwb3NpdGlvbkZvclBvaW50KGNvbnN0IEludFBvaW50JiBwb2ludCkKIHsKICAgICBpZiAoIWZp cnN0VGV4dEJveCgpIHx8IHRleHRMZW5ndGgoKSA9PSAwKQpAQCAtNDY2LDI5ICs0OTgsMTIgQEAg VmlzaWJsZVBvc2l0aW9uIFJlbmRlclRleHQ6OnBvc2l0aW9uRm9yUAogICAgICAgICAgICAgaW50 IGJvdHRvbSA9IHJvb3RCb3gtPnNlbGVjdGlvbkJvdHRvbSgpOwogICAgICAgICAgICAgaWYgKHJv b3RCb3gtPm5leHRSb290Qm94KCkpCiAgICAgICAgICAgICAgICAgYm90dG9tID0gbWluKGJvdHRv bSwgcm9vdEJveC0+bmV4dFJvb3RCb3goKS0+bGluZVRvcCgpKTsKLSAgICAgICAgICAgIGlmIChw b2ludEJsb2NrRGlyZWN0aW9uIDwgYm90dG9tKSB7Ci0gICAgICAgICAgICAgICAgb2Zmc2V0ID0g Ym94LT5vZmZzZXRGb3JQb3NpdGlvbihwb2ludExpbmVEaXJlY3Rpb24pOwogCi0gICAgICAgICAg ICAgICAgaWYgKHBvaW50TGluZURpcmVjdGlvbiA9PSBib3gtPmxvZ2ljYWxMZWZ0KCkpCi0gICAg ICAgICAgICAgICAgICAgIC8vIHRoZSB4IGNvb3JkaW5hdGUgaXMgZXF1YWwgdG8gdGhlIGxlZnQg ZWRnZSBvZiB0aGlzIGJveAotICAgICAgICAgICAgICAgICAgICAvLyB0aGUgYWZmaW5pdHkgbXVz dCBiZSBkb3duc3RyZWFtIHNvIHRoZSBwb3NpdGlvbiBkb2Vzbid0IGp1bXAgYmFjayB0byB0aGUg cHJldmlvdXMgbGluZQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gY3JlYXRlVmlzaWJsZVBv c2l0aW9uKG9mZnNldCArIGJveC0+c3RhcnQoKSwgRE9XTlNUUkVBTSk7Ci0KLSAgICAgICAgICAg ICAgICBpZiAocG9pbnRMaW5lRGlyZWN0aW9uIDwgYm94LT5sb2dpY2FsUmlnaHQoKSkKLSAgICAg ICAgICAgICAgICAgICAgLy8gYW5kIHRoZSB4IGNvb3JkaW5hdGUgaXMgdG8gdGhlIGxlZnQgb2Yg dGhlIHJpZ2h0IGVkZ2Ugb2YgdGhpcyBib3gKLSAgICAgICAgICAgICAgICAgICAgLy8gY2hlY2sg dG8gc2VlIGlmIHBvc2l0aW9uIGdvZXMgaW4gdGhpcyBib3gKLSAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGNyZWF0ZVZpc2libGVQb3NpdGlvbihvZmZzZXQgKyBib3gtPnN0YXJ0KCksIG9mZnNl dCA+IDAgPyBWUF9VUFNUUkVBTV9JRl9QT1NTSUJMRSA6IERPV05TVFJFQU0pOwotCi0gICAgICAg ICAgICAgICAgaWYgKCFib3gtPnByZXZPbkxpbmUoKSAmJiBwb2ludExpbmVEaXJlY3Rpb24gPCBi b3gtPmxvZ2ljYWxMZWZ0KCkpCi0gICAgICAgICAgICAgICAgICAgIC8vIGJveCBpcyBmaXJzdCBv biBsaW5lCi0gICAgICAgICAgICAgICAgICAgIC8vIGFuZCB0aGUgeCBjb29yZGluYXRlIGlzIHRv IHRoZSBsZWZ0IG9mIHRoZSBmaXJzdCB0ZXh0IGJveCBsZWZ0IGVkZ2UKLSAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIGNyZWF0ZVZpc2libGVQb3NpdGlvbihvZmZzZXQgKyBib3gtPnN0YXJ0KCks IERPV05TVFJFQU0pOwotCi0gICAgICAgICAgICAgICAgaWYgKCFib3gtPm5leHRPbkxpbmUoKSkK LSAgICAgICAgICAgICAgICAgICAgLy8gYm94IGlzIGxhc3Qgb24gbGluZQotICAgICAgICAgICAg ICAgICAgICAvLyBhbmQgdGhlIHggY29vcmRpbmF0ZSBpcyB0byB0aGUgcmlnaHQgb2YgdGhlIGxh c3QgdGV4dCBib3ggcmlnaHQgZWRnZQotICAgICAgICAgICAgICAgICAgICAvLyBnZW5lcmF0ZSBW aXNpYmxlUG9zaXRpb24sIHVzZSBVUFNUUkVBTSBhZmZpbml0eSBpZiBwb3NzaWJsZQotICAgICAg ICAgICAgICAgICAgICByZXR1cm4gY3JlYXRlVmlzaWJsZVBvc2l0aW9uKG9mZnNldCArIGJveC0+ c3RhcnQoKSwgb2Zmc2V0ID4gMCA/IFZQX1VQU1RSRUFNX0lGX1BPU1NJQkxFIDogRE9XTlNUUkVB TSk7CisgICAgICAgICAgICBpZiAocG9pbnRCbG9ja0RpcmVjdGlvbiA8IGJvdHRvbSkgeworICAg ICAgICAgICAgICAgIEVBZmZpbml0eSBhZmZpbml0eTsKKyAgICAgICAgICAgICAgICBpbnQgb2Zm c2V0ID0gYm94LT5vZmZzZXRGb3JQb3NpdGlvbihwb2ludExpbmVEaXJlY3Rpb24pOworICAgICAg ICAgICAgICAgIGlmIChsaW5lRGlyZWN0aW9uUG9pbnRGaXRzSW5Cb3gocG9pbnRMaW5lRGlyZWN0 aW9uLCBib3gsIG9mZnNldCwgYWZmaW5pdHkpKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4g Y3JlYXRlVmlzaWJsZVBvc2l0aW9uKG9mZnNldCArIGJveC0+c3RhcnQoKSwgYWZmaW5pdHkpOwog ICAgICAgICAgICAgfQogICAgICAgICAgICAgbGFzdEJveEFib3ZlID0gYm94OwogICAgICAgICB9 Cg==