73128 2011-11-25 05:21:25 -0800 Clean up code in WK2/ChromeClientClient related to viewport handling 2011-11-25 05:53:32 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth webkit-unassigned hausmann zalan oldest_to_newest 509108 0 kenneth 2011-11-25 05:21:25 -0800 1) Make sure that we only call resizeToContentsIfNeeded when we are using the tiled backing store and fixed layout as well. 2) Guard the scrollbar code so that it is only called when scroll delegation is not used. Do similarily for the frameset code, which makes no sense with frame flattening. etc 509111 1 116603 kenneth 2011-11-25 05:22:34 -0800 Created attachment 116603 Patch 509118 2 zalan 2011-11-25 05:43:06 -0800 lgtm. a small observation. + This method is only called for the main frame, so the main frame + check has been removed. It looks to me a null check rather than a mainframe check. However, m_page->useFixedLayout() does eliminate the need for the null check, so the code is correct. 509120 3 116603 hausmann 2011-11-25 05:47:06 -0800 Comment on attachment 116603 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116603&action=review r=me but I'll let you decide on cq+ based on the #ifdef comment > Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp:448 > +#if USE(TILED_BACKING_STORE) > + if (m_page->useFixedLayout()) > + m_page->resizeToContentsIfNeeded(); > +#endif For WK2 it does seem a bit strange to have USE(TILED_BACKING_STORE) for this. Do we actually need the #ifdef? 509122 4 116603 kenneth 2011-11-25 05:53:24 -0800 Comment on attachment 116603 Patch landed in r101167 116603 2011-11-25 05:22:34 -0800 2011-11-25 05:53:24 -0800 Patch 0001-Clean-up-code-in-WK2-ChromeClientClient-related-to-v.patch text/plain 6618 kenneth RnJvbSBiMjFhNThjNjc5ZjA5M2ExMGQ4YjY2MWVlODFkNzllNDZiZWMwZWE2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBGcmksIDI1IE5vdiAyMDExIDE0OjE1OjE0ICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gQ2xlYW4gdXAgY29kZSBpbiBXSzIvQ2hyb21lQ2xpZW50Q2xpZW50IHJlbGF0ZWQg dG8gdmlld3BvcnQgaGFuZGxpbmcKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03MzEyOAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIFdlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50 Ojpjb250ZW50c1NpemVDaGFuZ2VkKToKCiAgICBNYWtlIHN1cmUgdGhhdCB3ZSBvbmx5IGNhbGwg cmVzaXplVG9Db250ZW50c0lmTmVlZGVkIHdoZW4gd2UgYXJlCiAgICB1c2luZyB0aGUgdGlsZWQg YmFja2luZyBzdG9yZSBhbmQgZml4ZWQgbGF5b3V0IGFzIHdlbGwuCgogICAgR3VhcmQgdGhlIHNj cm9sbGJhciBjb2RlIHNvIHRoYXQgaXQgaXMgb25seSBjYWxsZWQgd2hlbiBzY3JvbGwKICAgIGRl bGVnYXRpb24gaXMgbm90IHVzZWQuIERvIHNpbWlsYXJpbHkgZm9yIHRoZSBmcmFtZXNldCBjb2Rl LAogICAgd2hpY2ggbWFrZXMgbm8gc2Vuc2Ugd2l0aCBmcmFtZSBmbGF0dGVuaW5nLgoKKFdlYktp dDo6V2ViQ2hyb21lQ2xpZW50OjpkaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5nZSk6 CgogICAgVGhpcyBtZXRob2QgaXMgb25seSBjYWxsZWQgZm9yIHRoZSBtYWluIGZyYW1lLCBzbyB0 aGUgbWFpbiBmcmFtZQogICAgY2hlY2sgaGFzIGJlZW4gcmVtb3ZlZC4KLS0tCiBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjIgKysrKysrKysK IC4uLi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAgIHwgICA1 MyArKysrKysrKystLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDQ3IGluc2VydGlvbnMoKyks IDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA3Y2U2YTBlLi5kOTBkZjY1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMTEtMjUgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFu c2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgorCisgICAgICAgIENsZWFuIHVwIGNvZGUgaW4gV0sy L0Nocm9tZUNsaWVudENsaWVudCByZWxhdGVkIHRvIHZpZXdwb3J0IGhhbmRsaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzEyOAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDaHJv bWVDbGllbnQ6OmNvbnRlbnRzU2l6ZUNoYW5nZWQpOgorCisgICAgICAgICAgICBNYWtlIHN1cmUg dGhhdCB3ZSBvbmx5IGNhbGwgcmVzaXplVG9Db250ZW50c0lmTmVlZGVkIHdoZW4gd2UgYXJlCisg ICAgICAgICAgICB1c2luZyB0aGUgdGlsZWQgYmFja2luZyBzdG9yZSBhbmQgZml4ZWQgbGF5b3V0 IGFzIHdlbGwuCisKKyAgICAgICAgICAgIEd1YXJkIHRoZSBzY3JvbGxiYXIgY29kZSBzbyB0aGF0 IGl0IGlzIG9ubHkgY2FsbGVkIHdoZW4gc2Nyb2xsCisgICAgICAgICAgICBkZWxlZ2F0aW9uIGlz IG5vdCB1c2VkLiBEbyBzaW1pbGFyaWx5IGZvciB0aGUgZnJhbWVzZXQgY29kZSwKKyAgICAgICAg ICAgIHdoaWNoIG1ha2VzIG5vIHNlbnNlIHdpdGggZnJhbWUgZmxhdHRlbmluZy4KKworICAgICAg ICAoV2ViS2l0OjpXZWJDaHJvbWVDbGllbnQ6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlk Q2hhbmdlKToKKworICAgICAgICAgICAgVGhpcyBtZXRob2QgaXMgb25seSBjYWxsZWQgZm9yIHRo ZSBtYWluIGZyYW1lLCBzbyB0aGUgbWFpbiBmcmFtZQorICAgICAgICAgICAgY2hlY2sgaGFzIGJl ZW4gcmVtb3ZlZC4KKwogMjAxMS0xMS0yNSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFu bkBub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBDbGVhbnVwIGluIFFNTCB0ZXN0cy4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21l Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi Q2hyb21lQ2xpZW50LmNwcAppbmRleCA0NDEyZWVmLi4yMTg2Zjk1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVD bGllbnQuY3BwCkBAIC00MjcsNDAgKzQyNywzNyBAQCBQbGF0Zm9ybVBhZ2VDbGllbnQgV2ViQ2hy b21lQ2xpZW50OjpwbGF0Zm9ybVBhZ2VDbGllbnQoKSBjb25zdAogCiB2b2lkIFdlYkNocm9tZUNs aWVudDo6Y29udGVudHNTaXplQ2hhbmdlZChGcmFtZSogZnJhbWUsIGNvbnN0IEludFNpemUmIHNp emUpIGNvbnN0CiB7Ci0jaWYgUExBVEZPUk0oUVQpCi0jaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RP UkUpCi0gICAgaWYgKGZyYW1lLT5wYWdlKCktPm1haW5GcmFtZSgpID09IGZyYW1lKQotICAgICAg ICBtX3BhZ2UtPnJlc2l6ZVRvQ29udGVudHNJZk5lZWRlZCgpOwotI2VuZGlmCi0KLSAgICBXZWJG cmFtZSogd2ViRnJhbWUgPSBzdGF0aWNfY2FzdDxXZWJGcmFtZUxvYWRlckNsaWVudCo+KGZyYW1l LT5sb2FkZXIoKS0+Y2xpZW50KCkpLT53ZWJGcmFtZSgpOworICAgIGlmICghbV9wYWdlLT5jb3Jl UGFnZSgpLT5zZXR0aW5ncygpLT5mcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCkpIHsKKyAgICAgICAg V2ViRnJhbWUqIGxhcmdlc3RGcmFtZSA9IGZpbmRMYXJnZXN0RnJhbWVJbkZyYW1lU2V0KG1fcGFn ZSk7CisgICAgICAgIGlmIChsYXJnZXN0RnJhbWUgIT0gbV9jYWNoZWRGcmFtZVNldExhcmdlc3RG cmFtZS5nZXQoKSkgeworICAgICAgICAgICAgbV9jYWNoZWRGcmFtZVNldExhcmdlc3RGcmFtZSA9 IGxhcmdlc3RGcmFtZTsKKyAgICAgICAgICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpGcmFtZVNldExhcmdlc3RGcmFtZUNoYW5nZWQobGFyZ2VzdEZyYW1lID8gbGFyZ2Vz dEZyYW1lLT5mcmFtZUlEKCkgOiAwKSk7CisgICAgICAgIH0KKyAgICB9CiAKLSAgICBpZiAoIW1f cGFnZS0+bWFpbldlYkZyYW1lKCkgfHwgbV9wYWdlLT5tYWluV2ViRnJhbWUoKSAhPSB3ZWJGcmFt ZSkKKyAgICBpZiAoZnJhbWUtPnBhZ2UoKS0+bWFpbkZyYW1lKCkgIT0gZnJhbWUpCiAgICAgICAg IHJldHVybjsKIAorI2lmIFBMQVRGT1JNKFFUKQogICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEaWRDaGFuZ2VDb250ZW50c1NpemUoc2l6ZSkpOwogI2VuZGlmCiAKLSAg ICBXZWJGcmFtZSogbGFyZ2VzdEZyYW1lID0gZmluZExhcmdlc3RGcmFtZUluRnJhbWVTZXQobV9w YWdlKTsKLSAgICBpZiAobGFyZ2VzdEZyYW1lICE9IG1fY2FjaGVkRnJhbWVTZXRMYXJnZXN0RnJh bWUuZ2V0KCkpIHsKLSAgICAgICAgbV9jYWNoZWRGcmFtZVNldExhcmdlc3RGcmFtZSA9IGxhcmdl c3RGcmFtZTsKLSAgICAgICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkZy YW1lU2V0TGFyZ2VzdEZyYW1lQ2hhbmdlZChsYXJnZXN0RnJhbWUgPyBsYXJnZXN0RnJhbWUtPmZy YW1lSUQoKSA6IDApKTsKLSAgICB9CisjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCisgICAg aWYgKG1fcGFnZS0+dXNlRml4ZWRMYXlvdXQoKSkKKyAgICAgICAgbV9wYWdlLT5yZXNpemVUb0Nv bnRlbnRzSWZOZWVkZWQoKTsKKyNlbmRpZgogCi0gICAgaWYgKGZyYW1lLT5wYWdlKCktPm1haW5G cmFtZSgpICE9IGZyYW1lKQotICAgICAgICByZXR1cm47CiAgICAgRnJhbWVWaWV3KiBmcmFtZVZp ZXcgPSBmcmFtZS0+dmlldygpOwotICAgIGlmICghZnJhbWVWaWV3KQotICAgICAgICByZXR1cm47 CisgICAgaWYgKGZyYW1lVmlldyAmJiAhZnJhbWVWaWV3LT5kZWxlZ2F0ZXNTY3JvbGxpbmcoKSkg IHsKKyAgICAgICAgYm9vbCBoYXNIb3Jpem9udGFsU2Nyb2xsYmFyID0gZnJhbWVWaWV3LT5ob3Jp em9udGFsU2Nyb2xsYmFyKCk7CisgICAgICAgIGJvb2wgaGFzVmVydGljYWxTY3JvbGxiYXIgPSBm cmFtZVZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyKCk7CiAKLSAgICBib29sIGhhc0hvcml6b250YWxT Y3JvbGxiYXIgPSBmcmFtZVZpZXctPmhvcml6b250YWxTY3JvbGxiYXIoKTsKLSAgICBib29sIGhh c1ZlcnRpY2FsU2Nyb2xsYmFyID0gZnJhbWVWaWV3LT52ZXJ0aWNhbFNjcm9sbGJhcigpOworICAg ICAgICBpZiAoaGFzSG9yaXpvbnRhbFNjcm9sbGJhciAhPSBtX2NhY2hlZE1haW5GcmFtZUhhc0hv cml6b250YWxTY3JvbGxiYXIgfHwgaGFzVmVydGljYWxTY3JvbGxiYXIgIT0gbV9jYWNoZWRNYWlu RnJhbWVIYXNWZXJ0aWNhbFNjcm9sbGJhcikgeworICAgICAgICAgICAgbV9wYWdlLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVNjcm9sbGJhcnNGb3JNYWluRnJhbWUoaGFz SG9yaXpvbnRhbFNjcm9sbGJhciwgaGFzVmVydGljYWxTY3JvbGxiYXIpKTsKIAotICAgIGlmICho YXNIb3Jpem9udGFsU2Nyb2xsYmFyICE9IG1fY2FjaGVkTWFpbkZyYW1lSGFzSG9yaXpvbnRhbFNj cm9sbGJhciB8fCBoYXNWZXJ0aWNhbFNjcm9sbGJhciAhPSBtX2NhY2hlZE1haW5GcmFtZUhhc1Zl cnRpY2FsU2Nyb2xsYmFyKSB7Ci0gICAgICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpEaWRDaGFuZ2VTY3JvbGxiYXJzRm9yTWFpbkZyYW1lKGhhc0hvcml6b250YWxTY3Jv bGxiYXIsIGhhc1ZlcnRpY2FsU2Nyb2xsYmFyKSk7Ci0gICAgICAgIAotICAgICAgICBtX2NhY2hl ZE1haW5GcmFtZUhhc0hvcml6b250YWxTY3JvbGxiYXIgPSBoYXNIb3Jpem9udGFsU2Nyb2xsYmFy OwotICAgICAgICBtX2NhY2hlZE1haW5GcmFtZUhhc1ZlcnRpY2FsU2Nyb2xsYmFyID0gaGFzVmVy dGljYWxTY3JvbGxiYXI7CisgICAgICAgICAgICBtX2NhY2hlZE1haW5GcmFtZUhhc0hvcml6b250 YWxTY3JvbGxiYXIgPSBoYXNIb3Jpem9udGFsU2Nyb2xsYmFyOworICAgICAgICAgICAgbV9jYWNo ZWRNYWluRnJhbWVIYXNWZXJ0aWNhbFNjcm9sbGJhciA9IGhhc1ZlcnRpY2FsU2Nyb2xsYmFyOwor ICAgICAgICB9CiAgICAgfQogfQogCkBAIC03NDcsMTMgKzc0NCwxMyBAQCB2b2lkIFdlYkNocm9t ZUNsaWVudDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UoY29uc3QgVmlld3Bv cnRBcmd1bWVudAogCiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAgLy8gV2hlbiB2 aWV3cG9ydCBwcm9wZXJ0aWVzIGNoYW5nZSwgcmVjYWxjdWxhdGUgYW5kIHNldCB0aGUgbmV3IHJl Y29tbWVuZGVkIGxheW91dCBzaXplIGluIGNhc2Ugb2YgZml4ZWQgbGF5b3V0IHJlbmRlcmluZy4K LSAgICBpZiAobV9wYWdlLT5tYWluRnJhbWVWaWV3KCkgJiYgbV9wYWdlLT5tYWluRnJhbWVWaWV3 KCktPnVzZUZpeGVkTGF5b3V0KCkpIHsKLSAgICAgICAgUGFnZSogcGFnZSA9IG1fcGFnZS0+Y29y ZVBhZ2UoKTsKLSAgICAgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gcGFnZS0+c2V0dGluZ3MoKTsK KyAgICBpZiAobV9wYWdlLT51c2VGaXhlZExheW91dCgpKSB7CisgICAgICAgIFNldHRpbmdzKiBz ZXR0aW5ncyA9IG1fcGFnZS0+Y29yZVBhZ2UoKS0+c2V0dGluZ3MoKTsKIAogICAgICAgICBpbnQg bWluaW11bUxheW91dEZhbGxiYWNrV2lkdGggPSBzdGQ6Om1heChzZXR0aW5ncy0+bGF5b3V0RmFs bGJhY2tXaWR0aCgpLCBtX3BhZ2UtPnZpZXdwb3J0U2l6ZSgpLndpZHRoKCkpOwogCi0gICAgICAg IEludFNpemUgdGFyZ2V0TGF5b3V0U2l6ZSA9IGNvbXB1dGVWaWV3cG9ydEF0dHJpYnV0ZXMocGFn ZS0+dmlld3BvcnRBcmd1bWVudHMoKSwgbWluaW11bUxheW91dEZhbGxiYWNrV2lkdGgsIHNldHRp bmdzLT5kZXZpY2VXaWR0aCgpLCBzZXR0aW5ncy0+ZGV2aWNlSGVpZ2h0KCksCisgICAgICAgIElu dFNpemUgdGFyZ2V0TGF5b3V0U2l6ZSA9IGNvbXB1dGVWaWV3cG9ydEF0dHJpYnV0ZXMobV9wYWdl LT5jb3JlUGFnZSgpLT52aWV3cG9ydEFyZ3VtZW50cygpLAorICAgICAgICAgICAgbWluaW11bUxh eW91dEZhbGxiYWNrV2lkdGgsIHNldHRpbmdzLT5kZXZpY2VXaWR0aCgpLCBzZXR0aW5ncy0+ZGV2 aWNlSGVpZ2h0KCksCiAgICAgICAgICAgICBzZXR0aW5ncy0+ZGV2aWNlRFBJKCksIG1fcGFnZS0+ dmlld3BvcnRTaXplKCkpLmxheW91dFNpemU7CiAgICAgICAgIG1fcGFnZS0+c2V0UmVzaXplc1Rv Q29udGVudHNVc2luZ0xheW91dFNpemUodGFyZ2V0TGF5b3V0U2l6ZSk7CiAgICAgfQotLSAKMS43 LjQuMQoK