178425 2017-10-17 21:35:26 -0700 [FrameView::layout cleanup] Move frame flattening layout logic to a separate function 2017-10-18 07:18:29 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1361565 0 zalan 2017-10-17 21:35:26 -0700 ssia. 1361566 1 webkit-bug-importer 2017-10-17 21:35:50 -0700 <rdar://problem/35045836> 1361567 2 324097 zalan 2017-10-17 21:39:33 -0700 Created attachment 324097 Patch 1361682 3 324097 commit-queue 2017-10-18 07:18:27 -0700 Comment on attachment 324097 Patch Clearing flags on attachment: 324097 Committed r223605: <https://trac.webkit.org/changeset/223605> 1361683 4 commit-queue 2017-10-18 07:18:29 -0700 All reviewed patches have been landed. Closing bug. 324097 2017-10-17 21:39:33 -0700 2017-10-18 07:18:27 -0700 Patch bug-178425-20171017213932.patch text/plain 6593 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmM1MDljYjllYTNhNGIx ODY2ODkzYmIxYTIxZmJjNmNkYzk5Mzc4OC4uNGY0YjQxOTAxNWM4ZTJiNjkzMGM3M2ZhZTBhMDQ3 ODY5MWNjYTA1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE3LTEwLTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgW0ZyYW1lVmlldzo6bGF5b3V0 IGNsZWFudXBdIE1vdmUgZnJhbWUgZmxhdHRlbmluZyBsYXlvdXQgbG9naWMgdG8gYSBzZXBhcmF0 ZSBmdW5jdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc4NDI1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTA0NTgzNj4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rp b25hbGl0eS4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6aGFuZGxlTGF5b3V0V2l0aEZyYW1lRmxhdHRlbmluZ0lmTmVlZGVkKToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6c3RhcnRMYXlvdXRBdE1haW5GcmFtZVZpZXdJZk5lZWRlZCk6CisgICAgICAg ICogcGFnZS9GcmFtZVZpZXcuaDoKKworMjAxNy0xMC0xNyAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgorCiAgICAgICAgIFtGcmFtZVZpZXc6OmxheW91dCBjbGVhbnVwXSBSZW1vdmUg cmVkdW5kYW50IGJvZHktPnJlbmRlcmVyKCktPnNldENoaWxkTmVlZHNMYXlvdXQoKSBjYWxsCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzg0MTQKICAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1MDQwODc2PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw CmluZGV4IDZhZGUwNWVjNThmZmQ1YjEwNTQyNjM0ZmMzZmQxZDcwYWM0NDc3NzguLmJkNzYxNzQ5 NTYwMWE0MDI3OWNjMjE4ZTZhYzhjMWU5OWNmZWE1M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAKQEAgLTEzMjIsNiArMTMyMiwyMCBAQCBzdGF0aWMgdm9pZCBhcHBseVRleHRTaXppbmdJ Zk5lZWRlZChSZW5kZXJFbGVtZW50JiBsYXlvdXRSb290KQogfQogI2VuZGlmCiAKK2Jvb2wgRnJh bWVWaWV3OjpoYW5kbGVMYXlvdXRXaXRoRnJhbWVGbGF0dGVuaW5nSWZOZWVkZWQoYm9vbCBhbGxv d1N1YnRyZWVMYXlvdXQpCit7CisgICAgaWYgKCFpc0luQ2hpbGRGcmFtZVdpdGhGcmFtZUZsYXR0 ZW5pbmcoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAorICAgIGlmICghbV9mcmFtZUZs YXR0ZW5pbmdWaWV3U2l6ZUZvck1lZGlhUXVlcnkpIHsKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFN KE1lZGlhUXVlcmllcywgc3RyZWFtIDw8ICJGcmFtZVZpZXcgIiA8PCB0aGlzIDw8ICIgc25hcHNo b3R0aW5nIHNpemUgIiA8PCAgU2Nyb2xsVmlldzo6bGF5b3V0U2l6ZSgpIDw8ICIgZm9yIG1lZGlh IHF1ZXJpZXMiKTsKKyAgICAgICAgbV9mcmFtZUZsYXR0ZW5pbmdWaWV3U2l6ZUZvck1lZGlhUXVl cnkgPSBTY3JvbGxWaWV3OjpsYXlvdXRTaXplKCk7CisgICAgfQorICAgIHN0YXJ0TGF5b3V0QXRN YWluRnJhbWVWaWV3SWZOZWVkZWQoYWxsb3dTdWJ0cmVlTGF5b3V0KTsKKyAgICBhdXRvKiBsYXlv dXRSb290ID0gbV9zdWJ0cmVlTGF5b3V0Um9vdCA/IG1fc3VidHJlZUxheW91dFJvb3QgOiBmcmFt ZSgpLmRvY3VtZW50KCktPnJlbmRlclZpZXcoKTsKKyAgICByZXR1cm4gIWxheW91dFJvb3QgfHwg IWxheW91dFJvb3QtPm5lZWRzTGF5b3V0KCk7Cit9CisKIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQo Ym9vbCBhbGxvd1N1YnRyZWVMYXlvdXQpCiB7CiAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1Q TElDQVRJT04oIWZyYW1lKCkuZG9jdW1lbnQoKS0+aW5SZW5kZXJUcmVlVXBkYXRlKCkpOwpAQCAt MTM0NiwyMiArMTM2MCwxMiBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0 cmVlTGF5b3V0KQogCiAgICAgLy8gRXZlcnkgc2Nyb2xsIHRoYXQgaGFwcGVucyBkdXJpbmcgbGF5 b3V0IGlzIHByb2dyYW1tYXRpYy4KICAgICBTZXRGb3JTY29wZTxib29sPiBjaGFuZ2VJblByb2dy YW1tYXRpY1Njcm9sbChtX2luUHJvZ3JhbW1hdGljU2Nyb2xsLCB0cnVlKTsKLQotICAgIGJvb2wg aW5DaGlsZEZyYW1lTGF5b3V0V2l0aEZyYW1lRmxhdHRlbmluZyA9IGlzSW5DaGlsZEZyYW1lV2l0 aEZyYW1lRmxhdHRlbmluZygpOwotCi0gICAgaWYgKGluQ2hpbGRGcmFtZUxheW91dFdpdGhGcmFt ZUZsYXR0ZW5pbmcpIHsKLSAgICAgICAgaWYgKCFtX2ZyYW1lRmxhdHRlbmluZ1ZpZXdTaXplRm9y TWVkaWFRdWVyeSkgewotICAgICAgICAgICAgTE9HX1dJVEhfU1RSRUFNKE1lZGlhUXVlcmllcywg c3RyZWFtIDw8ICJGcmFtZVZpZXcgIiA8PCB0aGlzIDw8ICIgc25hcHNob3R0aW5nIHNpemUgIiA8 PCAgU2Nyb2xsVmlldzo6bGF5b3V0U2l6ZSgpIDw8ICIgZm9yIG1lZGlhIHF1ZXJpZXMiKTsKLSAg ICAgICAgICAgIG1fZnJhbWVGbGF0dGVuaW5nVmlld1NpemVGb3JNZWRpYVF1ZXJ5ID0gU2Nyb2xs Vmlldzo6bGF5b3V0U2l6ZSgpOwotICAgICAgICB9Ci0gICAgICAgIHN0YXJ0TGF5b3V0QXRNYWlu RnJhbWVWaWV3SWZOZWVkZWQoYWxsb3dTdWJ0cmVlTGF5b3V0KTsKLSAgICAgICAgYXV0byogbGF5 b3V0Um9vdCA9IG1fc3VidHJlZUxheW91dFJvb3QgPyBtX3N1YnRyZWVMYXlvdXRSb290IDogZnJh bWUoKS5kb2N1bWVudCgpLT5yZW5kZXJWaWV3KCk7Ci0gICAgICAgIGlmICghbGF5b3V0Um9vdCB8 fCAhbGF5b3V0Um9vdC0+bmVlZHNMYXlvdXQoKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICB9 CiAgICAgCiAgICAgVHJhY2VTY29wZSB0cmFjaW5nU2NvcGUoTGF5b3V0U3RhcnQsIExheW91dEVu ZCk7CiAKKyAgICBpZiAoaGFuZGxlTGF5b3V0V2l0aEZyYW1lRmxhdHRlbmluZ0lmTmVlZGVkKGFs bG93U3VidHJlZUxheW91dCkpCisgICAgICAgIHJldHVybjsKKwogI2lmIFBMQVRGT1JNKElPUykK ICAgICBpZiAodXBkYXRlRml4ZWRQb3NpdGlvbkxheW91dFJlY3QoKSkKICAgICAgICAgYWxsb3dT dWJ0cmVlTGF5b3V0ID0gZmFsc2U7CkBAIC0xMzk0LDcgKzEzOTgsNyBAQCB2b2lkIEZyYW1lVmll dzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlTGF5b3V0KQogICAgIHsKICAgICAgICAgU2V0Rm9y U2NvcGU8Ym9vbD4gY2hhbmdlU2NoZWR1bGluZ0VuYWJsZWQobV9sYXlvdXRTY2hlZHVsaW5nRW5h YmxlZCwgZmFsc2UpOwogCi0gICAgICAgIGlmICghbV9uZXN0ZWRMYXlvdXRDb3VudCAmJiAhbV9p blN5bmNocm9ub3VzUG9zdExheW91dCAmJiBtX3Bvc3RMYXlvdXRUYXNrc1RpbWVyLmlzQWN0aXZl KCkgJiYgIWluQ2hpbGRGcmFtZUxheW91dFdpdGhGcmFtZUZsYXR0ZW5pbmcpIHsKKyAgICAgICAg aWYgKCFtX25lc3RlZExheW91dENvdW50ICYmICFtX2luU3luY2hyb25vdXNQb3N0TGF5b3V0ICYm IG1fcG9zdExheW91dFRhc2tzVGltZXIuaXNBY3RpdmUoKSAmJiAhaXNJbkNoaWxkRnJhbWVXaXRo RnJhbWVGbGF0dGVuaW5nKCkpIHsKICAgICAgICAgICAgIC8vIFRoaXMgaXMgYSBuZXcgdG9wLWxl dmVsIGxheW91dC4gSWYgdGhlcmUgYXJlIGFueSByZW1haW5pbmcgdGFza3MgZnJvbSB0aGUgcHJl dmlvdXMKICAgICAgICAgICAgIC8vIGxheW91dCwgZmluaXNoIHRoZW0gbm93LgogICAgICAgICAg ICAgU2V0Rm9yU2NvcGU8Ym9vbD4gaW5TeW5jaHJvbm91c1Bvc3RMYXlvdXRDaGFuZ2UobV9pblN5 bmNocm9ub3VzUG9zdExheW91dCwgdHJ1ZSk7CkBAIC0xNTc2LDcgKzE1ODAsNyBAQCB2b2lkIEZy YW1lVmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlTGF5b3V0KQogCiAgICAgaWYgKCFtX3Bv c3RMYXlvdXRUYXNrc1RpbWVyLmlzQWN0aXZlKCkpIHsKICAgICAgICAgaWYgKCFtX2luU3luY2hy b25vdXNQb3N0TGF5b3V0KSB7Ci0gICAgICAgICAgICBpZiAoaW5DaGlsZEZyYW1lTGF5b3V0V2l0 aEZyYW1lRmxhdHRlbmluZykKKyAgICAgICAgICAgIGlmIChpc0luQ2hpbGRGcmFtZVdpdGhGcmFt ZUZsYXR0ZW5pbmcoKSkKICAgICAgICAgICAgICAgICB1cGRhdGVXaWRnZXRQb3NpdGlvbnMoKTsK ICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIFNldEZvclNjb3BlPGJvb2w+IGlu U3luY2hyb25vdXNQb3N0TGF5b3V0Q2hhbmdlKG1faW5TeW5jaHJvbm91c1Bvc3RMYXlvdXQsIHRy dWUpOwpAQCAtMTU4NCw3ICsxNTg4LDcgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFs bG93U3VidHJlZUxheW91dCkKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIGlm ICghbV9wb3N0TGF5b3V0VGFza3NUaW1lci5pc0FjdGl2ZSgpICYmIChuZWVkc0xheW91dCgpIHx8 IG1faW5TeW5jaHJvbm91c1Bvc3RMYXlvdXQgfHwgaW5DaGlsZEZyYW1lTGF5b3V0V2l0aEZyYW1l RmxhdHRlbmluZykpIHsKKyAgICAgICAgaWYgKCFtX3Bvc3RMYXlvdXRUYXNrc1RpbWVyLmlzQWN0 aXZlKCkgJiYgKG5lZWRzTGF5b3V0KCkgfHwgbV9pblN5bmNocm9ub3VzUG9zdExheW91dCB8fCBp c0luQ2hpbGRGcmFtZVdpdGhGcmFtZUZsYXR0ZW5pbmcoKSkpIHsKICAgICAgICAgICAgIC8vIElm IHdlIG5lZWQgbGF5b3V0IG9yIGFyZSBhbHJlYWR5IGluIGEgc3luY2hyb25vdXMgY2FsbCB0byBw b3N0TGF5b3V0VGFza3MoKSwgCiAgICAgICAgICAgICAvLyBkZWZlciB3aWRnZXQgdXBkYXRlcyBh bmQgZXZlbnQgZGlzcGF0Y2ggdW50aWwgYWZ0ZXIgd2UgcmV0dXJuLiBwb3N0TGF5b3V0VGFza3Mo KQogICAgICAgICAgICAgLy8gY2FuIG1ha2UgdXMgbmVlZCB0byB1cGRhdGUgYWdhaW4sIGFuZCB3 ZSBjYW4gZ2V0IHN0dWNrIGluIGEgbmFzdHkgY3ljbGUgdW5sZXNzCkBAIC00Mjg5LDcgKzQyOTMs NyBAQCBib29sIEZyYW1lVmlldzo6aXNJbkNoaWxkRnJhbWVXaXRoRnJhbWVGbGF0dGVuaW5nKCkg Y29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgRnJhbWVWaWV3OjpzdGFydExheW91 dEF0TWFpbkZyYW1lVmlld0lmTmVlZGVkKGJvb2wgYWxsb3dTdWJ0cmVlKQordm9pZCBGcmFtZVZp ZXc6OnN0YXJ0TGF5b3V0QXRNYWluRnJhbWVWaWV3SWZOZWVkZWQoYm9vbCBhbGxvd1N1YnRyZWVM YXlvdXQpCiB7CiAgICAgLy8gV2hlbiB3ZSBzdGFydCBhIGxheW91dCBhdCB0aGUgY2hpbGQgbGV2 ZWwgYXMgb3Bwb3NlZCB0byB0aGUgdG9wbW9zdCBmcmFtZSB2aWV3IGFuZCB0aGlzIGNoaWxkCiAg ICAgLy8gZnJhbWUgcmVxdWlyZXMgZmxhdHRlbmluZywgd2UgbmVlZCB0byByZS1pbml0aWF0ZSB0 aGUgbGF5b3V0IGF0IHRoZSB0b3Btb3N0IHZpZXcuIExheW91dApAQCAtNDMxMCw3ICs0MzE0LDcg QEAgdm9pZCBGcmFtZVZpZXc6OnN0YXJ0TGF5b3V0QXRNYWluRnJhbWVWaWV3SWZOZWVkZWQoYm9v bCBhbGxvd1N1YnRyZWUpCiAgICAgICAgIHBhcmVudFZpZXcgPSBwYXJlbnRWaWV3LT5wYXJlbnRG cmFtZVZpZXcoKTsKIAogICAgIExPRyhMYXlvdXQsICIgIGZyYW1lIGZsYXR0ZW5pbmcsIHN0YXJ0 aW5nIGZyb20gcm9vdCIpOwotICAgIHBhcmVudFZpZXctPmxheW91dChhbGxvd1N1YnRyZWUpOwor ICAgIHBhcmVudFZpZXctPmxheW91dChhbGxvd1N1YnRyZWVMYXlvdXQpOwogfQogCiB2b2lkIEZy YW1lVmlldzo6dXBkYXRlQ29udHJvbFRpbnRzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4 IGY2MjU5MzcwNDVlY2NhOWVhZTg0ZjNlZTY5YjU3OWU1NzQ3ODNmNWIuLjk4MzYxNDUwYTM3YjRj ODg1OWEyYmVhYjk0OTUyOGY4NDkwOTIyOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAt NzYyLDcgKzc2Miw4IEBAIHByaXZhdGU6CiAKICAgICBGcmFtZVZpZXcqIHBhcmVudEZyYW1lVmll dygpIGNvbnN0OwogCi0gICAgdm9pZCBzdGFydExheW91dEF0TWFpbkZyYW1lVmlld0lmTmVlZGVk KGJvb2wgYWxsb3dTdWJ0cmVlKTsKKyAgICBib29sIGhhbmRsZUxheW91dFdpdGhGcmFtZUZsYXR0 ZW5pbmdJZk5lZWRlZChib29sIGFsbG93U3VidHJlZUxheW91dCk7CisgICAgdm9pZCBzdGFydExh eW91dEF0TWFpbkZyYW1lVmlld0lmTmVlZGVkKGJvb2wgYWxsb3dTdWJ0cmVlTGF5b3V0KTsKICAg ICBib29sIGZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoKSBjb25zdDsKICAgICBib29sIGlzRnJhbWVG bGF0dGVuaW5nVmFsaWRGb3JUaGlzRnJhbWUoKSBjb25zdDsKIAo=