103291 2012-11-26 13:55:58 -0800 PDFPlugin: Page scale factor should affect subframe PDFs 2012-11-27 14:46:48 -0800 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca ap mitz sam oldest_to_newest 775855 0 thorton 2012-11-26 13:55:58 -0800 For subframe PDFs, hand PDFKit the pageScaleFactor for the parent page so it can scale its drawing appropriately. <rdar://problem/12555249> 775924 1 176078 thorton 2012-11-26 14:46:59 -0800 Created attachment 176078 patch 776897 2 176078 darin 2012-11-27 09:56:15 -0800 Comment on attachment 176078 patch View in context: https://bugs.webkit.org/attachment.cgi?id=176078&action=review > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:323 > + float newScaleFactor = controller()->contentsScaleFactor(); Is float the correct type here? 777184 3 thorton 2012-11-27 13:49:13 -0800 (In reply to comment #2) > (From update of attachment 176078 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=176078&action=review > > > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:323 > > + float newScaleFactor = controller()->contentsScaleFactor(); > > Is float the correct type here? Nope. Thanks, Darin! 777241 4 thorton 2012-11-27 14:46:48 -0800 http://trac.webkit.org/changeset/135925 176078 2012-11-26 14:46:59 -0800 2012-11-27 09:56:14 -0800 patch 0010-PDFPlugin-Page-scale-factor-should-affect-subframe-P.patch text/plain 5569 thorton RnJvbSBhNDVhZmFlZjk3Njc1MWYxZmVkODQ2MTJjZTZkMTQwYThhYWNiMmJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW0gSG9ydG9uIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+ CkRhdGU6IFN1biwgMjUgTm92IDIwMTIgMTU6MjY6MzIgLTA4MDAKU3ViamVjdDogW1BBVENIIDEw LzExXSBQREZQbHVnaW46IFBhZ2Ugc2NhbGUgZmFjdG9yIHNob3VsZCBhZmZlY3Qgc3ViZnJhbWUK IFBERnMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzI5MQogPHJk YXI6Ly9wcm9ibGVtLzEyNTU1MjQ5PgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpGb3Ig c3ViZnJhbWUgUERGcywgaGFuZCBQREZLaXQgdGhlIHBhZ2VTY2FsZUZhY3RvciBmb3IgdGhlIHBh cmVudCBwYWdlCnNvIGl0IGNhbiBzY2FsZSBpdHMgZHJhd2luZyBhcHByb3ByaWF0ZWx5LgoKKiBX ZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oOiBBZGQgdXBkYXRlUGFnZUFuZERldmlj ZVNjYWxlRmFjdG9ycy4KKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbToKKFdl YktpdDo6UERGUGx1Z2luOjpwZGZEb2N1bWVudERpZExvYWQpOiBDYWxsIHVwZGF0ZVBhZ2VBbmRE ZXZpY2VTY2FsZUZhY3RvcnMKaW5zdGVhZCBvZiBtYW51YWxseSB1cGRhdGluZyBQREZMYXllckNv bnRyb2xsZXIncyBkZXZpY2Ugc2NhbGUgZmFjdG9yLgooV2ViS2l0OjpQREZQbHVnaW46OnVwZGF0 ZVBhZ2VBbmREZXZpY2VTY2FsZUZhY3RvcnMpOiBIYW5kIFBERkxheWVyQ29udHJvbGxlcgp0aGUg InVuZGVybHlpbmciIChub24tem9vbSkgY29udGVudCBzY2FsZSwgd2hpY2ggaXMgdGhlIHByb2R1 Y3Qgb2YgdGhlCmRldmljZSBzY2FsZSBhbmQgdGhlIHBhZ2Ugc2NhbGUuCihXZWJLaXQ6OlBERlBs dWdpbjo6Y29udGVudHNTY2FsZUZhY3RvckNoYW5nZWQpOiBVc2UgdXBkYXRlUGFnZUFuZERldmlj ZVNjYWxlRmFjdG9ycy4KKFdlYktpdDo6UERGUGx1Z2luOjpnZW9tZXRyeURpZENoYW5nZSk6IFVz ZSB1cGRhdGVQYWdlQW5kRGV2aWNlU2NhbGVGYWN0b3JzIHRvIGtlZXAKUERGTGF5ZXJDb250cm9s bGVyJ3Mgbm90aW9uIG9mIHRoZSBwYWdlIHNjYWxlIHVwIHRvIGRhdGUgd2hlbiB0aGUgcGx1Z2lu J3MKZ2VvbWV0cnkgY2hhbmdlcy4KLS0tCiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgICAgICAg ICAgICAgICAgICAgICAgICAgICB8ICAgMjMgKysrKysrKysrKysrKysrKysrKysKIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLmggIHwgICAgMiArKwogU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0gfCAgIDE5ICsr KysrKysrKysrKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgNDEgaW5zZXJ0aW9ucygrKSwgMyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGJiZTY0My4uZDViY2ExMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAt MSw1ICsxLDI4IEBACiAyMDEyLTExLTI1ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBw bGUuY29tPgogCisgICAgICAgIFBERlBsdWdpbjogUGFnZSBzY2FsZSBmYWN0b3Igc2hvdWxkIGFm ZmVjdCBzdWJmcmFtZSBQREZzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDMyOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEyNTU1MjQ5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvciBzdWJmcmFt ZSBQREZzLCBoYW5kIFBERktpdCB0aGUgcGFnZVNjYWxlRmFjdG9yIGZvciB0aGUgcGFyZW50IHBh Z2UKKyAgICAgICAgc28gaXQgY2FuIHNjYWxlIGl0cyBkcmF3aW5nIGFwcHJvcHJpYXRlbHkuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oOiBBZGQgdXBkYXRl UGFnZUFuZERldmljZVNjYWxlRmFjdG9ycy4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMv UERGL1BERlBsdWdpbi5tbToKKyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luOjpwZGZEb2N1bWVu dERpZExvYWQpOiBDYWxsIHVwZGF0ZVBhZ2VBbmREZXZpY2VTY2FsZUZhY3RvcnMKKyAgICAgICAg aW5zdGVhZCBvZiBtYW51YWxseSB1cGRhdGluZyBQREZMYXllckNvbnRyb2xsZXIncyBkZXZpY2Ug c2NhbGUgZmFjdG9yLgorICAgICAgICAoV2ViS2l0OjpQREZQbHVnaW46OnVwZGF0ZVBhZ2VBbmRE ZXZpY2VTY2FsZUZhY3RvcnMpOiBIYW5kIFBERkxheWVyQ29udHJvbGxlcgorICAgICAgICB0aGUg InVuZGVybHlpbmciIChub24tem9vbSkgY29udGVudCBzY2FsZSwgd2hpY2ggaXMgdGhlIHByb2R1 Y3Qgb2YgdGhlCisgICAgICAgIGRldmljZSBzY2FsZSBhbmQgdGhlIHBhZ2Ugc2NhbGUuCisgICAg ICAgIChXZWJLaXQ6OlBERlBsdWdpbjo6Y29udGVudHNTY2FsZUZhY3RvckNoYW5nZWQpOiBVc2Ug dXBkYXRlUGFnZUFuZERldmljZVNjYWxlRmFjdG9ycy4KKyAgICAgICAgKFdlYktpdDo6UERGUGx1 Z2luOjpnZW9tZXRyeURpZENoYW5nZSk6IFVzZSB1cGRhdGVQYWdlQW5kRGV2aWNlU2NhbGVGYWN0 b3JzIHRvIGtlZXAKKyAgICAgICAgUERGTGF5ZXJDb250cm9sbGVyJ3Mgbm90aW9uIG9mIHRoZSBw YWdlIHNjYWxlIHVwIHRvIGRhdGUgd2hlbiB0aGUgcGx1Z2luJ3MKKyAgICAgICAgZ2VvbWV0cnkg Y2hhbmdlcy4KKworMjAxMi0xMS0yNSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxl LmNvbT4KKwogICAgICAgICBFbnN1cmUgdGhhdCBXZWJQYWdlUHJveHkncyBub3Rpb24gb2YgcGFn ZVNjYWxlRmFjdG9yIGlzIHJlc2V0IG9uIGRpZENvbW1pdExvYWQKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzI5MAogICAgICAgICA8cmRhcjovL3By b2JsZW0vMTI3NTI0Njc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUERGL1BERlBsdWdpbi5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L1BERi9QREZQbHVnaW4uaAppbmRleCBkOTRjM2E5Li41ZTM2ZTVhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLmgKQEAgLTEwOSw2ICsx MDksOCBAQCBwcml2YXRlOgogCiAgICAgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSBwZGZEb2N1bWVu dERhdGFSZWZlcmVuY2UoKTsKIAorICAgIHZvaWQgdXBkYXRlUGFnZUFuZERldmljZVNjYWxlRmFj dG9ycygpOworCiAgICAgUmV0YWluUHRyPENBTGF5ZXI+IG1fY29udGFpbmVyTGF5ZXI7CiAgICAg UmV0YWluUHRyPENBTGF5ZXI+IG1fY29udGVudExheWVyOwogICAgIFJldGFpblB0cjxDQUxheWVy PiBtX2hvcml6b250YWxTY3JvbGxiYXJMYXllcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KaW5kZXggZDY0YzUzZS4uZDlmNGZjZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVn aW4ubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVn aW4ubW0KQEAgLTMwNSw3ICszMDUsNyBAQCB2b2lkIFBERlBsdWdpbjo6cGRmRG9jdW1lbnREaWRM b2FkKCkKICAgICBbbV9wZGZMYXllckNvbnRyb2xsZXIuZ2V0KCkgc2V0RnJhbWVTaXplOnNpemUo KV07CiAgICAgbV9wZGZMYXllckNvbnRyb2xsZXIuZ2V0KCkuZG9jdW1lbnQgPSBkb2N1bWVudC5n ZXQoKTsKIAotICAgIFttX3BkZkxheWVyQ29udHJvbGxlci5nZXQoKSBzZXREZXZpY2VTY2FsZUZh Y3Rvcjpjb250cm9sbGVyKCktPmNvbnRlbnRzU2NhbGVGYWN0b3IoKV07CisgICAgdXBkYXRlUGFn ZUFuZERldmljZVNjYWxlRmFjdG9ycygpOwogICAgIAogICAgIGlmIChoYW5kbGVzUGFnZVNjYWxl RmFjdG9yKCkpCiAgICAgICAgIHBsdWdpblZpZXcoKS0+c2V0UGFnZVNjYWxlRmFjdG9yKFttX3Bk ZkxheWVyQ29udHJvbGxlci5nZXQoKSBjb250ZW50U2NhbGVGYWN0b3JdLCBJbnRQb2ludCgpKTsK QEAgLTMxOCw5ICszMTgsMTggQEAgdm9pZCBQREZQbHVnaW46OnBkZkRvY3VtZW50RGlkTG9hZCgp CiAgICAgcnVuU2NyaXB0c0luUERGRG9jdW1lbnQoKTsKIH0KIAotdm9pZCBQREZQbHVnaW46OmNv bnRlbnRzU2NhbGVGYWN0b3JDaGFuZ2VkKGZsb2F0IGNvbnRlbnRzU2NhbGVGYWN0b3IpCit2b2lk IFBERlBsdWdpbjo6dXBkYXRlUGFnZUFuZERldmljZVNjYWxlRmFjdG9ycygpCiB7Ci0gICAgW21f cGRmTGF5ZXJDb250cm9sbGVyLmdldCgpIHNldERldmljZVNjYWxlRmFjdG9yOmNvbnRlbnRzU2Nh bGVGYWN0b3JdOworICAgIGZsb2F0IG5ld1NjYWxlRmFjdG9yID0gY29udHJvbGxlcigpLT5jb250 ZW50c1NjYWxlRmFjdG9yKCk7CisgICAgaWYgKCFoYW5kbGVzUGFnZVNjYWxlRmFjdG9yKCkpCisg ICAgICAgIG5ld1NjYWxlRmFjdG9yICo9IHdlYkZyYW1lKCktPnBhZ2UoKS0+cGFnZVNjYWxlRmFj dG9yKCk7CisKKyAgICBbbV9wZGZMYXllckNvbnRyb2xsZXIuZ2V0KCkgc2V0RGV2aWNlU2NhbGVG YWN0b3I6bmV3U2NhbGVGYWN0b3JdOworfQorCit2b2lkIFBERlBsdWdpbjo6Y29udGVudHNTY2Fs ZUZhY3RvckNoYW5nZWQoZmxvYXQpCit7CisgICAgdXBkYXRlUGFnZUFuZERldmljZVNjYWxlRmFj dG9ycygpOwogfQogCiB2b2lkIFBERlBsdWdpbjo6Y2FsY3VsYXRlU2l6ZXMoKQpAQCAtNDI3LDYg KzQzNiwxMCBAQCB2b2lkIFBERlBsdWdpbjo6Z2VvbWV0cnlEaWRDaGFuZ2UoY29uc3QgSW50U2l6 ZSYgcGx1Z2luU2l6ZSwgY29uc3QgSW50UmVjdCYsIGNvbgogICAgICAgICAvLyBGSVhNRTogSW5z dGVhZCBvZiBtX2xhc3RNb3VzZVBvaW50LCB3ZSBzaG91bGQgdXNlIHRoZSB6b29tIG9yaWdpbiBm cm9tIFBsdWdpblZpZXc6OnNldFBhZ2VTY2FsZUZhY3Rvci4KICAgICAgICAgaWYgKG1hZ25pZmlj YXRpb24pCiAgICAgICAgICAgICBbbV9wZGZMYXllckNvbnRyb2xsZXIuZ2V0KCkgbWFnbmlmeVdp dGhNYWduaWZpY2F0aW9uOm1hZ25pZmljYXRpb24gYXRQb2ludDptX2xhc3RNb3VzZVBvaW50IGlt bWVkaWF0ZWx5Ok5PXTsKKyAgICB9IGVsc2UgeworICAgICAgICAvLyBJZiB3ZSBkb24ndCBoYW5k bGUgcGFnZSBzY2FsZSBvdXJzZWx2ZXMsIHdlIG5lZWQgdG8gcmVzcGVjdCBvdXIgcGFyZW50IHBh Z2UncworICAgICAgICAvLyBzY2FsZSwgd2hpY2ggbWF5IGhhdmUgY2hhbmdlZC4KKyAgICAgICAg dXBkYXRlUGFnZUFuZERldmljZVNjYWxlRmFjdG9ycygpOwogICAgIH0KIAogICAgIGNhbGN1bGF0 ZVNpemVzKCk7Ci0tIAoxLjcuOS42IChBcHBsZSBHaXQtMzEuMSkKCg==