57726 2011-04-03 03:19:44 -0700 Teach InlineIterator how to work from any root, not just a RenderBlock 2011-04-03 05:38:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 50912 1 eric eric abarth commit-queue mitz rniwa oldest_to_newest 378522 0 eric 2011-04-03 03:19:44 -0700 Teach InlineIterator how to work from any root, not just a RenderBlock 378523 1 88003 eric 2011-04-03 03:22:32 -0700 Created attachment 88003 Patch 378526 2 88003 rniwa 2011-04-03 03:57:20 -0700 Comment on attachment 88003 Patch Doesn't InlineIterator currently assume to be working on RenderBlock? It seems like we should assert that we're only passing RenderBlock before you make the behavioral change. 378527 3 eric 2011-04-03 04:03:38 -0700 It never uses it as a RenderBlock. It's just a pointer to where to start/stop walking. 378528 4 88003 rniwa 2011-04-03 04:05:45 -0700 Comment on attachment 88003 Patch I see. m_root is never used other than being compared with other pointers. Okay, the change looks sane to me. 378541 5 88003 commit-queue 2011-04-03 05:38:00 -0700 Comment on attachment 88003 Patch Clearing flags on attachment: 88003 Committed r82793: <http://trac.webkit.org/changeset/82793> 378542 6 commit-queue 2011-04-03 05:38:04 -0700 All reviewed patches have been landed. Closing bug. 88003 2011-04-03 03:22:32 -0700 2011-04-03 05:38:00 -0700 Patch bug-57726-20110403132229.patch text/plain 7257 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODI3OTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1ZDU2YTlmMzk1YTQyNDU5 ZjhjYjQxYjRkZWQ0ZDRjYjI4MTRkNTdjLi41NTAxMjAyMDRmMGIyZmRlY2NiNTQyZjk4YzQ0ODlh YWZmZWEwN2E1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjcgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBUZWFjaCBJbmxpbmVJdGVyYXRvciBob3cg dG8gd29yayBmcm9tIGFueSByb290LCBub3QganVzdCBhIFJlbmRlckJsb2NrCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzcyNgorCisgICAgICAgIEZv ciBpbXBsZW1lbnRpbmcgYmlkaS11bmljb2RlOiBpc29sYXRlLCB3ZSBuZWVkIHRvIGJlIGFibGUg dG8gcnVuIHRoZQorICAgICAgICBiaWRpIGFsZ29yaXRobSBvdmVyIGEgc3VidHJlZSBvZiBpbmxp bmVzLCBub3QganVzdCBmcm9tIGEgYmxvY2sgcm9vdC4KKyAgICAgICAgVGhpcyBpcyB0aGUgZmly c3Qgc3RlcCBpbiBtYWtpbmcgdGhpcyBwb3NzaWJsZS4KKworICAgICAgICAqIHJlbmRlcmluZy9J bmxpbmVJdGVyYXRvci5oOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OklubGlu ZUl0ZXJhdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpyb290KToKKyAg ICAgICAgKFdlYkNvcmU6OmJpZGlOZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OmJpZGlGaXJzdCk6 CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6aW5jcmVtZW50KToKKyAgICAgICAg KFdlYkNvcmU6OklubGluZUJpZGlSZXNvbHZlcjo6YXBwZW5kUnVuKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayk6CisKKzIwMTEtMDQtMDMgIEVyaWMgU2VpZGVsICA8 ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CiAgICAgICAgIFNwbGl0IG91dCBVbmljb2RlQmlkaSBlbnVtIGludG8gaXRzIG93biBoZWFkZXIg KHRvIGFsbG93IHVzZSBpbiBwbGF0Zm9ybSkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU3NzIyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9JbmxpbmVJdGVyYXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGlu ZUl0ZXJhdG9yLmgKaW5kZXggYTVlYmU5NjRlMThjMzU1YmZjNjJiYjQ0ZmFlZjE4MzlkY2ZjNzZm My4uYTEwNTdjNjNhM2QzOWRiN2NkNDVmZWEzZTIwN2E5ZjBiMDMyNTlmZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgKQEAgLTM0LDE1ICszNCwxNSBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBJbmxpbmVJdGVyYXRvciB7CiBwdWJsaWM6CiAgICAgSW5s aW5lSXRlcmF0b3IoKQotICAgICAgICA6IG1fYmxvY2soMCkKKyAgICAgICAgOiBtX3Jvb3QoMCkK ICAgICAgICAgLCBtX29iaigwKQogICAgICAgICAsIG1fcG9zKDApCiAgICAgICAgICwgbV9uZXh0 QnJlYWthYmxlUG9zaXRpb24oLTEpCiAgICAgewogICAgIH0KIAotICAgIElubGluZUl0ZXJhdG9y KFJlbmRlckJsb2NrKiBiLCBSZW5kZXJPYmplY3QqIG8sIHVuc2lnbmVkIHApCi0gICAgICAgIDog bV9ibG9jayhiKQorICAgIElubGluZUl0ZXJhdG9yKFJlbmRlck9iamVjdCogcm9vdCwgUmVuZGVy T2JqZWN0KiBvLCB1bnNpZ25lZCBwKQorICAgICAgICA6IG1fcm9vdChyb290KQogICAgICAgICAs IG1fb2JqKG8pCiAgICAgICAgICwgbV9wb3MocCkKICAgICAgICAgLCBtX25leHRCcmVha2FibGVQ b3NpdGlvbigtMSkKQEAgLTYzLDEzICs2MywxOSBAQCBwdWJsaWM6CiAgICAgICAgIG1fbmV4dEJy ZWFrYWJsZVBvc2l0aW9uID0gbmV4dEJyZWFrOwogICAgIH0KIAotICAgIHZvaWQgaW5jcmVtZW50 KElubGluZUJpZGlSZXNvbHZlciogcmVzb2x2ZXIgPSAwKTsKKyAgICBSZW5kZXJPYmplY3QqIHJv b3QoKSBjb25zdCB7IHJldHVybiBtX3Jvb3Q7IH0KKworICAgIHZvaWQgaW5jcmVtZW50KElubGlu ZUJpZGlSZXNvbHZlciogPSAwKTsKICAgICBib29sIGF0RW5kKCkgY29uc3Q7CiAKICAgICBVQ2hh ciBjdXJyZW50KCkgY29uc3Q7CiAgICAgQUxXQVlTX0lOTElORSBXVEY6OlVuaWNvZGU6OkRpcmVj dGlvbiBkaXJlY3Rpb24oKSBjb25zdDsKIAotICAgIFJlbmRlckJsb2NrKiBtX2Jsb2NrOworcHJp dmF0ZToKKyAgICBSZW5kZXJPYmplY3QqIG1fcm9vdDsKKworICAgIC8vIEZJWE1FOiBUaGVzZSBz aG91bGQgYmUgcHJpdmF0ZS4KK3B1YmxpYzoKICAgICBSZW5kZXJPYmplY3QqIG1fb2JqOwogICAg IHVuc2lnbmVkIG1fcG9zOwogICAgIGludCBtX25leHRCcmVha2FibGVQb3NpdGlvbjsKQEAgLTEx Nyw3ICsxMjMsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgbm90aWZ5UmVzb2x2ZXJXaWxsRXhpdE9i amVjdChJbmxpbmVCaWRpUmVzb2x2ZXIqIHJlc29sdmVyLCBSZQogLy8gRklYTUU6IFRoaXMgZnVu Y3Rpb24gaXMgbWlzbGVhZGluZ2x5IG5hbWVkLiBJdCBoYXMgbGl0dGxlIHRvIGRvIHdpdGggYmlk aS4KIC8vIFRoaXMgZnVuY3Rpb24gd2lsbCBpdGVyYXRlIG92ZXIgaW5saW5lcyB3aXRoaW4gYSBi bG9jaywgb3B0aW9uYWxseSBub3RpZnlpbmcKIC8vIGEgYmlkaSByZXNvbHZlciBhcyBpdCBlbnRl cnMvZXhpdHMgaW5saW5lcyAoc28gaXQgY2FuIHB1c2gvcG9wIGVtYmVkZGluZyBsZXZlbHMpLgot c3RhdGljIGlubGluZSBSZW5kZXJPYmplY3QqIGJpZGlOZXh0KFJlbmRlckJsb2NrKiBibG9jaywg UmVuZGVyT2JqZWN0KiBjdXJyZW50LCBJbmxpbmVCaWRpUmVzb2x2ZXIqIHJlc29sdmVyID0gMCwg Ym9vbCBza2lwSW5saW5lcyA9IHRydWUsIGJvb2wqIGVuZE9mSW5saW5lUHRyID0gMCkKK3N0YXRp YyBpbmxpbmUgUmVuZGVyT2JqZWN0KiBiaWRpTmV4dChSZW5kZXJPYmplY3QqIHJvb3QsIFJlbmRl ck9iamVjdCogY3VycmVudCwgSW5saW5lQmlkaVJlc29sdmVyKiByZXNvbHZlciA9IDAsIGJvb2wg c2tpcElubGluZXMgPSB0cnVlLCBib29sKiBlbmRPZklubGluZVB0ciA9IDApCiB7CiAgICAgUmVu ZGVyT2JqZWN0KiBuZXh0ID0gMDsKICAgICBib29sIG9sZEVuZE9mSW5saW5lID0gZW5kT2ZJbmxp bmVQdHIgPyAqZW5kT2ZJbmxpbmVQdHIgOiBmYWxzZTsKQEAgLTEzNyw3ICsxNDMsNyBAQCBzdGF0 aWMgaW5saW5lIFJlbmRlck9iamVjdCogYmlkaU5leHQoUmVuZGVyQmxvY2sqIGJsb2NrLCBSZW5k ZXJPYmplY3QqIGN1cnJlbnQsCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9 CiAKLSAgICAgICAgICAgIHdoaWxlIChjdXJyZW50ICYmIGN1cnJlbnQgIT0gYmxvY2spIHsKKyAg ICAgICAgICAgIHdoaWxlIChjdXJyZW50ICYmIGN1cnJlbnQgIT0gcm9vdCkgewogICAgICAgICAg ICAgICAgIG5vdGlmeVJlc29sdmVyV2lsbEV4aXRPYmplY3QocmVzb2x2ZXIsIGN1cnJlbnQpOwog CiAgICAgICAgICAgICAgICAgbmV4dCA9IGN1cnJlbnQtPm5leHRTaWJsaW5nKCk7CkBAIC0xNDcs NyArMTUzLDcgQEAgc3RhdGljIGlubGluZSBSZW5kZXJPYmplY3QqIGJpZGlOZXh0KFJlbmRlckJs b2NrKiBibG9jaywgUmVuZGVyT2JqZWN0KiBjdXJyZW50LAogICAgICAgICAgICAgICAgIH0KIAog ICAgICAgICAgICAgICAgIGN1cnJlbnQgPSBjdXJyZW50LT5wYXJlbnQoKTsKLSAgICAgICAgICAg ICAgICBpZiAoIXNraXBJbmxpbmVzICYmIGN1cnJlbnQgJiYgY3VycmVudCAhPSBibG9jayAmJiBj dXJyZW50LT5pc1JlbmRlcklubGluZSgpKSB7CisgICAgICAgICAgICAgICAgaWYgKCFza2lwSW5s aW5lcyAmJiBjdXJyZW50ICYmIGN1cnJlbnQgIT0gcm9vdCAmJiBjdXJyZW50LT5pc1JlbmRlcklu bGluZSgpKSB7CiAgICAgICAgICAgICAgICAgICAgIG5leHQgPSBjdXJyZW50OwogICAgICAgICAg ICAgICAgICAgICBlbmRPZklubGluZSA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFr OwpAQCAtMTcxLDE2ICsxNzcsMTYgQEAgc3RhdGljIGlubGluZSBSZW5kZXJPYmplY3QqIGJpZGlO ZXh0KFJlbmRlckJsb2NrKiBibG9jaywgUmVuZGVyT2JqZWN0KiBjdXJyZW50LAogICAgIHJldHVy biBuZXh0OwogfQogCi1zdGF0aWMgaW5saW5lIFJlbmRlck9iamVjdCogYmlkaUZpcnN0KFJlbmRl ckJsb2NrKiBibG9jaywgSW5saW5lQmlkaVJlc29sdmVyKiByZXNvbHZlciwgYm9vbCBza2lwSW5s aW5lcyA9IHRydWUpCitzdGF0aWMgaW5saW5lIFJlbmRlck9iamVjdCogYmlkaUZpcnN0KFJlbmRl ck9iamVjdCogcm9vdCwgSW5saW5lQmlkaVJlc29sdmVyKiByZXNvbHZlciwgYm9vbCBza2lwSW5s aW5lcyA9IHRydWUpCiB7Ci0gICAgaWYgKCFibG9jay0+Zmlyc3RDaGlsZCgpKQorICAgIGlmICgh cm9vdC0+Zmlyc3RDaGlsZCgpKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIFJlbmRlck9iamVj dCogbyA9IGJsb2NrLT5maXJzdENoaWxkKCk7CisgICAgUmVuZGVyT2JqZWN0KiBvID0gcm9vdC0+ Zmlyc3RDaGlsZCgpOwogICAgIGlmIChvLT5pc1JlbmRlcklubGluZSgpKSB7CiAgICAgICAgIG5v dGlmeVJlc29sdmVyRW50ZXJlZE9iamVjdChyZXNvbHZlciwgbyk7CiAgICAgICAgIGlmIChza2lw SW5saW5lcyAmJiBvLT5maXJzdENoaWxkKCkpCi0gICAgICAgICAgICBvID0gYmlkaU5leHQoYmxv Y2ssIG8sIHJlc29sdmVyLCBza2lwSW5saW5lcyk7CisgICAgICAgICAgICBvID0gYmlkaU5leHQo cm9vdCwgbywgcmVzb2x2ZXIsIHNraXBJbmxpbmVzKTsKICAgICAgICAgZWxzZSB7CiAgICAgICAg ICAgICAvLyBOZXZlciBza2lwIGVtcHR5IGlubGluZXMuCiAgICAgICAgICAgICBpZiAocmVzb2x2 ZXIpCkBAIC0xOTAsNyArMTk2LDcgQEAgc3RhdGljIGlubGluZSBSZW5kZXJPYmplY3QqIGJpZGlG aXJzdChSZW5kZXJCbG9jayogYmxvY2ssIElubGluZUJpZGlSZXNvbHZlciogcmUKICAgICB9CiAK ICAgICBpZiAobyAmJiAhby0+aXNUZXh0KCkgJiYgIW8tPmlzUmVwbGFjZWQoKSAmJiAhby0+aXNG bG9hdGluZygpICYmICFvLT5pc1Bvc2l0aW9uZWQoKSkKLSAgICAgICAgbyA9IGJpZGlOZXh0KGJs b2NrLCBvLCByZXNvbHZlciwgc2tpcElubGluZXMpOworICAgICAgICBvID0gYmlkaU5leHQocm9v dCwgbywgcmVzb2x2ZXIsIHNraXBJbmxpbmVzKTsKIAogICAgIGlmIChyZXNvbHZlcikKICAgICAg ICAgcmVzb2x2ZXItPmNvbW1pdEV4cGxpY2l0RW1iZWRkaW5nKCk7CkBAIC0yMDcsNyArMjEzLDcg QEAgaW5saW5lIHZvaWQgSW5saW5lSXRlcmF0b3I6OmluY3JlbWVudChJbmxpbmVCaWRpUmVzb2x2 ZXIqIHJlc29sdmVyKQogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAvLyBiaWRpTmV4 dCBjYW4gcmV0dXJuIDAsIHNvIHVzZSBtb3ZlVG8gaW5zdGVhZCBvZiBtb3ZlVG9TdGFydE9mCi0g ICAgbW92ZVRvKGJpZGlOZXh0KG1fYmxvY2ssIG1fb2JqLCByZXNvbHZlciksIDApOworICAgIG1v dmVUbyhiaWRpTmV4dChtX3Jvb3QsIG1fb2JqLCByZXNvbHZlciksIDApOwogfQogCiBpbmxpbmUg Ym9vbCBJbmxpbmVJdGVyYXRvcjo6YXRFbmQoKSBjb25zdApAQCAtMjUzLDcgKzI1OSw3IEBAIGlu bGluZSB2b2lkIElubGluZUJpZGlSZXNvbHZlcjo6YXBwZW5kUnVuKCkKICAgICAgICAgd2hpbGUg KG9iaiAmJiBvYmogIT0gbV9lb3IubV9vYmogJiYgb2JqICE9IGVuZE9mTGluZS5tX29iaikgewog ICAgICAgICAgICAgUmVuZGVyQmxvY2s6OmFwcGVuZFJ1bnNGb3JPYmplY3Qoc3RhcnQsIG9iai0+ bGVuZ3RoKCksIG9iaiwgKnRoaXMpOyAgICAgICAgCiAgICAgICAgICAgICBzdGFydCA9IDA7Ci0g ICAgICAgICAgICBvYmogPSBiaWRpTmV4dChtX3Nvci5tX2Jsb2NrLCBvYmopOworICAgICAgICAg ICAgb2JqID0gYmlkaU5leHQobV9zb3Iucm9vdCgpLCBvYmopOwogICAgICAgICB9CiAgICAgICAg IGlmIChvYmopIHsKICAgICAgICAgICAgIHVuc2lnbmVkIHBvcyA9IG9iaiA9PSBtX2Vvci5tX29i aiA/IG1fZW9yLm1fcG9zIDogVUlOVF9NQVg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4IGUwY2JjMzgxNWJkOTYzMzQ4Mzli ZTZjODkwMjM3ODMxZDA5NzZkZTIuLmI4ODcwYzk0MTYwMWMwOGRmNGJkYTlmNGRhNGNhNmIyODU1 OGU0ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xp bmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xp bmVMYXlvdXQuY3BwCkBAIC0xNTQ0LDcgKzE1NDQsNyBAQCBzdGF0aWMgdm9pZCB0cnlIeXBoZW5h dGluZyhSZW5kZXJUZXh0KiB0ZXh0LCBjb25zdCBGb250JiBmb250LCBjb25zdCBBdG9taWNTdHJp bgogSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGluZUJp ZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wgZmlyc3RMaW5lLCBib29sJiBpc0xpbmVFbXB0eSwg TGluZUJyZWFrSXRlcmF0b3JJbmZvJiBsaW5lQnJlYWtJdGVyYXRvckluZm8sIGJvb2wmIHByZXZp b3VzTGluZUJyb2tlQ2xlYW5seSwgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYm9vbCYgaHlwaGVuYXRlZCwgRUNsZWFyKiBjbGVhciwgRmxvYXRpbmdPYmpl Y3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIFZlY3RvcjxSZW5kZXJCb3gqPiYgcG9zaXRp b25lZEJveGVzKQogewotICAgIEFTU0VSVChyZXNvbHZlci5wb3NpdGlvbigpLm1fYmxvY2sgPT0g dGhpcyk7CisgICAgQVNTRVJUKHJlc29sdmVyLnBvc2l0aW9uKCkucm9vdCgpID09IHRoaXMpOwog CiAgICAgYm9vbCBhcHBsaWVkU3RhcnRXaWR0aCA9IHJlc29sdmVyLnBvc2l0aW9uKCkubV9wb3Mg PiAwOwogICAgIExpbmVNaWRwb2ludFN0YXRlJiBsaW5lTWlkcG9pbnRTdGF0ZSA9IHJlc29sdmVy Lm1pZHBvaW50U3RhdGUoKTsK