53058 2011-01-24 18:23:51 -0800 Reset the page scale factor on standard frame loads 2011-01-24 18:38:18 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 339432 0 andersca 2011-01-24 18:23:51 -0800 Reset the page scale factor on standard frame loads 339433 1 80005 andersca 2011-01-24 18:26:19 -0800 Created attachment 80005 Patch 339435 2 80005 mitz 2011-01-24 18:30:03 -0800 Comment on attachment 80005 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=80005&action=review > Source/WebKit2/UIProcess/WebPageProxy.h:263 > + void viewScaleFactorDidChange(double scaleFactor); Can omit “scaleFactor” > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:438 > + newPageScaleFactor = 1.0; Should omit “.0”. Also, no need to fetch the value if the above condition holds, only to have it overwritten by 1. 339439 3 andersca 2011-01-24 18:38:18 -0800 Committed r76561: <http://trac.webkit.org/changeset/76561> 80005 2011-01-24 18:26:19 -0800 2011-01-24 18:30:03 -0800 Patch bug-53058-20110124182618.patch text/plain 5917 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2NTYwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDEtMjQgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZXNldCB0aGUgcGFnZSBzY2FsZSBmYWN0b3Igb24gc3Rh bmRhcmQgZnJhbWUgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUzMDU4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84OTA4ODQ0PgorCisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6c2NhbGVXZWJWaWV3KToKKyAgICAgICAgRG9uJ3Qgc2V0IG1fdmlld1NjYWxlRmFj dG9yIGhlcmUuIEl0IHdpbGwgYmUgc2V0IGluIHZpZXdTY2FsZUZhY3RvckRpZENoYW5nZS4KKwor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnZpZXdTY2FsZUZhY3RvckRpZENoYW5nZSk6 CisgICAgICAgIFVwZGF0ZSBtX3ZpZXdTY2FsZUZhY3Rvci4KKworICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgQWRkIHZpZXdTY2FsZUZhY3RvckRpZENoYW5nZS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46CisgICAgICAg IEFkZCBWaWV3U2NhbGVGYWN0b3JEaWRDaGFuZ2UgbWVzc2FnZS4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAg ICAgICAgU2V0IHRoZSBzY2FsZSBmYWN0b3IuCisKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVM b2FkZXJDbGllbnQ6OnJlc3RvcmVWaWV3U3RhdGUpOgorICAgICAgICBJbmZvcm0gdGhlIFVJIHBy b2Nlc3MgYWJvdXQgdGhlIG5ldyB2aWV3IHNjYWxlIGZhY3Rvci4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2Nh bGVXZWJWaWV3KToKKyAgICAgICAgU2VuZCBhIFZpZXdTY2FsZUZhY3RvckRpZENoYW5nZSBtZXNz YWdlLgorCiAyMDExLTAxLTI0ICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDc2NTUwKQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg5 MCw3ICs4OTAsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2NhbGVXZWJWaWV3KGRvdWJsZSBzCiAg ICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fdmlld1NjYWxlRmFj dG9yID0gc2NhbGU7CiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTY2Fs ZVdlYlZpZXcoc2NhbGUsIG9yaWdpbiksIG1fcGFnZUlEKTsKIH0KIApAQCAtOTIwLDYgKzkxOSwx MSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0Rml4ZWRMYXlvdXRTaXplKGNvCiAgICAgcHJvY2Vz cygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRGaXhlZExheW91dFNpemUoc2l6ZSksIG1f cGFnZUlEKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OnZpZXdTY2FsZUZhY3RvckRpZENoYW5n ZShkb3VibGUgc2NhbGVGYWN0b3IpCit7CisgICAgbV92aWV3U2NhbGVGYWN0b3IgPSBzY2FsZUZh Y3RvcjsKK30KKwogdm9pZCBXZWJQYWdlUHJveHk6OmZpbmRTdHJpbmcoY29uc3QgU3RyaW5nJiBz dHJpbmcsIEZpbmRPcHRpb25zIG9wdGlvbnMsIHVuc2lnbmVkIG1heE1hdGNoQ291bnQpCiB7CiAg ICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpGaW5kU3RyaW5nKHN0cmluZywg b3B0aW9ucywgbWF4TWF0Y2hDb3VudCksIG1fcGFnZUlEKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDc2NTUwKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNjAsNiArMjYw LDggQEAgcHVibGljOgogICAgIHZvaWQgc2VuZEFjY2Vzc2liaWxpdHlQcmVzZW50ZXJUb2tlbihj b25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJik7CiAjZW5kaWYKIAorICAgIHZvaWQgdmlld1Nj YWxlRmFjdG9yRGlkQ2hhbmdlKGRvdWJsZSBzY2FsZUZhY3Rvcik7CisKICAgICAvLyBGaW5kLgog ICAgIHZvaWQgZmluZFN0cmluZyhjb25zdCBTdHJpbmcmLCBGaW5kT3B0aW9ucywgdW5zaWduZWQg bWF4TWF0Y2hDb3VudCk7CiAgICAgdm9pZCBoaWRlRmluZFVJKCk7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9u IDc2NTUwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl cy5pbgkod29ya2luZyBjb3B5KQpAQCAtMTE5LDYgKzExOSw4IEBAIG1lc3NhZ2VzIC0+IFdlYlBh Z2VQcm94eSB7CiAKICAgICBEaWRSZWNlaXZlQWNjZXNzaWJpbGl0eVBhZ2VUb2tlbihDb3JlSVBD OjpEYXRhUmVmZXJlbmNlIGRhdGEpCiAKKyAgICBWaWV3U2NhbGVGYWN0b3JEaWRDaGFuZ2UoZG91 YmxlIHNjYWxlRmFjdG9yKQorCiAjaWYgUExBVEZPUk0oTUFDKQogICAgICMgS2V5Ym9hcmQgc3Vw cG9ydCBtZXNzYWdlcwogICAgIEludGVycHJldEtleUV2ZW50KHVpbnQzMl90IHR5cGUpIC0+IChW ZWN0b3I8V2ViQ29yZTo6S2V5cHJlc3NDb21tYW5kPiBjb21tYW5kTmFtZSwgdWludDMyX3Qgc2Vs ZWN0aW9uU3RhcnQsIHVpbnQzMl90IHNlbGVjdGlvbkVuZCwgVmVjdG9yPFdlYkNvcmU6OkNvbXBv c2l0aW9uVW5kZXJsaW5lPiB1bmRlcmxpbmVzKQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5jcHAJKHJldmlzaW9uIDc2NTUwKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTU3LDYgKzU3LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lVmlldy5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvSFRNTEFwcGxldEVsZW1lbnQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0hUTUxG b3JtRWxlbWVudC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvSGlzdG9yeUl0ZW0uaD4KICNpbmNsdWRl IDxXZWJDb3JlL01JTUVUeXBlUmVnaXN0cnkuaD4KICNpbmNsdWRlIDxXZWJDb3JlL01vdXNlRXZl bnQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2UuaD4KQEAgLTQyNiw3ICs0MjcsMTcgQEAgdm9p ZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDbwogICAgIHdlYlBhZ2UtPnNhbmRi b3hFeHRlbnNpb25UcmFja2VyKCkuZGlkQ29tbWl0UHJvdmlzaW9uYWxMb2FkKG1fZnJhbWUpOwog CiAgICAgLy8gTm90aWZ5IHRoZSBVSVByb2Nlc3MuCisKICAgICB3ZWJQYWdlLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZShtX2ZyYW1lLT5mcmFtZUlE KCksIHJlc3BvbnNlLm1pbWVUeXBlKCksIG1fZnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlvbiwg UGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8ocmVzcG9uc2UpLCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNz YWdlRW5jb2Rlcih1c2VyRGF0YS5nZXQoKSkpKTsKKworICAgIC8vIFJlc3RvcmUgdGhlIHBhZ2Ug c2NhbGUgZmFjdG9yLgorICAgIGRvdWJsZSBuZXdQYWdlU2NhbGVGYWN0b3IgPSBtX2ZyYW1lLT5j b3JlRnJhbWUoKS0+cGFnZVNjYWxlRmFjdG9yKCk7CisgICAgCisgICAgLy8gT25seSByZXN0b3Jl IHRoZSBzY2FsZSBmYWN0b3IgZm9yIHN0YW5kYXJkIGZyYW1lIGxvYWRzIChvZiB0aGUgbWFpbiBm cmFtZSkuCisgICAgaWYgKG1fZnJhbWUtPmlzTWFpbkZyYW1lKCkgJiYgbV9mcmFtZS0+Y29yZUZy YW1lKCktPmxvYWRlcigpLT5sb2FkVHlwZSgpID09IEZyYW1lTG9hZFR5cGVTdGFuZGFyZCkKKyAg ICAgICAgbmV3UGFnZVNjYWxlRmFjdG9yID0gMS4wOworCisgICAgd2ViUGFnZS0+c2NhbGVXZWJW aWV3KG5ld1BhZ2VTY2FsZUZhY3RvciwgSW50UG9pbnQoKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVM b2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZChjb25zdCBSZXNvdXJj ZUVycm9yJiBlcnJvcikKQEAgLTEwMDMsNyArMTAxNCw5IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJD bGllbnQ6OnNhdmVWaWV3U3RhdGUKIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6cmVzdG9y ZVZpZXdTdGF0ZSgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAvLyBJbmZvcm0gdGhl IFVJIHByb2Nlc3Mgb2YgdGhlIHNjYWxlIGZhY3Rvci4KKyAgICBkb3VibGUgc2NhbGVGYWN0b3Ig PSBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPmhpc3RvcnkoKS0+Y3VycmVudEl0ZW0o KS0+cGFnZVNjYWxlRmFjdG9yKCk7CisgICAgbV9mcmFtZS0+cGFnZSgpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OlZpZXdTY2FsZUZhY3RvckRpZENoYW5nZShzY2FsZUZhY3RvcikpOwog fQogCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojpwcm92aXNpb25hbExvYWRTdGFydGVkKCkK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJ KHJldmlzaW9uIDc2NTUwKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MTQsNiArNjE0LDggQEAgdm9pZCBXZWJQYWdl OjpzY2FsZVdlYlZpZXcoZG91YmxlIHNjYWxlLAogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJl dHVybjsKICAgICBmcmFtZS0+c2NhbGVQYWdlKHNjYWxlLCBvcmlnaW4pOworCisgICAgc2VuZChN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpWaWV3U2NhbGVGYWN0b3JEaWRDaGFuZ2Uoc2NhbGUpKTsK IH0KIAogZG91YmxlIFdlYlBhZ2U6OnZpZXdTY2FsZUZhY3RvcigpIGNvbnN0Cg==