147345 2015-07-27 17:14:18 -0700 Change markContainingBlocksForLayout() to take an enum, rather than a bool 2015-07-28 11:24:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dbates simon.fraser oldest_to_newest 1112614 0 simon.fraser 2015-07-27 17:14:18 -0700 Change markContainingBlocksForLayout() to take an enum, rather than a bool 1112616 1 257616 simon.fraser 2015-07-27 17:14:56 -0700 Created attachment 257616 Patch 1112645 2 257616 dbates 2015-07-27 18:58:13 -0700 Comment on attachment 257616 Patch OK. Obviously, we need to rebase this patch before landing. 1112776 3 simon.fraser 2015-07-28 11:24:44 -0700 https://trac.webkit.org/r187493 257616 2015-07-27 17:14:56 -0700 2015-07-27 18:58:13 -0700 Patch bug-147345-20150727171335.patch text/plain 6669 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDMxM2NiOGFjMTJhNWMx NTQ2N2FlOGNjYTY2MzU5ZDM4NjgyNTE3My4uNjI3MWYxYTE1OGQ0YjhhNjBkNjA0NzkwYjAwOGE0 N2NiZjcyOWI3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACisyMDE1LTA3LTI3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENoYW5nZSBtYXJr Q29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dCgpIHRvIHRha2UgYW4gZW51bSwgcmF0aGVyIHRoYW4g YSBib29sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDczNDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisg ICAgICAgIENoYW5nZSBtYXJrQ29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dCB0byB0YWtlIGFuIGVu dW0gY2xhc3MgZm9yIHRoZSBzY2hlZHVsZVJlbGF5b3V0CisgICAgICAgIGFyZ3VtZW50LCBmb3Ig YmV0dGVyIGNvZGUgcmVhZGFiaWxpdHkuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dCk6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVZpZXc6OnNjaGVkdWxlUmVsYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3OjpzY2hlZHVsZVJlbGF5b3V0T2ZTdWJ0cmVlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6bWFya0NvbnRh aW5pbmdCbG9ja3NGb3JMYXlvdXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3Qu aDoKKwogMjAxNS0wNy0yNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW5hbWUgQW5pbWF0aW9uQmFzZTo6aXNUcmFuc2Zvcm1GdW5jdGlvbkxpc3RW YWxpZCgpCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDczMzQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDY5ZGQ2OWMyM2I4ZmU5ODQ3 YmU2MTJlMGI0NzkyODE4MmE2MGVjOGQuLmNjZmJmMjJjYThiNjAxMjFiMGZlOWE0OTk0ODVjOTAy NjE2Njg5OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTEyMTMsNyArMTIxMyw3 IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAgICAgQW5pbWF0 aW9uVXBkYXRlQmxvY2sgYW5pbWF0aW9uVXBkYXRlQmxvY2soJmZyYW1lKCkuYW5pbWF0aW9uKCkp OwogICAgIAogICAgIGlmICghYWxsb3dTdWJ0cmVlICYmIG1fbGF5b3V0Um9vdCkgewotICAgICAg ICBtX2xheW91dFJvb3QtPm1hcmtDb250YWluaW5nQmxvY2tzRm9yTGF5b3V0KGZhbHNlKTsKKyAg ICAgICAgbV9sYXlvdXRSb290LT5tYXJrQ29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dChTY2hlZHVs ZVJlbGF5b3V0OjpObyk7CiAgICAgICAgIG1fbGF5b3V0Um9vdCA9IG51bGxwdHI7CiAgICAgfQog CkBAIC0yNTUwLDcgKzI1NTAsNyBAQCB2b2lkIEZyYW1lVmlldzo6c2NoZWR1bGVSZWxheW91dCgp CiAgICAgQVNTRVJUKGZyYW1lKCkudmlldygpID09IHRoaXMpOwogCiAgICAgaWYgKG1fbGF5b3V0 Um9vdCkgewotICAgICAgICBtX2xheW91dFJvb3QtPm1hcmtDb250YWluaW5nQmxvY2tzRm9yTGF5 b3V0KGZhbHNlKTsKKyAgICAgICAgbV9sYXlvdXRSb290LT5tYXJrQ29udGFpbmluZ0Jsb2Nrc0Zv ckxheW91dChTY2hlZHVsZVJlbGF5b3V0OjpObyk7CiAgICAgICAgIG1fbGF5b3V0Um9vdCA9IG51 bGxwdHI7CiAgICAgfQogICAgIGlmICghbV9sYXlvdXRTY2hlZHVsaW5nRW5hYmxlZCkKQEAgLTI2 MDAsNyArMjYwMCw3IEBAIHZvaWQgRnJhbWVWaWV3OjpzY2hlZHVsZVJlbGF5b3V0T2ZTdWJ0cmVl KFJlbmRlckVsZW1lbnQmIG5ld1JlbGF5b3V0Um9vdCkKICAgICBBU1NFUlQoZnJhbWUoKS52aWV3 KCkgPT0gdGhpcyk7CiAKICAgICBpZiAocmVuZGVyVmlldy5uZWVkc0xheW91dCgpKSB7Ci0gICAg ICAgIG5ld1JlbGF5b3V0Um9vdC5tYXJrQ29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dChmYWxzZSk7 CisgICAgICAgIG5ld1JlbGF5b3V0Um9vdC5tYXJrQ29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dChT Y2hlZHVsZVJlbGF5b3V0OjpObyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI2MTks MjEgKzI2MTksMjEgQEAgdm9pZCBGcmFtZVZpZXc6OnNjaGVkdWxlUmVsYXlvdXRPZlN1YnRyZWUo UmVuZGVyRWxlbWVudCYgbmV3UmVsYXlvdXRSb290KQogCiAgICAgaWYgKCFtX2xheW91dFJvb3Qp IHsKICAgICAgICAgLy8gSnVzdCByZWxheW91dCB0aGUgc3VidHJlZS4KLSAgICAgICAgbmV3UmVs YXlvdXRSb290Lm1hcmtDb250YWluaW5nQmxvY2tzRm9yTGF5b3V0KGZhbHNlKTsKKyAgICAgICAg bmV3UmVsYXlvdXRSb290Lm1hcmtDb250YWluaW5nQmxvY2tzRm9yTGF5b3V0KFNjaGVkdWxlUmVs YXlvdXQ6Ok5vKTsKICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRJbnZhbGlk YXRlTGF5b3V0KGZyYW1lKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKGlz T2JqZWN0QW5jZXN0b3JDb250YWluZXJPZihtX2xheW91dFJvb3QsICZuZXdSZWxheW91dFJvb3Qp KSB7CiAgICAgICAgIC8vIEtlZXAgdGhlIGN1cnJlbnQgcm9vdC4KLSAgICAgICAgbmV3UmVsYXlv dXRSb290Lm1hcmtDb250YWluaW5nQmxvY2tzRm9yTGF5b3V0KGZhbHNlLCBtX2xheW91dFJvb3Qp OworICAgICAgICBuZXdSZWxheW91dFJvb3QubWFya0NvbnRhaW5pbmdCbG9ja3NGb3JMYXlvdXQo U2NoZWR1bGVSZWxheW91dDo6Tm8sIG1fbGF5b3V0Um9vdCk7CiAgICAgICAgIEFTU0VSVCghbV9s YXlvdXRSb290LT5jb250YWluZXIoKSB8fCAhbV9sYXlvdXRSb290LT5jb250YWluZXIoKS0+bmVl ZHNMYXlvdXQoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAoaXNPYmplY3RB bmNlc3RvckNvbnRhaW5lck9mKCZuZXdSZWxheW91dFJvb3QsIG1fbGF5b3V0Um9vdCkpIHsKICAg ICAgICAgLy8gUmUtcm9vdCBhdCBuZXdSZWxheW91dFJvb3QuCi0gICAgICAgIG1fbGF5b3V0Um9v dC0+bWFya0NvbnRhaW5pbmdCbG9ja3NGb3JMYXlvdXQoZmFsc2UsICZuZXdSZWxheW91dFJvb3Qp OworICAgICAgICBtX2xheW91dFJvb3QtPm1hcmtDb250YWluaW5nQmxvY2tzRm9yTGF5b3V0KFNj aGVkdWxlUmVsYXlvdXQ6Ok5vLCAmbmV3UmVsYXlvdXRSb290KTsKICAgICAgICAgbV9sYXlvdXRS b290ID0gJm5ld1JlbGF5b3V0Um9vdDsKICAgICAgICAgQVNTRVJUKCFtX2xheW91dFJvb3QtPmNv bnRhaW5lcigpIHx8ICFtX2xheW91dFJvb3QtPmNvbnRhaW5lcigpLT5uZWVkc0xheW91dCgpKTsK ICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRJbnZhbGlkYXRlTGF5b3V0KGZy YW1lKCkpOwpAQCAtMjY0MSw5ICsyNjQxLDkgQEAgdm9pZCBGcmFtZVZpZXc6OnNjaGVkdWxlUmVs YXlvdXRPZlN1YnRyZWUoUmVuZGVyRWxlbWVudCYgbmV3UmVsYXlvdXRSb290KQogICAgIH0KIAog ICAgIC8vIEp1c3QgZG8gYSBmdWxsIHJlbGF5b3V0LgotICAgIG1fbGF5b3V0Um9vdC0+bWFya0Nv bnRhaW5pbmdCbG9ja3NGb3JMYXlvdXQoZmFsc2UpOworICAgIG1fbGF5b3V0Um9vdC0+bWFya0Nv bnRhaW5pbmdCbG9ja3NGb3JMYXlvdXQoU2NoZWR1bGVSZWxheW91dDo6Tm8pOwogICAgIG1fbGF5 b3V0Um9vdCA9IG51bGxwdHI7Ci0gICAgbmV3UmVsYXlvdXRSb290Lm1hcmtDb250YWluaW5nQmxv Y2tzRm9yTGF5b3V0KGZhbHNlKTsKKyAgICBuZXdSZWxheW91dFJvb3QubWFya0NvbnRhaW5pbmdC bG9ja3NGb3JMYXlvdXQoU2NoZWR1bGVSZWxheW91dDo6Tm8pOwogICAgIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6ZGlkSW52YWxpZGF0ZUxheW91dChmcmFtZSgpKTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCA2ZTI3YmE5ZDI1N2MyNmRjYWUx YzNhZGNiYjc3NmIxYTI0NDFjM2IyLi5hZTY0MWE0OGFmNjYwN2NjZTI1ZmIwZTBmYWY3NzcxMzRk ZGQwNGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAt NTgwLDkgKzU4MCw5IEBAIHN0YXRpYyB2b2lkIHNjaGVkdWxlUmVsYXlvdXRGb3JTdWJ0cmVlKFJl bmRlckVsZW1lbnQmIHJlbmRlcmVyKQogICAgIGRvd25jYXN0PFJlbmRlclZpZXc+KHJlbmRlcmVy KS5mcmFtZVZpZXcoKS5zY2hlZHVsZVJlbGF5b3V0KCk7CiB9CiAKLXZvaWQgUmVuZGVyT2JqZWN0 OjptYXJrQ29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dChib29sIHNjaGVkdWxlUmVsYXlvdXQsIFJl bmRlckVsZW1lbnQqIG5ld1Jvb3QpCit2b2lkIFJlbmRlck9iamVjdDo6bWFya0NvbnRhaW5pbmdC bG9ja3NGb3JMYXlvdXQoU2NoZWR1bGVSZWxheW91dCBzY2hlZHVsZVJlbGF5b3V0LCBSZW5kZXJF bGVtZW50KiBuZXdSb290KQogewotICAgIEFTU0VSVCghc2NoZWR1bGVSZWxheW91dCB8fCAhbmV3 Um9vdCk7CisgICAgQVNTRVJUKHNjaGVkdWxlUmVsYXlvdXQgPT0gU2NoZWR1bGVSZWxheW91dDo6 Tm8gfHwgIW5ld1Jvb3QpOwogICAgIEFTU0VSVCghaXNTZXROZWVkc0xheW91dEZvcmJpZGRlbigp KTsKIAogICAgIGF1dG8gYW5jZXN0b3IgPSBjb250YWluZXIoKTsKQEAgLTYyNiwxNCArNjI2LDE0 IEBAIHZvaWQgUmVuZGVyT2JqZWN0OjptYXJrQ29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dChib29s IHNjaGVkdWxlUmVsYXlvdXQsIFJlbmRlckVsCiAgICAgICAgIGlmIChhbmNlc3RvciA9PSBuZXdS b290KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmIChzY2hlZHVsZVJlbGF5b3V0 ICYmIG9iamVjdElzUmVsYXlvdXRCb3VuZGFyeShhbmNlc3RvcikpCisgICAgICAgIGlmIChzY2hl ZHVsZVJlbGF5b3V0ID09IFNjaGVkdWxlUmVsYXlvdXQ6OlllcyAmJiBvYmplY3RJc1JlbGF5b3V0 Qm91bmRhcnkoYW5jZXN0b3IpKQogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgaGFzT3V0 T2ZGbG93UG9zaXRpb24gPSBhbmNlc3Rvci0+c3R5bGUoKS5oYXNPdXRPZkZsb3dQb3NpdGlvbigp OwogICAgICAgICBhbmNlc3RvciA9IGNvbnRhaW5lcjsKICAgICB9CiAKLSAgICBpZiAoc2NoZWR1 bGVSZWxheW91dCAmJiBhbmNlc3RvcikKKyAgICBpZiAoc2NoZWR1bGVSZWxheW91dCA9PSBTY2hl ZHVsZVJlbGF5b3V0OjpZZXMgJiYgYW5jZXN0b3IpCiAgICAgICAgIHNjaGVkdWxlUmVsYXlvdXRG b3JTdWJ0cmVlKCphbmNlc3Rvcik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJP YmplY3QuaAppbmRleCAyY2E1NjI3MDA4NzcxMmYyNGU2ZmFiOTk1MTg4Y2M3YmQwZTRiMTc5Li5m NWNkMzU1ZmZjNGQ4N2MwYTZjYTBjYjhiYTI5Mjk1MjA3MTA5ODYwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC0xMDUsNiArMTA1LDggQEAgZW51bSBNYXJraW5n QmVoYXZpb3IgewogICAgIE1hcmtDb250YWluaW5nQmxvY2tDaGFpbiwKIH07CiAKK2VudW0gY2xh c3MgU2NoZWR1bGVSZWxheW91dCB7IE5vLCBZZXMgfTsKKwogZW51bSBNYXBDb29yZGluYXRlc01v ZGUgewogICAgIElzRml4ZWQgICAgICAgICAgICAgPSAxIDw8IDAsCiAgICAgVXNlVHJhbnNmb3Jt cyAgICAgICA9IDEgPDwgMSwKQEAgLTU5MCw3ICs1OTIsNyBAQCBwdWJsaWM6CiAKICAgICBSZW5k ZXJCb3hNb2RlbE9iamVjdCogb2Zmc2V0UGFyZW50KCkgY29uc3Q7CiAKLSAgICB2b2lkIG1hcmtD b250YWluaW5nQmxvY2tzRm9yTGF5b3V0KGJvb2wgc2NoZWR1bGVSZWxheW91dCA9IHRydWUsIFJl bmRlckVsZW1lbnQqIG5ld1Jvb3QgPSBudWxscHRyKTsKKyAgICB2b2lkIG1hcmtDb250YWluaW5n QmxvY2tzRm9yTGF5b3V0KFNjaGVkdWxlUmVsYXlvdXQgPSBTY2hlZHVsZVJlbGF5b3V0OjpZZXMs IFJlbmRlckVsZW1lbnQqIG5ld1Jvb3QgPSBudWxscHRyKTsKICAgICB2b2lkIHNldE5lZWRzTGF5 b3V0KE1hcmtpbmdCZWhhdmlvciA9IE1hcmtDb250YWluaW5nQmxvY2tDaGFpbik7CiAgICAgdm9p ZCBjbGVhck5lZWRzTGF5b3V0KCk7CiAgICAgdm9pZCBzZXRQcmVmZXJyZWRMb2dpY2FsV2lkdGhz RGlydHkoYm9vbCwgTWFya2luZ0JlaGF2aW9yID0gTWFya0NvbnRhaW5pbmdCbG9ja0NoYWluKTsK