134836 2014-07-11 10:26:10 -0700 [New Multicolumn] Crawl to check for compositing between us and the enclosingPaginationLayer 2014-07-14 12:52:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1021860 0 hyatt 2014-07-11 10:26:10 -0700 The bits being set in updateLayerPositions just don't work, since compositing states can change without triggering that function. This patch just gets rid of the bit and does a crawl every time to check. This ensures that changes in compositing states don't necessitate any changes in pagination, since the lookup will always check the current compositing state. 1021861 1 234768 hyatt 2014-07-11 10:29:10 -0700 Created attachment 234768 Patch 1022285 2 hyatt 2014-07-14 12:52:00 -0700 Fixed in r171074 234768 2014-07-11 10:29:10 -0700 2014-07-14 12:50:24 -0700 Patch patch.txt text/plain 7737 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTAwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA3LTExICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTczMDU0 NTg+IENhbm5vdCBpbnRlcmFjdCB3aXRoIHZpZGVvIGNvbnRyb2xzIGluIGVQdWJzCisgICAgICAg IEJ1ZyAxMzQ4MzYgLSBbTmV3IE11bHRpY29sdW1uXSBDcmF3bCB0byBjaGVjayBmb3IgY29tcG9z aXRpbmcgYmV0d2VlbiB1cyBhbmQgdGhlIGVuY2xvc2luZ1BhZ2luYXRpb25MYXllcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0ODM2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHBhZ2luYXRlZEFu ZENvbXBvc2l0ZWQgYml0IGJlaW5nIHNldCBpbiB1cGRhdGVMYXllclBvc2l0aW9ucyBqdXN0IGRp ZG4ndCB3b3JrLCBzaW5jZSBjb21wb3NpdGluZyBzdGF0ZXMKKyAgICAgICAgY2FuIGNoYW5nZSB3 aXRob3V0IHRyaWdnZXJpbmcgdGhhdCBmdW5jdGlvbi4gVGhpcyBwYXRjaCBqdXN0IGdldHMgcmlk IG9mIHRoZSBiaXQgYW5kIGRvZXMgYSBjcmF3bCBldmVyeSB0aW1lCisgICAgICAgIHRvIGNoZWNr LiBUaGlzIGVuc3VyZXMgdGhhdCBjaGFuZ2VzIGluIGNvbXBvc2l0aW5nIHN0YXRlcyBkb24ndCBu ZWNlc3NpdGF0ZSBhbnkgY2hhbmdlcyBpbiBwYWdpbmF0aW9uLAorICAgICAgICBzaW5jZSB0aGUg bG9va3VwIHdpbGwgYWx3YXlzIGNoZWNrIHRoZSBjdXJyZW50IGNvbXBvc2l0aW5nIHN0YXRlLgor ICAgICAgICAKKyAgICAgICAgVGhlIG5ldyBmdW5jdGlvbiB0aGF0IGRvZXMgdGhpcyBjaGVjayBp cyBoYXNDb21wb3NpdGVkTGF5ZXJJbkVuY2xvc2luZ1BhZ2luYXRpb25DaGFpbi4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllcjo6UmVuZGVyTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0 ZUxheWVyUG9zaXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpoYXNDb21w b3NpdGVkTGF5ZXJJbkVuY2xvc2luZ1BhZ2luYXRpb25DaGFpbik6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6dXBkYXRlUGFnaW5hdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyLmg6CisKIDIwMTQtMDctMTEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBTdWJwaXhlbCBsYXlvdXQ6IHJldHVybiBpbnRlZ3JhbCByZXN1bHRzIGZv ciBvZmZzZXQqLCBjbGllbnQqLCBzY3JvbGwqIGJ5IGRlZmF1bHQuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHJldmlzaW9uIDE3MDk2NykKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5 OSw3ICsxOTksNiBAQCBSZW5kZXJMYXllcjo6UmVuZGVyTGF5ZXIoUmVuZGVyTGF5ZXJNb2RlCiAg ICAgLCBtX3N0YXRpY0lubGluZVBvc2l0aW9uKDApCiAgICAgLCBtX3N0YXRpY0Jsb2NrUG9zaXRp b24oMCkKICAgICAsIG1fZW5jbG9zaW5nUGFnaW5hdGlvbkxheWVyKDApCi0gICAgLCBtX2VuY2xv c2luZ0xheWVySXNQYWdpbmF0ZWRBbmRDb21wb3NpdGVkKGZhbHNlKQogewogICAgIG1faXNOb3Jt YWxGbG93T25seSA9IHNob3VsZEJlTm9ybWFsRmxvd09ubHkoKTsKICAgICBtX2lzU2VsZlBhaW50 aW5nTGF5ZXIgPSBzaG91bGRCZVNlbGZQYWludGluZ0xheWVyKCk7CkBAIC0zODIsMTAgKzM4MSw4 IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zKFIKIAogICAgIGlmIChm bGFncyAmIFVwZGF0ZVBhZ2luYXRpb24pCiAgICAgICAgIHVwZGF0ZVBhZ2luYXRpb24oKTsKLSAg ICBlbHNlIHsKKyAgICBlbHNlCiAgICAgICAgIG1fZW5jbG9zaW5nUGFnaW5hdGlvbkxheWVyID0g bnVsbHB0cjsKLSAgICAgICAgbV9lbmNsb3NpbmdMYXllcklzUGFnaW5hdGVkQW5kQ29tcG9zaXRl ZCA9IGZhbHNlOwotICAgIH0KICAgICAKICAgICBpZiAobV9oYXNWaXNpYmxlQ29udGVudCkgewog ICAgICAgICAvLyBGSVhNRTogTGF5b3V0U3RhdGUgZG9lcyBub3Qgd29yayB3aXRoIFJlbmRlckxh eWVycyBhcyB0aGVyZSBpcyBub3QgYSAxLXRvLTEKQEAgLTkxNiwxMCArOTEzLDQ2IEBAIFJlbmRl ckxheWVyKiBSZW5kZXJMYXllcjo6ZW5jbG9zaW5nT3ZlcmYKICAgICByZXR1cm4gMDsKIH0KIAor Ly8gRklYTUU6IFRoaXMgaXMgdGVycmlibGUuIEJyaW5nIGJhY2sgYSBjYWNoZWQgYml0IGZvciB0 aGlzIHNvbWVkYXkuIFRoaXMgY3Jhd2wgaXMgZ29pbmcgdG8gc2xvdyBkb3duIGFsbAorLy8gcGFp bnRpbmcgb2YgY29udGVudCBpbnNpZGUgcGFnaW5hdGVkIGxheWVycy4KK2Jvb2wgUmVuZGVyTGF5 ZXI6Omhhc0NvbXBvc2l0ZWRMYXllckluRW5jbG9zaW5nUGFnaW5hdGlvbkNoYWluKCkgY29uc3QK K3sKKyAgICAvLyBObyBlbmNsb3NpbmcgbGF5ZXIgbWVhbnMgbm8gY29tcG9zaXRpbmcgaW4gdGhl IGNoYWluLgorICAgIGlmICghbV9lbmNsb3NpbmdQYWdpbmF0aW9uTGF5ZXIpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAKKyAgICAvLyBJZiB0aGUgZW5jbG9zaW5nIGxheWVyIGlzIGNvbXBv c2l0ZWQsIHdlIGRvbid0IGhhdmUgdG8gY2hlY2sgYW55dGhpbmcgaW4gYmV0d2VlbiB1cyBhbmQg dGhhdAorICAgIC8vIGxheWVyLgorICAgIGlmIChtX2VuY2xvc2luZ1BhZ2luYXRpb25MYXllci0+ aXNDb21wb3NpdGVkKCkpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgLy8gSWYgd2UgYXJl IHRoZSBlbmNsb3NpbmcgcGFnaW5hdGlvbiBsYXllciwgdGhlbiB3ZSBjYW4ndCBiZSBjb21wb3Np dGVkIG9yIHdlJ2QgaGF2ZSBwYXNzZWQgdGhlCisgICAgLy8gcHJldmlvdXMgY2hlY2suCisgICAg aWYgKG1fZW5jbG9zaW5nUGFnaW5hdGlvbkxheWVyID09IHRoaXMpCisgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgIC8vIFRoZSBlbmNsb3NpbmcgcGFnaW5hdGVkIGxheWVyIGlzIG91ciBhbmNl c3RvciBhbmQgaXMgbm90IGNvbXBvc2l0ZWQsIHNvIHdlIGhhdmUgdG8gY2hlY2sKKyAgICAvLyBp bnRlcm1lZGlhdGUgbGF5ZXJzIGJldHdlZW4gdXMgYW5kIHRoZSBlbmNsb3NpbmcgcGFnaW5hdGlv biBsYXllci4gU3RhcnQgd2l0aCBvdXIgb3duIGxheWVyLgorICAgIGlmIChpc0NvbXBvc2l0ZWQo KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgCisgICAgLy8gRm9yIG5vcm1hbCBmbG93IGxh eWVycywgd2UgY2FuIHJlY3VyIHVwIHRoZSBsYXllciB0cmVlLgorICAgIGlmIChpc05vcm1hbEZs b3dPbmx5KCkpCisgICAgICAgIHJldHVybiBwYXJlbnQoKS0+aGFzQ29tcG9zaXRlZExheWVySW5F bmNsb3NpbmdQYWdpbmF0aW9uQ2hhaW4oKTsKKyAgICAKKyAgICAvLyBPdGhlcndpc2Ugd2UgaGF2 ZSB0byBnbyB1cCB0aGUgY29udGFpbmluZyBibG9jayBjaGFpbi4gRmluZCB0aGUgZmlyc3QgZW5j bG9zaW5nCisgICAgLy8gY29udGFpbmluZyBibG9jayBsYXllciBhbmNlc3RvciwgYW5kIGNoZWNr IHRoYXQuCisgICAgUmVuZGVyVmlldyogcmVuZGVyVmlldyA9ICZyZW5kZXJlcigpLnZpZXcoKTsK KyAgICBmb3IgKFJlbmRlckJsb2NrKiBjb250YWluaW5nQmxvY2sgPSByZW5kZXJlcigpLmNvbnRh aW5pbmdCbG9jaygpOyBjb250YWluaW5nQmxvY2sgJiYgY29udGFpbmluZ0Jsb2NrICE9IHJlbmRl clZpZXc7IGNvbnRhaW5pbmdCbG9jayA9IGNvbnRhaW5pbmdCbG9jay0+Y29udGFpbmluZ0Jsb2Nr KCkpIHsKKyAgICAgICAgaWYgKGNvbnRhaW5pbmdCbG9jay0+aGFzTGF5ZXIoKSkKKyAgICAgICAg ICAgIHJldHVybiBjb250YWluaW5nQmxvY2stPmxheWVyKCktPmhhc0NvbXBvc2l0ZWRMYXllcklu RW5jbG9zaW5nUGFnaW5hdGlvbkNoYWluKCk7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30K Kwogdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlUGFnaW5hdGlvbigpCiB7CiAgICAgbV9lbmNsb3Np bmdQYWdpbmF0aW9uTGF5ZXIgPSBudWxscHRyOwotICAgIG1fZW5jbG9zaW5nTGF5ZXJJc1BhZ2lu YXRlZEFuZENvbXBvc2l0ZWQgPSBmYWxzZTsKICAgICAKICAgICBpZiAoIXBhcmVudCgpKQogICAg ICAgICByZXR1cm47CkBAIC05MzAsNyArOTYzLDYgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRl UGFnaW5hdGlvbigpCiAgICAgLy8gdG8gdGhhdCBsYXllciBlYXNpbHkuCiAgICAgaWYgKHJlbmRl cmVyKCkuaXNJbkZsb3dSZW5kZXJGbG93VGhyZWFkKCkpIHsKICAgICAgICAgbV9lbmNsb3NpbmdQ YWdpbmF0aW9uTGF5ZXIgPSB0aGlzOwotICAgICAgICBtX2VuY2xvc2luZ0xheWVySXNQYWdpbmF0 ZWRBbmRDb21wb3NpdGVkID0gaXNDb21wb3NpdGVkKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKQEAgLTkzOCwxMyArOTcwLDEwIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZVBhZ2luYXRp b24oKQogICAgICAgICAvLyBDb250ZW50IGluc2lkZSBhIHRyYW5zZm9ybSBpcyBub3QgY29uc2lk ZXJlZCB0byBiZSBwYWdpbmF0ZWQsIHNpbmNlIHdlIHNpbXBseQogICAgICAgICAvLyBwYWludCB0 aGUgdHJhbnNmb3JtIG11bHRpcGxlIHRpbWVzIGluIGVhY2ggY29sdW1uLCBzbyB3ZSBkb24ndCBo YXZlIHRvIHVzZQogICAgICAgICAvLyBmcmFnbWVudHMgZm9yIHRoZSB0cmFuc2Zvcm1lZCBjb250 ZW50LgotICAgICAgICBpZiAocGFyZW50KCktPmhhc1RyYW5zZm9ybSgpKSB7CisgICAgICAgIGlm IChwYXJlbnQoKS0+aGFzVHJhbnNmb3JtKCkpCiAgICAgICAgICAgICBtX2VuY2xvc2luZ1BhZ2lu YXRpb25MYXllciA9IG51bGxwdHI7Ci0gICAgICAgICAgICBtX2VuY2xvc2luZ0xheWVySXNQYWdp bmF0ZWRBbmRDb21wb3NpdGVkID0gZmFsc2U7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAgIGVs c2UKICAgICAgICAgICAgIG1fZW5jbG9zaW5nUGFnaW5hdGlvbkxheWVyID0gcGFyZW50KCktPmVu Y2xvc2luZ1BhZ2luYXRpb25MYXllcihJbmNsdWRlQ29tcG9zaXRlZFBhZ2luYXRlZExheWVycyk7 Ci0gICAgICAgICAgICBtX2VuY2xvc2luZ0xheWVySXNQYWdpbmF0ZWRBbmRDb21wb3NpdGVkID0g aXNDb21wb3NpdGVkKCkgPyB0cnVlIDogcGFyZW50KCktPmVuY2xvc2luZ0xheWVySXNQYWdpbmF0 ZWRBbmRDb21wb3NpdGVkKCk7Ci0gICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KIApA QCAtOTU3LDEzICs5ODYsMTAgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlUGFnaW5hdGlvbigp CiAgICAgICAgICAgICAvLyBDb250ZW50IGluc2lkZSBhIHRyYW5zZm9ybSBpcyBub3QgY29uc2lk ZXJlZCB0byBiZSBwYWdpbmF0ZWQsIHNpbmNlIHdlIHNpbXBseQogICAgICAgICAgICAgLy8gcGFp bnQgdGhlIHRyYW5zZm9ybSBtdWx0aXBsZSB0aW1lcyBpbiBlYWNoIGNvbHVtbiwgc28gd2UgZG9u J3QgaGF2ZSB0byB1c2UKICAgICAgICAgICAgIC8vIGZyYWdtZW50cyBmb3IgdGhlIHRyYW5zZm9y bWVkIGNvbnRlbnQuCi0gICAgICAgICAgICBpZiAoY29udGFpbmluZ0Jsb2NrLT5sYXllcigpLT5o YXNUcmFuc2Zvcm0oKSkgeworICAgICAgICAgICAgaWYgKGNvbnRhaW5pbmdCbG9jay0+bGF5ZXIo KS0+aGFzVHJhbnNmb3JtKCkpCiAgICAgICAgICAgICAgICAgbV9lbmNsb3NpbmdQYWdpbmF0aW9u TGF5ZXIgPSBudWxscHRyOwotICAgICAgICAgICAgICAgIG1fZW5jbG9zaW5nTGF5ZXJJc1BhZ2lu YXRlZEFuZENvbXBvc2l0ZWQgPSBmYWxzZTsKLSAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAg ICAgICBlbHNlCiAgICAgICAgICAgICAgICAgbV9lbmNsb3NpbmdQYWdpbmF0aW9uTGF5ZXIgPSBj b250YWluaW5nQmxvY2stPmxheWVyKCktPmVuY2xvc2luZ1BhZ2luYXRpb25MYXllcihJbmNsdWRl Q29tcG9zaXRlZFBhZ2luYXRlZExheWVycyk7Ci0gICAgICAgICAgICAgICAgbV9lbmNsb3NpbmdM YXllcklzUGFnaW5hdGVkQW5kQ29tcG9zaXRlZCA9IGlzQ29tcG9zaXRlZCgpID8gdHJ1ZSA6IGNv bnRhaW5pbmdCbG9jay0+bGF5ZXIoKS0+ZW5jbG9zaW5nTGF5ZXJJc1BhZ2luYXRlZEFuZENvbXBv c2l0ZWQoKTsKLSAgICAgICAgICAgIH0KICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQog ICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCShyZXZpc2lv biAxNzA5NjcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAkod29y a2luZyBjb3B5KQpAQCAtNTE2LDE0ICs1MTYsMTQgQEAgcHVibGljOgogCiAgICAgdm9pZCBwb3Np dGlvbk5ld2x5Q3JlYXRlZE92ZXJmbG93Q29udHJvbHMoKTsKIAorICAgIGJvb2wgaGFzQ29tcG9z aXRlZExheWVySW5FbmNsb3NpbmdQYWdpbmF0aW9uQ2hhaW4oKSBjb25zdDsKICAgICBlbnVtIFBh Z2luYXRpb25JbmNsdXNpb25Nb2RlIHsgRXhjbHVkZUNvbXBvc2l0ZWRQYWdpbmF0ZWRMYXllcnMs IEluY2x1ZGVDb21wb3NpdGVkUGFnaW5hdGVkTGF5ZXJzIH07CiAgICAgUmVuZGVyTGF5ZXIqIGVu Y2xvc2luZ1BhZ2luYXRpb25MYXllcihQYWdpbmF0aW9uSW5jbHVzaW9uTW9kZSBtb2RlKSBjb25z dAogICAgIHsKLSAgICAgICAgaWYgKG1vZGUgPT0gRXhjbHVkZUNvbXBvc2l0ZWRQYWdpbmF0ZWRM YXllcnMgJiYgbV9lbmNsb3NpbmdMYXllcklzUGFnaW5hdGVkQW5kQ29tcG9zaXRlZCkKKyAgICAg ICAgaWYgKG1vZGUgPT0gRXhjbHVkZUNvbXBvc2l0ZWRQYWdpbmF0ZWRMYXllcnMgJiYgaGFzQ29t cG9zaXRlZExheWVySW5FbmNsb3NpbmdQYWdpbmF0aW9uQ2hhaW4oKSkKICAgICAgICAgICAgIHJl dHVybiBudWxscHRyOwogICAgICAgICByZXR1cm4gbV9lbmNsb3NpbmdQYWdpbmF0aW9uTGF5ZXI7 CiAgICAgfQotICAgIGJvb2wgZW5jbG9zaW5nTGF5ZXJJc1BhZ2luYXRlZEFuZENvbXBvc2l0ZWQo KSBjb25zdCB7IHJldHVybiBtX2VuY2xvc2luZ0xheWVySXNQYWdpbmF0ZWRBbmRDb21wb3NpdGVk OyB9CiAKICAgICB2b2lkIHVwZGF0ZVRyYW5zZm9ybSgpOwogICAgIApAQCAtMTMzNSw3ICsxMzM1 LDYgQEAgcHJpdmF0ZToKIAogICAgIC8vIFBvaW50ZXIgdG8gdGhlIGVuY2xvc2luZyBSZW5kZXJM YXllciB0aGF0IGNhdXNlZCB1cyB0byBiZSBwYWdpbmF0ZWQuIEl0IGlzIDAgaWYgd2UgYXJlIG5v dCBwYWdpbmF0ZWQuCiAgICAgUmVuZGVyTGF5ZXIqIG1fZW5jbG9zaW5nUGFnaW5hdGlvbkxheWVy OwotICAgIGJvb2wgbV9lbmNsb3NpbmdMYXllcklzUGFnaW5hdGVkQW5kQ29tcG9zaXRlZDsKIAog ICAgIEludFJlY3QgbV9ibG9ja1NlbGVjdGlvbkdhcHNCb3VuZHM7CiAK