134043 2014-06-18 15:35:00 -0700 Move the removeNode() tree walking from ScrollingStateNote into ScrollingStateTree 2014-06-20 14:02:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca cmarcelo commit-queue jamesr luiz simon.fraser tonikitoo oldest_to_newest 1016561 0 simon.fraser 2014-06-18 15:35:00 -0700 Move the removeNode() tree walking from ScrollingStateNote into ScrollingStateTree 1016563 1 233331 simon.fraser 2014-06-18 15:40:42 -0700 Created attachment 233331 Patch 1017030 2 simon.fraser 2014-06-20 14:02:50 -0700 http://trac.webkit.org/changeset/170131 233331 2014-06-18 15:40:42 -0700 2014-06-18 15:43:20 -0700 Patch bug-134043-20140618154020.patch text/plain 7436 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU5OGQyYzEwOWFkZmEw YTAzMDUwZGM5NGI1ZWMzOWIzNTgxZGI4Yi4uMGRhZWMwMzgxMGNhZTY0ZGM1NjQwYjhiYTEyMDM4 Zjk4N2IwMThhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE0LTA2LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIE1vdmUgdGhlIHJl bW92ZU5vZGUoKSB0cmVlIHdhbGtpbmcgZnJvbSBTY3JvbGxpbmdTdGF0ZU5vdGUgaW50byBTY3Jv bGxpbmdTdGF0ZVRyZWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzNDA0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEl0J3MgY2xlYW5lciBpZiBTY3JvbGxpbmdTdGF0ZVRyZWUgZG9lcyB0aGUgZGVzY2Vu ZGFudCB3YWxrIHdoZW4gcmVtb3Zpbmcgbm9kZXMuCisgICAgICAgIFdlIGNhbiBzaW1wbHkgc3Rh cnQgdGhlICJ3aWxsQmVSZW1vdmVkIiB3YWxrIGF0IHRoZSBub2RlIGluIHF1ZXN0aW9uLgorICAg ICAgICAKKyAgICAgICAgSGF2ZSB3aWxsUmVtb3ZlTm9kZSgpIGp1c3QgcmVtb3ZlIHRoZSBub2Rl IGZyb20gdGhlIG1fc3RhdGVOb2RlTWFwIGRpcmVjdGx5LCByYXRoZXIKKyAgICAgICAgdGhhbiB0 aGlzIGhhcHBlbmluZyBpbiBhIHNlcGFyYXRlIHdhbGsgb2YgbV9ub2Rlc1JlbW92ZWRTaW5jZUxh c3RDb21taXQuCisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVOb2RlOjpyZW1vdmVEZXNjZW5k YW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlTm9kZTo6d2ls bEJlUmVtb3ZlZEZyb21TdGF0ZVRyZWUpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1N0YXRlVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVRyZWU6 OmF0dGFjaE5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVUcmVlOjpkZXRh Y2hOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlVHJlZTo6Y2xlYXIpOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVUcmVlOjpyZW1vdmVOb2RlQW5kQWxsRGVz Y2VuZGFudHMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVUcmVlOjpyZWN1cnNp dmVOb2RlV2lsbEJlUmVtb3ZlZCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVRy ZWU6OndpbGxSZW1vdmVOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlVHJl ZTo6cmVtb3ZlTm9kZSk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nU3RhdGVUcmVlLmg6CisKKzIwMTQtMDYtMTggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CisKICAgICAgICAgTWFrZSBTY3JvbGxpbmdTdGF0ZU5vZGVzIHJlZmNvdW50 ZWQsIGFuZCBvdGhlciBtaW5vciBjbGVhbnVwCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQwNDAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5jcHAKaW5kZXggNWQ1MTYxMTA5NGM2Nzc3 MjFiMGRkZTZkN2JkZDkyNjkwNTA1NDQxMy4uYzM2YTg4NmQyZTA5MzM1NjJiNjEzOTdiMDE0MTVh NGQyNTg1NDY0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdTdGF0ZU5vZGUuY3BwCkBAIC0xMDIsMzIgKzEwMiw2IEBAIHZvaWQgU2Nyb2xsaW5n U3RhdGVOb2RlOjphcHBlbmRDaGlsZChQYXNzUmVmUHRyPFNjcm9sbGluZ1N0YXRlTm9kZT4gY2hp bGROb2RlKQogICAgIG1fY2hpbGRyZW4tPmFwcGVuZChjaGlsZE5vZGUpOwogfQogCi12b2lkIFNj cm9sbGluZ1N0YXRlTm9kZTo6cmVtb3ZlRGVzY2VuZGFudChTY3JvbGxpbmdTdGF0ZU5vZGUqIG5v ZGUpCi17Ci0gICAgaWYgKCFtX2NoaWxkcmVuKQotICAgICAgICByZXR1cm47Ci0KLSAgICBzaXpl X3QgaW5kZXggPSBtX2NoaWxkcmVuLT5maW5kKG5vZGUpOwotICAgIGlmIChpbmRleCAhPSBub3RG b3VuZCkgewotICAgICAgICBub2RlLT53aWxsQmVSZW1vdmVkRnJvbVN0YXRlVHJlZSgpOwotICAg ICAgICBtX2NoaWxkcmVuLT5yZW1vdmUoaW5kZXgpOwotICAgICAgICByZXR1cm47Ci0gICAgfQot Ci0gICAgZm9yIChhdXRvJiBjaGlsZCA6ICptX2NoaWxkcmVuKQotICAgICAgICBjaGlsZC0+cmVt b3ZlRGVzY2VuZGFudChub2RlKTsKLX0KLQotdm9pZCBTY3JvbGxpbmdTdGF0ZU5vZGU6OndpbGxC ZVJlbW92ZWRGcm9tU3RhdGVUcmVlKCkKLXsKLSAgICBzY3JvbGxpbmdTdGF0ZVRyZWUoKS53aWxs UmVtb3ZlTm9kZSh0aGlzKTsKLSAgICBpZiAoIW1fY2hpbGRyZW4pCi0gICAgICAgIHJldHVybjsK LQotICAgIGZvciAoYXV0byYgY2hpbGQgOiAqbV9jaGlsZHJlbikKLSAgICAgICAgY2hpbGQtPndp bGxCZVJlbW92ZWRGcm9tU3RhdGVUcmVlKCk7Ci19Ci0KIHZvaWQgU2Nyb2xsaW5nU3RhdGVOb2Rl OjpzZXRMYXllcihjb25zdCBMYXllclJlcHJlc2VudGF0aW9uJiBsYXllclJlcHJlc2VudGF0aW9u KQogewogICAgIGlmIChsYXllclJlcHJlc2VudGF0aW9uID09IG1fbGF5ZXIpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuaCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5oCmluZGV4IDFh NjI0MzViNDdhMGNmNzIyZmQxZTljOGRjNjljMmJiNDNhNDMyNjguLjg4NGY3NzZlNDFkNGYxZjY1 OWU4NTBhMDgwMTRhMzBmMTc0OGZjOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5oCkBAIC0xOTgsNyArMTk4LDYgQEAgcHVibGlj OgogICAgIFZlY3RvcjxSZWZQdHI8U2Nyb2xsaW5nU3RhdGVOb2RlPj4qIGNoaWxkcmVuKCkgY29u c3QgeyByZXR1cm4gbV9jaGlsZHJlbi5nZXQoKTsgfQogCiAgICAgdm9pZCBhcHBlbmRDaGlsZChQ YXNzUmVmUHRyPFNjcm9sbGluZ1N0YXRlTm9kZT4pOwotICAgIHZvaWQgcmVtb3ZlRGVzY2VuZGFu dChTY3JvbGxpbmdTdGF0ZU5vZGUqKTsKIAogICAgIFN0cmluZyBzY3JvbGxpbmdTdGF0ZVRyZWVB c1RleHQoKSBjb25zdDsKIApAQCAtMjA5LDcgKzIwOCw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBk dW1wKFRleHRTdHJlYW0mLCBpbnQgaW5kZW50KSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9pZCBk dW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiwgaW50IGluZGVudCkgY29uc3QgPSAwOwotICAgIHZv aWQgd2lsbEJlUmVtb3ZlZEZyb21TdGF0ZVRyZWUoKTsKIAogICAgIGNvbnN0IFNjcm9sbGluZ05v ZGVUeXBlIG1fbm9kZVR5cGU7CiAgICAgU2Nyb2xsaW5nTm9kZUlEIG1fbm9kZUlEOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVUcmVlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlVHJlZS5jcHAK aW5kZXggMmUzMjRlZWE2NGEyZjljZWE5ZTdlNjM2ZThlZTRlNTZjMzU5NzdjMS4uODk1OGRlNDQ2 OGYzZDJhZDM2MTA3MzQwZjhhNDQ0YmZmOGNiNTQ1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuY3BwCkBAIC04Myw3ICs4Myw3 IEBAIFNjcm9sbGluZ05vZGVJRCBTY3JvbGxpbmdTdGF0ZVRyZWU6OmF0dGFjaE5vZGUoU2Nyb2xs aW5nTm9kZVR5cGUgbm9kZVR5cGUsIFNjcm9sCiAgICAgICAgICAgICByZXR1cm4gbmV3Tm9kZUlE OwogCiAgICAgICAgIC8vIFRoZSBub2RlIGlzIGJlaW5nIHJlLXBhcmVudGVkLiBUbyBkbyB0aGF0 LCB3ZSdsbCByZW1vdmUgaXQsIGFuZCB0aGVuIHJlLWNyZWF0ZSBhIG5ldyBub2RlLgotICAgICAg ICByZW1vdmVOb2RlKG5vZGUpOworICAgICAgICByZW1vdmVOb2RlQW5kQWxsRGVzY2VuZGFudHMo bm9kZSk7CiAgICAgfQogCiAgICAgU2Nyb2xsaW5nU3RhdGVOb2RlKiBuZXdOb2RlID0gbnVsbHB0 cjsKQEAgLTE0MSwxMiArMTQxLDEzIEBAIHZvaWQgU2Nyb2xsaW5nU3RhdGVUcmVlOjpkZXRhY2hO b2RlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1 cm47CiAKLSAgICByZW1vdmVOb2RlKG5vZGUpOworICAgIHJlbW92ZU5vZGVBbmRBbGxEZXNjZW5k YW50cyhub2RlKTsKIH0KIAogdm9pZCBTY3JvbGxpbmdTdGF0ZVRyZWU6OmNsZWFyKCkKIHsKLSAg ICByZW1vdmVOb2RlKHJvb3RTdGF0ZU5vZGUoKSk7CisgICAgcmVtb3ZlTm9kZUFuZEFsbERlc2Nl bmRhbnRzKHJvb3RTdGF0ZU5vZGUoKSk7CisgICAgQVNTRVJUKG1fc3RhdGVOb2RlTWFwLmlzRW1w dHkoKSk7CiAgICAgbV9zdGF0ZU5vZGVNYXAuY2xlYXIoKTsKIH0KIApAQCAtMTc3LDI5ICsxNzgs MzkgQEAgdm9pZCBTY3JvbGxpbmdTdGF0ZVRyZWU6OmFkZE5vZGUoU2Nyb2xsaW5nU3RhdGVOb2Rl KiBub2RlKQogICAgIG1fc3RhdGVOb2RlTWFwLmFkZChub2RlLT5zY3JvbGxpbmdOb2RlSUQoKSwg bm9kZSk7CiB9CiAKLXZvaWQgU2Nyb2xsaW5nU3RhdGVUcmVlOjpyZW1vdmVOb2RlKFNjcm9sbGlu Z1N0YXRlTm9kZSogbm9kZSkKK3ZvaWQgU2Nyb2xsaW5nU3RhdGVUcmVlOjpyZW1vdmVOb2RlQW5k QWxsRGVzY2VuZGFudHMoU2Nyb2xsaW5nU3RhdGVOb2RlKiBub2RlKQogewogICAgIGlmICghbm9k ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG5vZGUgPT0gbV9yb290U3RhdGVOb2RlKSB7 Ci0gICAgICAgIHdpbGxSZW1vdmVOb2RlKG5vZGUpOworICAgIHJlY3Vyc2l2ZU5vZGVXaWxsQmVS ZW1vdmVkKG5vZGUpOworCisgICAgaWYgKG5vZGUgPT0gbV9yb290U3RhdGVOb2RlKQogICAgICAg ICBtX3Jvb3RTdGF0ZU5vZGUgPSBudWxscHRyOwotICAgICAgICByZXR1cm47CisgICAgZWxzZSBp ZiAoU2Nyb2xsaW5nU3RhdGVOb2RlKiBwYXJlbnQgPSBub2RlLT5wYXJlbnQoKSkgeworICAgICAg ICBBU1NFUlQocGFyZW50LT5jaGlsZHJlbigpICYmIHBhcmVudC0+Y2hpbGRyZW4oKS0+ZmluZChu b2RlKSAhPSBub3RGb3VuZCk7CisgICAgICAgIGlmIChhdXRvIGNoaWxkcmVuID0gcGFyZW50LT5j aGlsZHJlbigpKSB7CisgICAgICAgICAgICBzaXplX3QgaW5kZXggPSBjaGlsZHJlbi0+ZmluZChu b2RlKTsKKyAgICAgICAgICAgIGlmIChpbmRleCAhPSBub3RGb3VuZCkKKyAgICAgICAgICAgICAg ICBjaGlsZHJlbi0+cmVtb3ZlKGluZGV4KTsKKyAgICAgICAgfQogICAgIH0KK30KIAotICAgIEFT U0VSVChtX3Jvb3RTdGF0ZU5vZGUpOwotICAgIG1fcm9vdFN0YXRlTm9kZS0+cmVtb3ZlRGVzY2Vu ZGFudChub2RlKTsKK3ZvaWQgU2Nyb2xsaW5nU3RhdGVUcmVlOjpyZWN1cnNpdmVOb2RlV2lsbEJl UmVtb3ZlZChTY3JvbGxpbmdTdGF0ZU5vZGUqIGN1cnJOb2RlKQoreworICAgIHdpbGxSZW1vdmVO b2RlKGN1cnJOb2RlKTsKIAotICAgIC8vIFNjcm9sbGluZ1N0YXRlVHJlZTo6cmVtb3ZlRGVzY2Vu ZGFudCgpIHdpbGwgZGVzdHJveSBjaGlsZHJlbiwgc28gd2UgaGF2ZSB0byBtYWtlIHN1cmUgd2Ug cmVtb3ZlIHRob3NlIGNoaWxkcmVuCi0gICAgLy8gZnJvbSB0aGUgSGFzaE1hcC4KLSAgICBmb3Ig KGF1dG8gcmVtb3ZlZE5vZGVJRCA6IG1fbm9kZXNSZW1vdmVkU2luY2VMYXN0Q29tbWl0KQotICAg ICAgICBtX3N0YXRlTm9kZU1hcC5yZW1vdmUocmVtb3ZlZE5vZGVJRCk7CisgICAgaWYgKGF1dG8g Y2hpbGRyZW4gPSBjdXJyTm9kZS0+Y2hpbGRyZW4oKSkgeworICAgICAgICBmb3IgKGF1dG8mIGNo aWxkIDogKmNoaWxkcmVuKQorICAgICAgICAgICAgcmVjdXJzaXZlTm9kZVdpbGxCZVJlbW92ZWQo Y2hpbGQuZ2V0KCkpOworICAgIH0KIH0KIAogdm9pZCBTY3JvbGxpbmdTdGF0ZVRyZWU6OndpbGxS ZW1vdmVOb2RlKFNjcm9sbGluZ1N0YXRlTm9kZSogbm9kZSkKIHsKICAgICBtX25vZGVzUmVtb3Zl ZFNpbmNlTGFzdENvbW1pdC5hcHBlbmQobm9kZS0+c2Nyb2xsaW5nTm9kZUlEKCkpOworICAgIG1f c3RhdGVOb2RlTWFwLnJlbW92ZShub2RlLT5zY3JvbGxpbmdOb2RlSUQoKSk7CiAgICAgc2V0SGFz Q2hhbmdlZFByb3BlcnRpZXMoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuaAppbmRleCBhMGQwMTU2NGQ3ZjAxZDBmMmI3ZDll Y2Y0Mjc0MGJiNjFiZTM5M2I2Li5lNmJmMmJjMGFiODgyYThiNzdiNjE0ZmZjMmY4ZTQ4NjgzODZj ZThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdT dGF0ZVRyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdT dGF0ZVRyZWUuaApAQCAtODEsNyArODEsOSBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBzZXRSb290 U3RhdGVOb2RlKFBhc3NSZWZQdHI8U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU+IHJv b3RTdGF0ZU5vZGUpIHsgbV9yb290U3RhdGVOb2RlID0gcm9vdFN0YXRlTm9kZTsgfQogICAgIHZv aWQgYWRkTm9kZShTY3JvbGxpbmdTdGF0ZU5vZGUqKTsKLSAgICB2b2lkIHJlbW92ZU5vZGUoU2Ny b2xsaW5nU3RhdGVOb2RlKik7CisgICAgdm9pZCByZW1vdmVOb2RlQW5kQWxsRGVzY2VuZGFudHMo U2Nyb2xsaW5nU3RhdGVOb2RlKik7CisKKyAgICB2b2lkIHJlY3Vyc2l2ZU5vZGVXaWxsQmVSZW1v dmVkKFNjcm9sbGluZ1N0YXRlTm9kZSogY3Vyck5vZGUpOwogICAgIHZvaWQgd2lsbFJlbW92ZU5v ZGUoU2Nyb2xsaW5nU3RhdGVOb2RlKik7CiAKICAgICBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9y KiBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yOwo=