69874 2011-10-11 15:27:10 -0700 WebKit2 snapshot APIs should take the device scale factor into account 2011-10-11 16:04:51 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified OS X 10.7 RESOLVED FIXED P2 Normal --- 1 bdakin bdakin bdakin oldest_to_newest 481960 0 bdakin 2011-10-11 15:27:10 -0700 WebKit2 snapshot APIs should take the device scale factor into account to create snapshots at the appropriate resolution. 481970 1 110591 bdakin 2011-10-11 15:42:14 -0700 Created attachment 110591 Patch 481977 2 110591 darin 2011-10-11 15:45:31 -0700 Comment on attachment 110591 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110591&action=review > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:945 > + float deviceScaleFactor = corePage()->deviceScaleFactor(); Given that the code below repeatedly multiplies this by the scale factor and never uses the device scale factor alone, I’d suggest instead: float combinedScaleFactor = scaleFactor * corePage()->deviceScaleFactor(); 481996 3 bdakin 2011-10-11 16:04:51 -0700 (In reply to comment #2) > (From update of attachment 110591 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=110591&action=review > > > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:945 > > + float deviceScaleFactor = corePage()->deviceScaleFactor(); > > Given that the code below repeatedly multiplies this by the scale factor and never uses the device scale factor alone, I’d suggest instead: > > float combinedScaleFactor = scaleFactor * corePage()->deviceScaleFactor(); Fixed! Thanks! Change committed with revision 97191. 110591 2011-10-11 15:42:14 -0700 2011-10-11 15:45:30 -0700 Patch for-review.txt text/plain 2900 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3MTg3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTEgIEJldGggRGFr aW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02OTg3NAorICAgICAgICBXZWJLaXQyIHNuYXBzaG90IEFQSXMgc2hv dWxkIHRha2UgdGhlIGRldmljZSBzY2FsZSBmYWN0b3IgaW50byBhY2NvdW50IAorICAgICAgICAt YW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDI2OTExMj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGhlIGRl dmljZVNjYWxlRmFjdG9yIGFzIGEgc2NhbGUgb24gdGhlIHNuYXBzaG90J3MgY29udGV4dCB0byBj cmVhdGUgYSAKKyAgICAgICAgc25hcHNob3Qgb2YgdGhlIGFwcHJvcHJpYXRlIHJlc29sdXRpb24u IFRoaXMgbWF0Y2hlcyB0aGUgbWFubmVyIGluIHdoaWNoIHdlIHNjYWxlIAorICAgICAgICB0aGUg Y29udGV4dCBpbiBEcmF3aW5nQXJlYUltcGw6OmRpc3BsYXkoKS4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNuYXBz aG90SW5WaWV3Q29vcmRpbmF0ZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzY2FsZWRT bmFwc2hvdEluRG9jdW1lbnRDb29yZGluYXRlcyk6CisKIDIwMTEtMTAtMTEgIEFsZXhleSBQcm9z a3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10gU21hbGwgZW1iZWRkZWQg UERGcyBhcmUgbm90IGZ1bGx5IHJlcGFpbnRlZCB3aGVuIHNjcm9sbGluZwpJbmRleDogU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gOTcw NzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTkxNCwxMSArOTE0LDE2IEBAIFBhc3NSZWZQdHI8V2ViSW1hZ2U+IFdl YlBhZ2U6OnNuYXBzaG90SW4KICAgICBpZiAoIWZyYW1lVmlldykKICAgICAgICAgcmV0dXJuIDA7 CiAKLSAgICBSZWZQdHI8V2ViSW1hZ2U+IHNuYXBzaG90ID0gV2ViSW1hZ2U6OmNyZWF0ZShyZWN0 LnNpemUoKSwgb3B0aW9ucyk7CisgICAgSW50U2l6ZSBiaXRtYXBTaXplID0gcmVjdC5zaXplKCk7 CisgICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IgPSBjb3JlUGFnZSgpLT5kZXZpY2VTY2FsZUZh Y3RvcigpOworICAgIGJpdG1hcFNpemUuc2NhbGUoZGV2aWNlU2NhbGVGYWN0b3IpOworCisgICAg UmVmUHRyPFdlYkltYWdlPiBzbmFwc2hvdCA9IFdlYkltYWdlOjpjcmVhdGUoYml0bWFwU2l6ZSwg b3B0aW9ucyk7CiAgICAgaWYgKCFzbmFwc2hvdC0+Yml0bWFwKCkpCiAgICAgICAgIHJldHVybiAw OwogICAgIAogICAgIE93blB0cjxXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ+IGdyYXBoaWNzQ29u dGV4dCA9IHNuYXBzaG90LT5iaXRtYXAoKS0+Y3JlYXRlR3JhcGhpY3NDb250ZXh0KCk7CisgICAg Z3JhcGhpY3NDb250ZXh0LT5zY2FsZShGbG9hdFNpemUoZGV2aWNlU2NhbGVGYWN0b3IsIGRldmlj ZVNjYWxlRmFjdG9yKSk7CiAgICAgZ3JhcGhpY3NDb250ZXh0LT50cmFuc2xhdGUoLXJlY3QueCgp LCAtcmVjdC55KCkpOwogCiAgICAgZnJhbWVWaWV3LT51cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVl ZGVkUmVjdXJzaXZlKCk7CkBAIC05MzcsMTMgKzk0MiwxNCBAQCBQYXNzUmVmUHRyPFdlYkltYWdl PiBXZWJQYWdlOjpzY2FsZWRTbmFwCiAgICAgaWYgKCFmcmFtZVZpZXcpCiAgICAgICAgIHJldHVy biAwOwogCi0gICAgSW50U2l6ZSBzaXplKGNlaWwocmVjdC53aWR0aCgpICogc2NhbGVGYWN0b3Ip LCBjZWlsKHJlY3QuaGVpZ2h0KCkgKiBzY2FsZUZhY3RvcikpOworICAgIGZsb2F0IGRldmljZVNj YWxlRmFjdG9yID0gY29yZVBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKKyAgICBJbnRTaXpl IHNpemUoY2VpbChyZWN0LndpZHRoKCkgKiBzY2FsZUZhY3RvciAqIGRldmljZVNjYWxlRmFjdG9y KSwgY2VpbChyZWN0LmhlaWdodCgpICogc2NhbGVGYWN0b3IgKiBkZXZpY2VTY2FsZUZhY3Rvcikp OwogICAgIFJlZlB0cjxXZWJJbWFnZT4gc25hcHNob3QgPSBXZWJJbWFnZTo6Y3JlYXRlKHNpemUs IG9wdGlvbnMpOwogICAgIGlmICghc25hcHNob3QtPmJpdG1hcCgpKQogICAgICAgICByZXR1cm4g MDsKIAogICAgIE93blB0cjxXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ+IGdyYXBoaWNzQ29udGV4 dCA9IHNuYXBzaG90LT5iaXRtYXAoKS0+Y3JlYXRlR3JhcGhpY3NDb250ZXh0KCk7Ci0gICAgZ3Jh cGhpY3NDb250ZXh0LT5zY2FsZShGbG9hdFNpemUoc2NhbGVGYWN0b3IsIHNjYWxlRmFjdG9yKSk7 CisgICAgZ3JhcGhpY3NDb250ZXh0LT5zY2FsZShGbG9hdFNpemUoc2NhbGVGYWN0b3IgKiBkZXZp Y2VTY2FsZUZhY3Rvciwgc2NhbGVGYWN0b3IgKiBkZXZpY2VTY2FsZUZhY3RvcikpOwogICAgIGdy YXBoaWNzQ29udGV4dC0+dHJhbnNsYXRlKC1yZWN0LngoKSwgLXJlY3QueSgpKTsKIAogICAgIGZy YW1lVmlldy0+dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5lZWRlZFJlY3Vyc2l2ZSgpOwo=