180385 2017-12-04 16:42:36 -0800 Cleanup code that computes iframe content offsets in FrameView 2017-12-05 08:20:31 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser webkit-bug-importer zalan oldest_to_newest 1377994 0 simon.fraser 2017-12-04 16:42:36 -0800 Cleanup code that computes iframe content offsets in FrameView 1377997 1 328410 simon.fraser 2017-12-04 16:45:22 -0800 Created attachment 328410 Patch 1378002 2 328410 zalan 2017-12-04 16:51:13 -0800 Comment on attachment 328410 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=328410&action=review > Source/WebCore/rendering/RenderBox.cpp:667 > return LayoutRect(x, y, contentWidth(), contentHeight()); return LayoutRect(contentBoxLocation(), LayoutSize(contentWidth(), contentHeight())); 1378024 3 simon.fraser 2017-12-04 17:38:07 -0800 https://trac.webkit.org/r225512 1378056 4 webkit-bug-importer 2017-12-04 19:09:24 -0800 <rdar://problem/35846038> 1378163 5 simon.fraser 2017-12-05 08:20:31 -0800 *** Bug 180384 has been marked as a duplicate of this bug. *** 328410 2017-12-04 16:45:22 -0800 2017-12-04 16:51:13 -0800 Patch bug-180385-20171204164522.patch text/plain 7064 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjI2MGYyYjY5NTU0ODAw ZTU2NDkzMzg4NGRhODQxOTRmMTYyYjZhNi4uZDg0ODk0MzE3MmY2OGRkMzlmM2IzOWUzZWFkYjAy MzBhOWUyMmFiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTEyLTA0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFudXAgY29k ZSB0aGF0IGNvbXB1dGVzIGlmcmFtZSBjb250ZW50IG9mZnNldHMgaW4gRnJhbWVWaWV3CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAzODUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY29vcmRpbmF0 ZSBjb252ZXJzaW9uIGZ1bmN0aW9ucyBpbiBGcmFtZVZpZXcgZXhwbGljaXRseSBhZGRlZCBib3Jk ZXJMZWZ0L3BhZGRpbmdMZWZ0CisgICAgICAgIGFuZCBib3JkZXJUb3AvcGFkZGluZ1RvcCB0byBj b21wdXRlIHRoZSBvZmZzZXQgZnJvbSB0aGUgY29udGVudHMgb2YgYSBmcmFtZSB0byBpdHMgcGFy ZW50IHJlbmRlcmVyLgorICAgICAgICAKKyAgICAgICAgVGhpcyBpcyBlcXVpdmFsZW50IHRvIHRo ZSBjYWxsIHRvIGNvbnRleHRCb3hSZWN0KCkgdGhhdCBSZW5kZXJXaWRnZXQ6OnVwZGF0ZVdpZGdl dEdlb21ldHJ5KCkgZG9lcywKKyAgICAgICAgd2hpY2ggYWxzbyB0YWtlcyBsZWZ0LXNpZGUgc2Ny b2xsYmFycyBpbnRvIGFjY291bnQuCisgICAgICAgIAorICAgICAgICBDb29yZGluYXRlIG9mZnNl dHMgZG9uJ3QgbmVlZCBoZWlnaHQgYW5kIHdpZHRoLCBzbyBhZGQgUmVuZGVyQm94Ojpjb250ZW50 Qm94TG9jYXRpb24oKSB0aGF0IGp1c3QKKyAgICAgICAgY29tcHV0ZXMgdGhlIHRvcCBsZWZ0LCBh bmQgdXNlIGl0IGluIEZyYW1lVmlldy4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6aW52YWxpZGF0ZVJlY3QpOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3Ojpjb252ZXJ0VG9Db250YWluaW5nVmlldyBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXcgY29uc3Qp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQuaDoKKyAgICAgICAgKFdl YkNvcmU6OkZsb2F0UG9pbnQ6OnNjYWxlZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpGbG9h dFBvaW50OjpzY2FsZWQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb250ZW50Qm94TG9jYXRpb24gY29u c3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAxNy0xMS0yOSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBNaXNzaW5nIGxh eWVyIGNvbnRlbnQgd2hlbiBhbmltYXRpbmcgZWxlbWVudHMgb24tc2NyZWVuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAKaW5kZXggNTY3Yjc3YTQxNTA3NGRiYWM5MzUyNGMwNzdmZWQxNzA0NDcz MjU1Yi4uNjdhOTZmNmJkYjljY2U5MzM0ZDA0NDc2Y2FmYTg0YjU0ZTU2MTllNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNDMwLDcgKzQzMCw3IEBAIHZvaWQgRnJhbWVWaWV3Ojpp bnZhbGlkYXRlUmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQogICAgICAgICByZXR1cm47CiAKICAg ICBJbnRSZWN0IHJlcGFpbnRSZWN0ID0gcmVjdDsKLSAgICByZXBhaW50UmVjdC5tb3ZlKHJlbmRl cmVyLT5ib3JkZXJMZWZ0KCkgKyByZW5kZXJlci0+cGFkZGluZ0xlZnQoKSwgcmVuZGVyZXItPmJv cmRlclRvcCgpICsgcmVuZGVyZXItPnBhZGRpbmdUb3AoKSk7CisgICAgcmVwYWludFJlY3QubW92 ZUJ5KHJvdW5kZWRJbnRQb2ludChyZW5kZXJlci0+Y29udGVudEJveExvY2F0aW9uKCkpKTsKICAg ICByZW5kZXJlci0+cmVwYWludFJlY3RhbmdsZShyZXBhaW50UmVjdCk7CiB9CiAKQEAgLTQzODQs MTAgKzQzODQsOCBAQCBJbnRSZWN0IEZyYW1lVmlldzo6Y29udmVydFRvQ29udGFpbmluZ1ZpZXco Y29uc3QgSW50UmVjdCYgbG9jYWxSZWN0KSBjb25zdAogICAgICAgICAgICAgaWYgKCFyZW5kZXJl cikKICAgICAgICAgICAgICAgICByZXR1cm4gbG9jYWxSZWN0OwogICAgICAgICAgICAgICAgIAot ICAgICAgICAgICAgSW50UmVjdCByZWN0KGxvY2FsUmVjdCk7Ci0gICAgICAgICAgICAvLyBBZGQg Ym9yZGVycyBhbmQgcGFkZGluZz8/Ci0gICAgICAgICAgICByZWN0Lm1vdmUocmVuZGVyZXItPmJv cmRlckxlZnQoKSArIHJlbmRlcmVyLT5wYWRkaW5nTGVmdCgpLAotICAgICAgICAgICAgICAgICAg ICAgIHJlbmRlcmVyLT5ib3JkZXJUb3AoKSArIHJlbmRlcmVyLT5wYWRkaW5nVG9wKCkpOworICAg ICAgICAgICAgYXV0byByZWN0ID0gbG9jYWxSZWN0OworICAgICAgICAgICAgcmVjdC5tb3ZlQnko cm91bmRlZEludFBvaW50KHJlbmRlcmVyLT5jb250ZW50Qm94TG9jYXRpb24oKSkpOwogICAgICAg ICAgICAgcmV0dXJuIHBhcmVudFZpZXcuY29udmVydEZyb21SZW5kZXJlclRvQ29udGFpbmluZ1Zp ZXcocmVuZGVyZXIsIHJlY3QpOwogICAgICAgICB9CiAgICAgICAgIApAQCAtNDQwOCwxMCArNDQw Niw4IEBAIEludFJlY3QgRnJhbWVWaWV3Ojpjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3KGNvbnN0 IEludFJlY3QmIHBhcmVudFJlY3QpIGNvbnN0CiAgICAgICAgICAgICBpZiAoIXJlbmRlcmVyKQog ICAgICAgICAgICAgICAgIHJldHVybiBwYXJlbnRSZWN0OwogCi0gICAgICAgICAgICBJbnRSZWN0 IHJlY3QgPSBwYXJlbnRWaWV3LmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdUb1JlbmRlcmVyKHJl bmRlcmVyLCBwYXJlbnRSZWN0KTsKLSAgICAgICAgICAgIC8vIFN1YnRyYWN0IGJvcmRlcnMgYW5k IHBhZGRpbmcKLSAgICAgICAgICAgIHJlY3QubW92ZSgtcmVuZGVyZXItPmJvcmRlckxlZnQoKSAt IHJlbmRlcmVyLT5wYWRkaW5nTGVmdCgpLAotICAgICAgICAgICAgICAgICAgICAgIC1yZW5kZXJl ci0+Ym9yZGVyVG9wKCkgLSByZW5kZXJlci0+cGFkZGluZ1RvcCgpKTsKKyAgICAgICAgICAgIGF1 dG8gcmVjdCA9IHBhcmVudFZpZXcuY29udmVydEZyb21Db250YWluaW5nVmlld1RvUmVuZGVyZXIo cmVuZGVyZXIsIHBhcmVudFJlY3QpOworICAgICAgICAgICAgcmVjdC5tb3ZlQnkoLXJvdW5kZWRJ bnRQb2ludChyZW5kZXJlci0+Y29udGVudEJveExvY2F0aW9uKCkpKTsKICAgICAgICAgICAgIHJl dHVybiByZWN0OwogICAgICAgICB9CiAgICAgICAgIApAQCAtNDQzMiwxMSArNDQyOCw4IEBAIElu dFBvaW50IEZyYW1lVmlldzo6Y29udmVydFRvQ29udGFpbmluZ1ZpZXcoY29uc3QgSW50UG9pbnQm IGxvY2FsUG9pbnQpIGNvbnN0CiAgICAgICAgICAgICBpZiAoIXJlbmRlcmVyKQogICAgICAgICAg ICAgICAgIHJldHVybiBsb2NhbFBvaW50OwogICAgICAgICAgICAgICAgIAotICAgICAgICAgICAg SW50UG9pbnQgcG9pbnQobG9jYWxQb2ludCk7Ci0KLSAgICAgICAgICAgIC8vIEFkZCBib3JkZXJz IGFuZCBwYWRkaW5nCi0gICAgICAgICAgICBwb2ludC5tb3ZlKHJlbmRlcmVyLT5ib3JkZXJMZWZ0 KCkgKyByZW5kZXJlci0+cGFkZGluZ0xlZnQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgcmVu ZGVyZXItPmJvcmRlclRvcCgpICsgcmVuZGVyZXItPnBhZGRpbmdUb3AoKSk7CisgICAgICAgICAg ICBhdXRvIHBvaW50ID0gbG9jYWxQb2ludDsKKyAgICAgICAgICAgIHBvaW50Lm1vdmVCeShyb3Vu ZGVkSW50UG9pbnQocmVuZGVyZXItPmNvbnRlbnRCb3hMb2NhdGlvbigpKSk7CiAgICAgICAgICAg ICByZXR1cm4gcGFyZW50Vmlldy5jb252ZXJ0RnJvbVJlbmRlcmVyVG9Db250YWluaW5nVmlldyhy ZW5kZXJlciwgcG9pbnQpOwogICAgICAgICB9CiAgICAgICAgIApAQCAtNDQ1NywxMCArNDQ1MCw4 IEBAIEludFBvaW50IEZyYW1lVmlldzo6Y29udmVydEZyb21Db250YWluaW5nVmlldyhjb25zdCBJ bnRQb2ludCYgcGFyZW50UG9pbnQpIGNvbnN0CiAgICAgICAgICAgICBpZiAoIXJlbmRlcmVyKQog ICAgICAgICAgICAgICAgIHJldHVybiBwYXJlbnRQb2ludDsKIAotICAgICAgICAgICAgSW50UG9p bnQgcG9pbnQgPSBwYXJlbnRWaWV3LmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdUb1JlbmRlcmVy KHJlbmRlcmVyLCBwYXJlbnRQb2ludCk7Ci0gICAgICAgICAgICAvLyBTdWJ0cmFjdCBib3JkZXJz IGFuZCBwYWRkaW5nCi0gICAgICAgICAgICBwb2ludC5tb3ZlKC1yZW5kZXJlci0+Ym9yZGVyTGVm dCgpIC0gcmVuZGVyZXItPnBhZGRpbmdMZWZ0KCksCi0gICAgICAgICAgICAgICAgICAgICAgIC1y ZW5kZXJlci0+Ym9yZGVyVG9wKCkgLSByZW5kZXJlci0+cGFkZGluZ1RvcCgpKTsKKyAgICAgICAg ICAgIGF1dG8gcG9pbnQgPSBwYXJlbnRWaWV3LmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdUb1Jl bmRlcmVyKHJlbmRlcmVyLCBwYXJlbnRQb2ludCk7CisgICAgICAgICAgICBwb2ludC5tb3ZlQnko LXJvdW5kZWRJbnRQb2ludChyZW5kZXJlci0+Y29udGVudEJveExvY2F0aW9uKCkpKTsKICAgICAg ICAgICAgIHJldHVybiBwb2ludDsKICAgICAgICAgfQogICAgICAgICAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQuaAppbmRleCAyZWYyYmM1ZGVlN2ExNmFj ODk2YzFmODdkYmI1NmEyZWVjZjA5OWJjLi4xNzkyMTgwMWRlYTliMzc5MTM2NjdlZjNjYjU4NjQy YWI2ODQxMmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G bG9hdFBvaW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQ b2ludC5oCkBAIC0xMjcsMTIgKzEyNywxMiBAQCBwdWJsaWM6CiAgICAgICAgIG1feSAqPSBzY2Fs ZVk7CiAgICAgfQogCi0gICAgRmxvYXRQb2ludCBzY2FsZWQoZmxvYXQgc2NhbGUpCisgICAgRmxv YXRQb2ludCBzY2FsZWQoZmxvYXQgc2NhbGUpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4g eyBtX3ggKiBzY2FsZSwgbV95ICogc2NhbGUgfTsKICAgICB9CiAKLSAgICBGbG9hdFBvaW50IHNj YWxlZChmbG9hdCBzY2FsZVgsIGZsb2F0IHNjYWxlWSkKKyAgICBGbG9hdFBvaW50IHNjYWxlZChm bG9hdCBzY2FsZVgsIGZsb2F0IHNjYWxlWSkgY29uc3QKICAgICB7CiAgICAgICAgIHJldHVybiB7 IG1feCAqIHNjYWxlWCwgbV95ICogc2NhbGVZIH07CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcAppbmRleCAyZjg4ODg4Y2U1MmVkNWUyYTY5OTYwMmE3MjBjNTU3ZTNj MGZkNTExLi4yNjQ3YzllZWIzOWI0NDdmNDI4NmFmMzcxOWQxM2RjM2JkNjA2MzBhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjY3LDYgKzY2NywxNSBAQCBMYXlv dXRSZWN0IFJlbmRlckJveDo6Y29udGVudEJveFJlY3QoKSBjb25zdAogICAgIHJldHVybiBMYXlv dXRSZWN0KHgsIHksIGNvbnRlbnRXaWR0aCgpLCBjb250ZW50SGVpZ2h0KCkpOwogfQogCitMYXlv dXRQb2ludCBSZW5kZXJCb3g6OmNvbnRlbnRCb3hMb2NhdGlvbigpIGNvbnN0Cit7CisgICAgTGF5 b3V0VW5pdCB4ID0gYm9yZGVyTGVmdCgpICsgcGFkZGluZ0xlZnQoKTsKKyAgICBpZiAoc2hvdWxk UGxhY2VCbG9ja0RpcmVjdGlvblNjcm9sbGJhck9uTGVmdCgpKQorICAgICAgICB4ICs9IHZlcnRp Y2FsU2Nyb2xsYmFyV2lkdGgoKTsKKyAgICBMYXlvdXRVbml0IHkgPSBib3JkZXJUb3AoKSArIHBh ZGRpbmdUb3AoKTsKKyAgICByZXR1cm4geyB4LCB5IH07Cit9CisKIEludFJlY3QgUmVuZGVyQm94 OjphYnNvbHV0ZUNvbnRlbnRCb3goKSBjb25zdAogewogICAgIC8vIFRoaXMgaXMgd3Jvbmcgd2l0 aCB0cmFuc2Zvcm1zIGFuZCBmbGlwcGVkIHdyaXRpbmcgbW9kZXMuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmgKaW5kZXggN2Y5NDMxNTEzMjY4ZGI1MWZhYjM3NjQ3ZGQ2Y2JjMDQzMWE2 ZTQ2MS4uNGFjZDJlNDhiYTFlYmUxMGI5MzgzMmNiNTE1NzM0N2E3YTdlZGE5NyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtMTYwLDYgKzE2MCw4IEBAIHB1YmxpYzoKIAog ICAgIC8vIFRoZSBjb250ZW50IGFyZWEgb2YgdGhlIGJveCAoZXhjbHVkZXMgcGFkZGluZyAtIGFu ZCBpbnRyaW5zaWMgcGFkZGluZyBmb3IgdGFibGUgY2VsbHMsIGV0Yy4uLiAtIGFuZCBib3JkZXIp LgogICAgIExheW91dFJlY3QgY29udGVudEJveFJlY3QoKSBjb25zdDsKKyAgICBMYXlvdXRQb2lu dCBjb250ZW50Qm94TG9jYXRpb24oKSBjb25zdDsKKwogICAgIC8vIFRoZSBjb250ZW50IGJveCBp biBhYnNvbHV0ZSBjb29yZHMuIElnbm9yZXMgdHJhbnNmb3Jtcy4KICAgICBJbnRSZWN0IGFic29s dXRlQ29udGVudEJveCgpIGNvbnN0OwogICAgIC8vIFRoZSBjb250ZW50IGJveCBjb252ZXJ0ZWQg dG8gYWJzb2x1dGUgY29vcmRzICh0YWtpbmcgdHJhbnNmb3JtcyBpbnRvIGFjY291bnQpLgo=