98427 2012-10-04 10:53:38 -0700 [Qt] Prevent the PageViewportController from affecting the viewport in desktop mode 2012-10-08 05:02:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98642 1 jturcotte jturcotte abecsi jturcotte ossy oldest_to_newest 734829 0 jturcotte 2012-10-04 10:53:38 -0700 [Qt] Prevent the PageViewportController from affecting the viewport in desktop mode 734833 1 167130 jturcotte 2012-10-04 10:55:56 -0700 Created attachment 167130 Patch 735091 2 167130 kenneth 2012-10-04 15:54:28 -0700 Comment on attachment 167130 Patch I still hope desktop mode can be deprecated at some point :) 736612 3 jturcotte 2012-10-08 03:41:38 -0700 Committed r130629: <http://trac.webkit.org/changeset/130629> 736629 4 ossy 2012-10-08 05:02:18 -0700 (In reply to comment #3) > Committed r130629: <http://trac.webkit.org/changeset/130629> It caused a regression - https://bugs.webkit.org/show_bug.cgi?id=98642 Could you check it, please? 167130 2012-10-04 10:55:56 -0700 2012-10-04 15:54:28 -0700 Patch bug-98427-20121004195506.patch text/plain 6120 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTIwNTk2NWM1NzExYjIz MTI3NmJkMzc1MDczNTRlY2FmNjY0NGQ5MS4uYWEwZGU1MDk1N2Q3ODc2NTRlM2Y1OTIyZTU5ZWUw NzliMTRmMTUyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDEyLTEwLTA0ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CiAKKyAgICAgICAgW1F0 XSBQcmV2ZW50IHRoZSBQYWdlVmlld3BvcnRDb250cm9sbGVyIGZyb20gYWZmZWN0aW5nIHRoZSB2 aWV3cG9ydCBpbiBkZXNrdG9wIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk4NDI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUVF1aWNrRmxpY2thYmxlIGlzbid0IHRpZ2h0bHkgYm91bmQgdG8gaXQg YW55bW9yZSwgd2UgY2FuIGF2b2lkIGNyZWF0aW5nIGl0CisgICAgICAgIGNvbXBsZXRlbHkgaW4g dGhpcyBjYXNlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNw cDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpvbkNvbXBvbmVudENv bXBsZXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmg6 CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6b25Db21wb25lbnRDb21wbGV0ZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL3F0L1F0UGFnZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlF0UGFnZUNsaWVudDo6ZGlkUmVuZGVyRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpRdFBhZ2VD bGllbnQ6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OlF0UGFnZUNs aWVudDo6cGFnZVRyYW5zaXRpb25WaWV3cG9ydFJlYWR5KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv cXQvUXRXZWJQYWdlTG9hZENsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0V2ViUGFnZUxv YWRDbGllbnQ6OmRpZENvbW1pdExvYWQpOgorCisyMDEyLTEwLTA0ICBKb2NlbHluIFR1cmNvdHRl ICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CisKICAgICAgICAgW1F0XSBGaXggYSBRU29j a2V0Tm90aWZpZXIgd2FybmluZyBhdCBzdGFydHVwCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODQxMQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCBhMTBiNjExMjYxZjRiYzdkYzE0 MmE5ZTk1NDQyZDQ2ZjQwODNlMjI3Li5lNzY4YTEwZjYxNmU2Y2VmOGEyZjVlY2NkOTBiMTQ1OTZk ZTQzYTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlldy5jcHAKQEAgLTMzMSwxNCArMzMxLDYgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0 ZTo6bG9hZERpZFN0b3AoKQogICAgIGVtaXQgcS0+bG9hZGluZ0NoYW5nZWQoJmxvYWRSZXF1ZXN0 KTsKIH0KIAotdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6b25Db21wb25lbnRDb21wbGV0ZSgp Ci17Ci0gICAgUV9RKFFRdWlja1dlYlZpZXcpOwotICAgIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxl ckNsaWVudC5yZXNldChuZXcgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0KHEsIHBhZ2VW aWV3LmRhdGEoKSkpOwotICAgIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlci5yZXNldChuZXcgUGFn ZVZpZXdwb3J0Q29udHJvbGxlcih3ZWJQYWdlUHJveHkuZ2V0KCksIG1fcGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudC5kYXRhKCkpKTsKLSAgICBwYWdlVmlldy0+ZXZlbnRIYW5kbGVyKCktPnNl dFZpZXdwb3J0Q29udHJvbGxlcihtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQuZGF0YSgp KTsKLX0KLQogdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6c2V0VHJhbnNwYXJlbnRCYWNrZ3Jv dW5kKGJvb2wgZW5hYmxlKQogewogICAgIHdlYlBhZ2VQcm94eS0+c2V0RHJhd3NUcmFuc3BhcmVu dEJhY2tncm91bmQoZW5hYmxlKTsKQEAgLTg1OSw2ICs4NTEsMTEgQEAgdm9pZCBRUXVpY2tXZWJW aWV3RmxpY2thYmxlUHJpdmF0ZTo6b25Db21wb25lbnRDb21wbGV0ZSgpCiB7CiAgICAgUVF1aWNr V2ViVmlld1ByaXZhdGU6Om9uQ29tcG9uZW50Q29tcGxldGUoKTsKIAorICAgIFFfUShRUXVpY2tX ZWJWaWV3KTsKKyAgICBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQucmVzZXQobmV3IFBh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdChxLCBwYWdlVmlldy5kYXRhKCkpKTsKKyAgICBt X3BhZ2VWaWV3cG9ydENvbnRyb2xsZXIucmVzZXQobmV3IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIo d2ViUGFnZVByb3h5LmdldCgpLCBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQuZGF0YSgp KSk7CisgICAgcGFnZVZpZXctPmV2ZW50SGFuZGxlcigpLT5zZXRWaWV3cG9ydENvbnRyb2xsZXIo bV9wYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50LmRhdGEoKSk7CisKICAgICAvLyBUcmlnZ2Vy IHNldHRpbmcgb2YgY29ycmVjdCB2aXNpYmlsaXR5IGZsYWdzIGFmdGVyIGV2ZXJ5dGhpbmcgd2Fz IGFsbG9jYXRlZCBhbmQgaW5pdGlhbGl6ZWQuCiAgICAgX3Ffb25WaXNpYmxlQ2hhbmdlZCgpOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3X3BfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3 X3BfcC5oCmluZGV4IGIxOGZlOTA0N2M5YmJmNDc1YjVmZDgwMWJiN2NiYThmYzIzMTQxZmMuLjVl OTVhNDU3NmMzZDhmMWEzYmE3Nzc0ODgyMGUxNzQ4MzMyYmYxMTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmgKQEAgLTcwLDcg KzcwLDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIGluaXRpYWxpemUoV0tDb250ZXh0 UmVmIGNvbnRleHRSZWYgPSAwLCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYgPSAwKTsKIAot ICAgIHZpcnR1YWwgdm9pZCBvbkNvbXBvbmVudENvbXBsZXRlKCk7CisgICAgdmlydHVhbCB2b2lk IG9uQ29tcG9uZW50Q29tcGxldGUoKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBwcm92aXNpb25h bExvYWREaWRTdGFydChjb25zdCBXVEY6OlN0cmluZyYgdXJsKTsKICAgICB2aXJ0dWFsIHZvaWQg ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFdURjo6U3Ry aW5nJiB1cmwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0UGFn ZUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRQYWdlQ2xpZW50LmNw cAppbmRleCBiZWE4YTJjODI2OWE2Y2NhYTQ3YzgwNDMyOTBlYWFmYTUzNWExMTdkLi5lZjNkYTM0 ZDgxNmVmNDkxOTllZGJjNGFhNmIzYTNmNTA2YmZkZjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRQYWdlQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUXRQYWdlQ2xpZW50LmNwcApAQCAtNzUsNyArNzUsOSBAQCB2b2lkIFF0UGFn ZUNsaWVudDo6c2V0Vmlld05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0 KQogCiB2b2lkIFF0UGFnZUNsaWVudDo6ZGlkUmVuZGVyRnJhbWUoY29uc3QgV2ViQ29yZTo6SW50 U2l6ZSYgY29udGVudHNTaXplLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBjb3ZlcmVkUmVjdCkK IHsKLSAgICBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6Z2V0KG1fd2ViVmlldyktPnZpZXdwb3J0Q29u dHJvbGxlcigpLT5kaWRSZW5kZXJGcmFtZShjb250ZW50c1NpemUsIGNvdmVyZWRSZWN0KTsKKyAg ICBQYWdlVmlld3BvcnRDb250cm9sbGVyKiBwdmMgPSBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6Z2V0 KG1fd2ViVmlldyktPnZpZXdwb3J0Q29udHJvbGxlcigpOworICAgIGlmIChwdmMpCisgICAgICAg IHB2Yy0+ZGlkUmVuZGVyRnJhbWUoY29udGVudHNTaXplLCBjb3ZlcmVkUmVjdCk7CiB9CiAKIHZv aWQgUXRQYWdlQ2xpZW50OjpwYWdlRGlkUmVxdWVzdFNjcm9sbChjb25zdCBJbnRQb2ludCYgcG9z KQpAQCAtOTUsNyArOTcsOSBAQCB2b2lkIFF0UGFnZUNsaWVudDo6ZGlkUmVsYXVuY2hQcm9jZXNz KCkKIAogdm9pZCBRdFBhZ2VDbGllbnQ6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBJbnRT aXplJiBuZXdTaXplKQogewotICAgIFFRdWlja1dlYlZpZXdQcml2YXRlOjpnZXQobV93ZWJWaWV3 KS0+dmlld3BvcnRDb250cm9sbGVyKCktPmRpZENoYW5nZUNvbnRlbnRzU2l6ZShuZXdTaXplKTsK KyAgICBQYWdlVmlld3BvcnRDb250cm9sbGVyKiBwdmMgPSBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6 Z2V0KG1fd2ViVmlldyktPnZpZXdwb3J0Q29udHJvbGxlcigpOworICAgIGlmIChwdmMpCisgICAg ICAgIHB2Yy0+ZGlkQ2hhbmdlQ29udGVudHNTaXplKG5ld1NpemUpOwogfQogCiB2b2lkIFF0UGFn ZUNsaWVudDo6ZGlkQ2hhbmdlVmlld3BvcnRQcm9wZXJ0aWVzKGNvbnN0IFdlYkNvcmU6OlZpZXdw b3J0QXR0cmlidXRlcyYgYXR0cikKQEAgLTIyNyw3ICsyMzEsOSBAQCB2b2lkIFF0UGFnZUNsaWVu dDo6Zmxhc2hCYWNraW5nU3RvcmVVcGRhdGVzKGNvbnN0IFZlY3RvcjxJbnRSZWN0PiYpCiAKIHZv aWQgUXRQYWdlQ2xpZW50OjpwYWdlVHJhbnNpdGlvblZpZXdwb3J0UmVhZHkoKQogewotICAgIFFR dWlja1dlYlZpZXdQcml2YXRlOjpnZXQobV93ZWJWaWV3KS0+dmlld3BvcnRDb250cm9sbGVyKCkt PnBhZ2VUcmFuc2l0aW9uVmlld3BvcnRSZWFkeSgpOworICAgIFBhZ2VWaWV3cG9ydENvbnRyb2xs ZXIqIHB2YyA9IFFRdWlja1dlYlZpZXdQcml2YXRlOjpnZXQobV93ZWJWaWV3KS0+dmlld3BvcnRD b250cm9sbGVyKCk7CisgICAgaWYgKHB2YykKKyAgICAgICAgcHZjLT5wYWdlVHJhbnNpdGlvblZp ZXdwb3J0UmVhZHkoKTsKIH0KIAogdm9pZCBRdFBhZ2VDbGllbnQ6OmRpZEZpbmRab29tYWJsZUFy ZWEoY29uc3QgSW50UG9pbnQmIHRhcmdldCwgY29uc3QgSW50UmVjdCYgYXJlYSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VMb2FkQ2xpZW50LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VMb2FkQ2xpZW50LmNwcAppbmRl eCBkMTExYWQxN2MyNTAwYjIzOThlZGMzZWIwYmQ3MWExN2EwZjNhNDJiLi5iODc3Y2E4ZGY3NTgx ZGM5NWUwODgzZjgyNDY5OGE4MjM5ZTIxZjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUXRXZWJQYWdlTG9hZENsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0V2ViUGFnZUxvYWRDbGllbnQuY3BwCkBAIC02Miw3ICs2Miw5IEBAIHZv aWQgUXRXZWJQYWdlTG9hZENsaWVudDo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlz aW9uYWxMb2FkKGNvbnN0IFdURjo6CiAKIHZvaWQgUXRXZWJQYWdlTG9hZENsaWVudDo6ZGlkQ29t bWl0TG9hZCgpCiB7Ci0gICAgbV93ZWJWaWV3LT5kX2Z1bmMoKS0+dmlld3BvcnRDb250cm9sbGVy KCktPmRpZENvbW1pdExvYWQoKTsKKyAgICBQYWdlVmlld3BvcnRDb250cm9sbGVyKiBwdmMgPSBt X3dlYlZpZXctPmRfZnVuYygpLT52aWV3cG9ydENvbnRyb2xsZXIoKTsKKyAgICBpZiAocHZjKQor ICAgICAgICBwdmMtPmRpZENvbW1pdExvYWQoKTsKICAgICBtX3dlYlZpZXctPmRfZnVuYygpLT5s b2FkRGlkQ29tbWl0KCk7CiB9CiAK