103286 2012-11-26 13:34:19 -0800 PDFPlugin: <embed> and <object> PDFs affect their parent frame's page scale 2012-12-03 11:18:37 -0800 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 103287 1 thorton thorton andersca ap mitz sam webkit-bug-importer oldest_to_newest 775827 0 thorton 2012-11-26 13:34:19 -0800 Detecting whether or not a PDFPlugin is a full-page plugin or not is not as simple as checking isMainFrame(), because <embed> and <object> will cause PDFPlugin to live in the main frame, while still not being full-page. We also have to check that the main frame's document is a PluginDocument, and whether that PluginDocument's PluginWidget is our PDFPlugin's PluginView. 775837 1 thorton 2012-11-26 13:40:44 -0800 <rdar://problem/12752315> 775948 2 176083 thorton 2012-11-26 15:10:06 -0800 Created attachment 176083 patch 780859 3 thorton 2012-12-01 23:52:56 -0800 Thanks, Dan! http://trac.webkit.org/changeset/136316 781556 4 176083 darin 2012-12-03 09:51:26 -0800 Comment on attachment 176083 patch View in context: https://bugs.webkit.org/attachment.cgi?id=176083&action=review > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:664 > + Document* document = webFrame()->coreFrame()->document(); > + if (document->isPluginDocument()) > + return (static_cast<PluginDocument*>(document)->pluginWidget() == pluginView()); > + > + return false; Normally we do early return for the failure cases, not the main case, so it would be: if (!isPluginDocument) return false; return ......; Also, the patch has extra parentheses in the return statement that we don’t do. But I think this reads better with &&: return document->isPluginDocument() && static_cast<PluginDocument*>(document)->pluginWidget() == pluginView(); 781675 5 177290 thorton 2012-12-03 11:11:42 -0800 Created attachment 177290 followup style patch Oooh, yes, much better. Posting a follow-up patch. 781683 6 thorton 2012-12-03 11:18:37 -0800 Followup style patch is http://trac.webkit.org/changeset/136422 176083 2012-11-26 15:10:06 -0800 2012-12-03 09:51:26 -0800 patch full-frame.diff text/plain 3655 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyMDBhZjlmLi5iOTYwMjQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjgg QEAKIDIwMTItMTEtMjEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgUERGUGx1Z2luOiA8ZW1iZWQ+IGFuZCA8b2JqZWN0PiBQREZzIGFmZmVjdCB0aGVp ciBwYXJlbnQgZnJhbWUncyBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDMyODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEyNzUy MzE1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERl dGVjdGluZyB3aGV0aGVyIG9yIG5vdCBhIFBERlBsdWdpbiBpcyBhIGZ1bGwtcGFnZSBwbHVnaW4g b3Igbm90IGlzIG5vdAorICAgICAgICBhcyBzaW1wbGUgYXMgY2hlY2tpbmcgaXNNYWluRnJhbWUo KSwgYmVjYXVzZSA8ZW1iZWQ+IGFuZCA8b2JqZWN0PiB3aWxsCisgICAgICAgIGNhdXNlIFBERlBs dWdpbiB0byBsaXZlIGluIHRoZSBtYWluIGZyYW1lLCB3aGlsZSBzdGlsbCBub3QgYmVpbmcgZnVs bC1wYWdlLgorICAgICAgICBXZSBhbHNvIGhhdmUgdG8gY2hlY2sgdGhhdCB0aGUgbWFpbiBmcmFt ZSdzIGRvY3VtZW50IGlzIGEgUGx1Z2luRG9jdW1lbnQsCisgICAgICAgIGFuZCB3aGV0aGVyIHRo YXQgUGx1Z2luRG9jdW1lbnQncyBQbHVnaW5XaWRnZXQgaXMgb3VyIFBERlBsdWdpbidzIFBsdWdp blZpZXcuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oOgor ICAgICAgICAoUERGUGx1Z2luKTogQWRkIGlzRnVsbEZyYW1lUGx1Z2luLgorICAgICAgICAqIFdl YlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tOgorICAgICAgICAoV2ViS2l0OjpQREZQ bHVnaW46OmlzRnVsbEZyYW1lUGx1Z2luKTogQ2hlY2sgd2hldGhlciB0aGUgbWFpbiBmcmFtZSBp cworICAgICAgICBiYWNrZWQgYnkgYSBQbHVnaW5Eb2N1bWVudCwgYW5kIHRoYXQgdGhhdCBQbHVn aW5Eb2N1bWVudCBjb3JyZXNwb25kcworICAgICAgICB0byB0aGlzIFBERlBsdWdpbi4KKyAgICAg ICAgKFdlYktpdDo6UERGUGx1Z2luOjpoYW5kbGVzUGFnZVNjYWxlRmFjdG9yKTogVXNlIGlzRnVs bEZyYW1lUGx1Z2luLgorICAgICAgICAoV2ViS2l0OjpQREZQbHVnaW46OnN1cHBvcnRzRm9ybXMp OiBVc2UgaXNGdWxsRnJhbWVQbHVnaW4uCisKKzIwMTItMTEtMjEgIFRpbSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CisKICAgICAgICAgUERGUGx1Z2luOiBDdHJsLS8rIHNob3Vs ZCBhZmZlY3QgUERGIHBhZ2Ugc2NhbGUKICAgICAgICAgW25lZWQgYSBidWd6aWxsYV0KICAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzEyNzEwNDY5PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4uaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLmgKaW5kZXggOTM1MDM4My4uYTgyNzdmOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4u aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5o CkBAIC0xMDMsNiArMTAzLDcgQEAgcHJpdmF0ZToKICAgICBOU0V2ZW50ICpuc0V2ZW50Rm9yV2Vi TW91c2VFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50Jik7CiAgICAgCiAgICAgYm9vbCBzdXBwb3J0 c0Zvcm1zKCk7CisgICAgYm9vbCBpc0Z1bGxGcmFtZVBsdWdpbigpOwogCiAgICAgQ29yZUlQQzo6 RGF0YVJlZmVyZW5jZSBwZGZEb2N1bWVudERhdGFSZWZlcmVuY2UoKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbQppbmRleCA0Mjhl YzRlLi4wNjAzZTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvUERGL1BERlBsdWdpbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvUERGL1BERlBsdWdpbi5tbQpAQCAtNjAsNiArNjAsNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9Q YWdlLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1Bhc3RlYm9hcmQuaD4KICNpbXBvcnQgPFdlYkNvcmUv UGx1Z2luRGF0YS5oPgorI2ltcG9ydCA8V2ViQ29yZS9QbHVnaW5Eb2N1bWVudC5oPgogI2ltcG9y dCA8V2ViQ29yZS9SZW5kZXJCb3hNb2RlbE9iamVjdC5oPgogI2ltcG9ydCA8V2ViQ29yZS9TY3Jv bGxBbmltYXRvci5oPgogI2ltcG9ydCA8V2ViQ29yZS9TY3JvbGxiYXJUaGVtZS5oPgpAQCAtNjUy LDkgKzY1MywyMCBAQCB2b2lkIFBERlBsdWdpbjo6aW52YWxpZGF0ZVNjcm9sbENvcm5lclJlY3Qo Y29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBbbV9zY3JvbGxDb3JuZXJMYXllci5nZXQoKSBzZXRO ZWVkc0Rpc3BsYXldOwogfQogCitib29sIFBERlBsdWdpbjo6aXNGdWxsRnJhbWVQbHVnaW4oKQor eworICAgIC8vIDxvYmplY3Q+IG9yIDxlbWJlZD4gcGx1Z2lucyB3aWxsIGFwcGVhciB0byBiZSBp biB0aGVpciBwYXJlbnQgZnJhbWUsIHNvIHdlIGhhdmUgdG8KKyAgICAvLyBjaGVjayB3aGV0aGVy IG91ciBmcmFtZSdzIHdpZGdldCBpcyBleGFjdGx5IG91ciBQbHVnaW5WaWV3LgorICAgIERvY3Vt ZW50KiBkb2N1bWVudCA9IHdlYkZyYW1lKCktPmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpOworICAg IGlmIChkb2N1bWVudC0+aXNQbHVnaW5Eb2N1bWVudCgpKQorICAgICAgICByZXR1cm4gKHN0YXRp Y19jYXN0PFBsdWdpbkRvY3VtZW50Kj4oZG9jdW1lbnQpLT5wbHVnaW5XaWRnZXQoKSA9PSBwbHVn aW5WaWV3KCkpOworCisgICAgcmV0dXJuIGZhbHNlOworfQorCiBib29sIFBERlBsdWdpbjo6aGFu ZGxlc1BhZ2VTY2FsZUZhY3RvcigpCiB7Ci0gICAgcmV0dXJuIHdlYkZyYW1lKCktPmlzTWFpbkZy YW1lKCk7CisgICAgcmV0dXJuIHdlYkZyYW1lKCktPmlzTWFpbkZyYW1lKCkgJiYgaXNGdWxsRnJh bWVQbHVnaW4oKTsKIH0KIAogdm9pZCBQREZQbHVnaW46OmNsaWNrZWRMaW5rKE5TVVJMICp1cmwp CkBAIC02ODYsNyArNjk4LDcgQEAgdm9pZCBQREZQbHVnaW46OnNldEFjdGl2ZUFubm90YXRpb24o UERGQW5ub3RhdGlvbiAqYW5ub3RhdGlvbikKIGJvb2wgUERGUGx1Z2luOjpzdXBwb3J0c0Zvcm1z KCkKIHsKICAgICAvLyBGSVhNRTogU2hvdWxkIHdlIHN1cHBvcnQgZm9ybXMgZm9yIGlubGluZSBQ REZzPyBTaW5jZSB3ZSB0b3VjaCB0aGUgZG9jdW1lbnQsIHRoaXMgbWlnaHQgYmUgZGlmZmljdWx0 LgotICAgIHJldHVybiB3ZWJGcmFtZSgpLT5pc01haW5GcmFtZSgpOworICAgIHJldHVybiB3ZWJG cmFtZSgpLT5pc01haW5GcmFtZSgpICYmIGlzRnVsbEZyYW1lUGx1Z2luKCk7CiB9CiAKIHZvaWQg UERGUGx1Z2luOjpub3RpZnlDb250ZW50U2NhbGVGYWN0b3JDaGFuZ2VkKENHRmxvYXQgc2NhbGVG YWN0b3IpCg== 177290 2012-12-03 11:11:42 -0800 2012-12-03 11:13:01 -0800 followup style patch style.diff text/plain 1602 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNzYyMjI3Li5mMGVlZjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTItMTItMDMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUERGUGx1Z2luOiA8ZW1iZWQ+IGFuZCA8b2JqZWN0PiBQREZzIGFmZmVjdCB0aGVp ciBwYXJlbnQgZnJhbWUncyBwYWdlIHNjYWxlCisgICAgICAgIOKAi2h0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDMyODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEy NzUyMzE1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFN0eWxlIGZpeGVzIGFmdGVyIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEzNjMx Ni4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tOgorICAg ICAgICAoV2ViS2l0OjpQREZQbHVnaW46OmlzRnVsbEZyYW1lUGx1Z2luKToKKwogMjAxMi0xMi0w MiAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAZ21haWwuY29tPgogCiAgICAgICAgIFtFRkxdW1dL Ml0gVXBkYXRlIGNvbW1lbnRzIG9mIGhlYWRlciBmaWxlcyB3aGljaCBtZW50aW9ucyBkZXByZWNh dGVkIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BE Ri9QREZQbHVnaW4ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BE RlBsdWdpbi5tbQppbmRleCAwOGI3MjhiLi5hMmI5ZmUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbQpAQCAtNzA3LDEwICs3MDcs NyBAQCBib29sIFBERlBsdWdpbjo6aXNGdWxsRnJhbWVQbHVnaW4oKQogICAgIC8vIDxvYmplY3Q+ IG9yIDxlbWJlZD4gcGx1Z2lucyB3aWxsIGFwcGVhciB0byBiZSBpbiB0aGVpciBwYXJlbnQgZnJh bWUsIHNvIHdlIGhhdmUgdG8KICAgICAvLyBjaGVjayB3aGV0aGVyIG91ciBmcmFtZSdzIHdpZGdl dCBpcyBleGFjdGx5IG91ciBQbHVnaW5WaWV3LgogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHdl YkZyYW1lKCktPmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpOwotICAgIGlmIChkb2N1bWVudC0+aXNQ bHVnaW5Eb2N1bWVudCgpKQotICAgICAgICByZXR1cm4gKHN0YXRpY19jYXN0PFBsdWdpbkRvY3Vt ZW50Kj4oZG9jdW1lbnQpLT5wbHVnaW5XaWRnZXQoKSA9PSBwbHVnaW5WaWV3KCkpOwotCi0gICAg cmV0dXJuIGZhbHNlOworICAgIHJldHVybiBkb2N1bWVudC0+aXNQbHVnaW5Eb2N1bWVudCgpICYm IHN0YXRpY19jYXN0PFBsdWdpbkRvY3VtZW50Kj4oZG9jdW1lbnQpLT5wbHVnaW5XaWRnZXQoKSA9 PSBwbHVnaW5WaWV3KCk7CiB9CiAKIGJvb2wgUERGUGx1Z2luOjpoYW5kbGVzUGFnZVNjYWxlRmFj dG9yKCkK