148031 2015-08-14 11:40:10 -0700 RenderBlock::simplifiedLayout should pop LayoutStateMaintainer when early returns. 2015-08-14 13:28:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1117684 0 zalan 2015-08-14 11:40:10 -0700 SSIA. 1117693 1 259013 zalan 2015-08-14 11:52:55 -0700 Created attachment 259013 Patch 1117694 2 zalan 2015-08-14 11:53:31 -0700 I probably need to talk to Hyatt about the (missing)test case here. 1117741 3 259013 commit-queue 2015-08-14 13:28:22 -0700 Comment on attachment 259013 Patch Clearing flags on attachment: 259013 Committed r188485: <http://trac.webkit.org/changeset/188485> 1117742 4 commit-queue 2015-08-14 13:28:25 -0700 All reviewed patches have been landed. Closing bug. 259013 2015-08-14 11:52:55 -0700 2015-08-14 13:28:22 -0700 Patch bug-148031-20150814115236.patch text/plain 5281 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ4YmExOTQ5Y2NhYzA3 OTVkYmNkYjE5ODhjMmI0N2Q4OWE2YzY2Yy4uMjA2MzM0OThiN2QxNWVjZjBhNDI2Nzg2YmViNWZh MTQ3MDk1YTY0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA4LTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyQmxvY2s6OnNpbXBs aWZpZWRMYXlvdXQgc2hvdWxkIHBvcCBMYXlvdXRTdGF0ZU1haW50YWluZXIgd2hlbiBlYXJseSBy ZXR1cm5zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ4MDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TGF5b3V0U3RhdGVNYWludGFpbmVyIHB1c2gvcG9wIGNhbGxzIG5lZWQgdG8gYmUgYmFsYW5jZWQg dG8gZW5zdXJlIGxheW91dCBjb25zaXN0ZW5jeS4KKworICAgICAgICBVbmFibGUgdG8gbWFrZSBh IHRlc3QgY2FzZSBmb3IgdGhpcy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c2ltcGxpZmllZExheW91dCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dFN0YXRlTWFpbnRhaW5lcjo6fkxheW91dFN0YXRlTWFpbnRhaW5lcik6IEFTU0VSVCB0aGUgc3Rh dGUgcHJvcGVybHkuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRTdGF0ZU1haW50YWluZXI6OnB1 c2gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0U3RhdGVNYWludGFpbmVyOjpwb3ApOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0U3RhdGVNYWludGFpbmVyOjpkaWRQdXNoKToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dFN0YXRlTWFpbnRhaW5lcjo6TGF5b3V0U3RhdGVNYWludGFpbmVyKTog RGVsZXRlZC4KKwogMjAxNS0wOC0xMyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CiAKICAgICAgICAgQ292ZXIgbWVtb3J5IGNhY2hlIHN1YnJlc291cmNlIHZhbGlkYXRpb24gcG9s aWN5IHdpdGggY2FjaGUgdGVzdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCmluZGV4IGJlN2IyODAwMzExNDZjMTI3MWFkNWU3ZDMyYTkxODc4YmI5NzI5ZjAuLjU4NWI2 NTA2OWU5ZmU2ZmYxYzBkY2RmN2RhMTVkMzU0OGI0ZTQ5OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMTIwNSw5ICsxMjA1LDEwIEBAIGJvb2wgUmVuZGVy QmxvY2s6OnNpbXBsaWZpZWRMYXlvdXQoKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBM YXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIodmlldygpLCAqdGhpcywgbG9jYXRpb25P ZmZzZXQoKSwgaGFzVHJhbnNmb3JtKCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxlKCkuaXNG bGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSk7Ci0gICAgCi0gICAgaWYgKG5lZWRzUG9zaXRpb25l ZE1vdmVtZW50TGF5b3V0KCkgJiYgIXRyeUxheW91dERvaW5nUG9zaXRpb25lZE1vdmVtZW50T25s eSgpKQorICAgIGlmIChuZWVkc1Bvc2l0aW9uZWRNb3ZlbWVudExheW91dCgpICYmICF0cnlMYXlv dXREb2luZ1Bvc2l0aW9uZWRNb3ZlbWVudE9ubHkoKSkgeworICAgICAgICBzdGF0ZVB1c2hlci5w b3AoKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KIAogICAgIC8vIExheSBvdXQgcG9z aXRpb25lZCBkZXNjZW5kYW50cyBvciBvYmplY3RzIHRoYXQganVzdCBuZWVkIHRvIHJlY29tcHV0 ZSBvdmVyZmxvdy4KICAgICBpZiAobmVlZHNTaW1wbGlmaWVkTm9ybWFsRmxvd0xheW91dCgpKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKaW5kZXggOTQ4MTA5ZGU5ZDlkOTg0Mzc5 NTJjNGZmNDMzZTFmYzc1ZjVjNzlhNi4uYzMzNTExMTRmNzRjOWEyMTM1MTI3NjIyMmMyNDY5MzYz MjUyYmZmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCkBAIC0zODcsOSAr Mzg3LDYgQEAgcHVibGljOgogICAgIGV4cGxpY2l0IExheW91dFN0YXRlTWFpbnRhaW5lcihSZW5k ZXJWaWV3JiB2aWV3LCBSZW5kZXJCb3gmIHJvb3QsIExheW91dFNpemUgb2Zmc2V0LCBib29sIGRp c2FibGVTdGF0ZSA9IGZhbHNlLCBMYXlvdXRVbml0IHBhZ2VIZWlnaHQgPSAwLCBib29sIHBhZ2VI ZWlnaHRDaGFuZ2VkID0gZmFsc2UpCiAgICAgICAgIDogbV92aWV3KHZpZXcpCiAgICAgICAgICwg bV9kaXNhYmxlZChkaXNhYmxlU3RhdGUpCi0gICAgICAgICwgbV9kaWRTdGFydChmYWxzZSkKLSAg ICAgICAgLCBtX2RpZEVuZChmYWxzZSkKLSAgICAgICAgLCBtX2RpZENyZWF0ZUxheW91dFN0YXRl KGZhbHNlKQogICAgIHsKICAgICAgICAgcHVzaChyb290LCBvZmZzZXQsIHBhZ2VIZWlnaHQsIHBh Z2VIZWlnaHRDaGFuZ2VkKTsKICAgICB9CkBAIC0zOTcsNTAgKzM5NCw0NyBAQCBwdWJsaWM6CiAg ICAgLy8gQ29uc3RydWN0b3IgdG8gbWF5YmUgcHVzaCBsYXRlci4KICAgICBleHBsaWNpdCBMYXlv dXRTdGF0ZU1haW50YWluZXIoUmVuZGVyVmlldyYgdmlldykKICAgICAgICAgOiBtX3ZpZXcodmll dykKLSAgICAgICAgLCBtX2Rpc2FibGVkKGZhbHNlKQotICAgICAgICAsIG1fZGlkU3RhcnQoZmFs c2UpCi0gICAgICAgICwgbV9kaWRFbmQoZmFsc2UpCi0gICAgICAgICwgbV9kaWRDcmVhdGVMYXlv dXRTdGF0ZShmYWxzZSkKICAgICB7CiAgICAgfQogCiAgICAgfkxheW91dFN0YXRlTWFpbnRhaW5l cigpCiAgICAgewotICAgICAgICBBU1NFUlQobV9kaWRTdGFydCA9PSBtX2RpZEVuZCk7ICAgLy8g aWYgdGhpcyBmaXJlcywgaXQgbWVhbnMgdGhhdCBzb21lb25lIGRpZCBhIHB1c2goKSwgYnV0IGZv cmdvdCB0byBwb3AoKS4KKyAgICAgICAgQVNTRVJUKCFtX2RpZENhbGxQdXNoIHx8IG1fZGlkQ2Fs bFB1c2ggPT0gbV9kaWRDYWxsUG9wKTsKICAgICB9CiAKICAgICB2b2lkIHB1c2goUmVuZGVyQm94 JiByb290LCBMYXlvdXRTaXplIG9mZnNldCwgTGF5b3V0VW5pdCBwYWdlSGVpZ2h0ID0gMCwgYm9v bCBwYWdlSGVpZ2h0Q2hhbmdlZCA9IGZhbHNlKQogICAgIHsKLSAgICAgICAgQVNTRVJUKCFtX2Rp ZFN0YXJ0KTsKKyAgICAgICAgQVNTRVJUKCFtX2RpZENhbGxQdXNoKTsKKyAgICAgICAgbV9kaWRD YWxsUHVzaCA9IHRydWU7CiAgICAgICAgIC8vIFdlIHB1c2ggc3RhdGUgZXZlbiBpZiBkaXNhYmxl ZCwgYmVjYXVzZSB3ZSBzdGlsbCBuZWVkIHRvIHN0b3JlIGxheW91dERlbHRhCi0gICAgICAgIG1f ZGlkQ3JlYXRlTGF5b3V0U3RhdGUgPSBtX3ZpZXcucHVzaExheW91dFN0YXRlKHJvb3QsIG9mZnNl dCwgcGFnZUhlaWdodCwgcGFnZUhlaWdodENoYW5nZWQpOwotICAgICAgICBpZiAobV9kaXNhYmxl ZCAmJiBtX2RpZENyZWF0ZUxheW91dFN0YXRlKQorICAgICAgICBtX2RpZFB1c2hMYXlvdXRTdGF0 ZSA9IG1fdmlldy5wdXNoTGF5b3V0U3RhdGUocm9vdCwgb2Zmc2V0LCBwYWdlSGVpZ2h0LCBwYWdl SGVpZ2h0Q2hhbmdlZCk7CisgICAgICAgIGlmICghbV9kaWRQdXNoTGF5b3V0U3RhdGUpCisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIGlmIChtX2Rpc2FibGVkKQogICAgICAgICAgICAgbV92 aWV3LmRpc2FibGVMYXlvdXRTdGF0ZSgpOwotICAgICAgICBtX2RpZFN0YXJ0ID0gdHJ1ZTsKICAg ICB9CiAKICAgICB2b2lkIHBvcCgpCiAgICAgewotICAgICAgICBpZiAobV9kaWRTdGFydCkgewot ICAgICAgICAgICAgQVNTRVJUKCFtX2RpZEVuZCk7Ci0gICAgICAgICAgICBpZiAobV9kaWRDcmVh dGVMYXlvdXRTdGF0ZSkgewotICAgICAgICAgICAgICAgIG1fdmlldy5wb3BMYXlvdXRTdGF0ZSgp OwotICAgICAgICAgICAgICAgIGlmIChtX2Rpc2FibGVkKQotICAgICAgICAgICAgICAgICAgICBt X3ZpZXcuZW5hYmxlTGF5b3V0U3RhdGUoKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIAot ICAgICAgICAgICAgbV9kaWRFbmQgPSB0cnVlOwotICAgICAgICB9CisgICAgICAgIEFTU0VSVCgh bV9kaWRDYWxsUG9wKTsKKyAgICAgICAgbV9kaWRDYWxsUG9wID0gdHJ1ZTsKKyAgICAgICAgaWYg KCFtX2RpZENhbGxQdXNoKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAoIW1fZGlk UHVzaExheW91dFN0YXRlKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBtX3ZpZXcucG9w TGF5b3V0U3RhdGUoKTsKKyAgICAgICAgaWYgKG1fZGlzYWJsZWQpCisgICAgICAgICAgICBtX3Zp ZXcuZW5hYmxlTGF5b3V0U3RhdGUoKTsKICAgICB9CiAKLSAgICBib29sIGRpZFB1c2goKSBjb25z dCB7IHJldHVybiBtX2RpZFN0YXJ0OyB9CisgICAgYm9vbCBkaWRQdXNoKCkgY29uc3QgeyByZXR1 cm4gbV9kaWRDYWxsUHVzaDsgfQogCiBwcml2YXRlOgogICAgIFJlbmRlclZpZXcmIG1fdmlldzsK LSAgICBib29sIG1fZGlzYWJsZWQgOiAxOyAgICAgICAgLy8gdHJ1ZSBpZiB0aGUgb2Zmc2V0IGFu ZCBjbGlwIHBhcnQgb2YgbGF5b3V0U3RhdGUgaXMgZGlzYWJsZWQKLSAgICBib29sIG1fZGlkU3Rh cnQgOiAxOyAgICAgICAgLy8gdHJ1ZSBpZiB3ZSBkaWQgYSBwdXNoIG9yIGRpc2FibGUKLSAgICBi b29sIG1fZGlkRW5kIDogMTsgICAgICAgICAgLy8gdHJ1ZSBpZiB3ZSBwb3BwZWQgb3IgcmUtZW5h YmxlZAotICAgIGJvb2wgbV9kaWRDcmVhdGVMYXlvdXRTdGF0ZSA6IDE7IC8vIHRydWUgaWYgd2Ug YWN0dWFsbHkgbWFkZSBhIGxheW91dCBzdGF0ZS4KKyAgICBib29sIG1fZGlzYWJsZWQgeyBmYWxz ZSB9OworICAgIGJvb2wgbV9kaWRDYWxsUHVzaCB7IGZhbHNlIH07CisgICAgYm9vbCBtX2RpZENh bGxQb3AgeyBmYWxzZSB9OworICAgIGJvb2wgbV9kaWRQdXNoTGF5b3V0U3RhdGUgeyBmYWxzZSB9 OwogfTsKIAogY2xhc3MgTGF5b3V0U3RhdGVEaXNhYmxlciB7Cg==