237516 2022-03-07 02:52:09 -0800 PDF.js content script is adding custom cocoa style unconditionally 2022-03-08 01:27:21 -0800 1 1 1 Unclassified WebKit PDF WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 235969 237527 1 cgarcia webkit-unassigned bfulgham cdumez changseok esprehn+autocc ews-watchlist gyuyoung.kim joepeck ntim thorton webkit-bug-importer oldest_to_newest 1848656 0 cgarcia 2022-03-07 02:52:09 -0800 I should be possible to add different style depending on the platform. 1848658 1 453953 cgarcia 2022-03-07 02:56:02 -0800 Created attachment 453953 Patch 1848773 2 453953 ntim 2022-03-07 08:48:21 -0800 Comment on attachment 453953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453953&action=review > Source/WebCore/html/PDFDocument.cpp:217 > +#if PLATFORM(COCOA) > + link->setAttribute(hrefAttr, "webkit-pdfjs-viewer://pdfjs/extras/cocoa/style.css"_s); > +#endif Do #if preprocessing conditions not work in the JS file? If they do, I'd rather see this logic in the JS file. 1849139 3 453953 cgarcia 2022-03-08 00:33:07 -0800 Comment on attachment 453953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453953&action=review >> Source/WebCore/html/PDFDocument.cpp:217 >> +#endif > > Do #if preprocessing conditions not work in the JS file? If they do, I'd rather see this logic in the JS file. I don't think so, the script is injected as is, without any preprocessing. I don't know how to make it platform dependent in a JS file, that's why I moved it to cpp. 1849156 4 ews-feeder 2022-03-08 01:26:50 -0800 Committed r290983 (248161@main): <https://commits.webkit.org/248161@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453953. 1849158 5 webkit-bug-importer 2022-03-08 01:27:21 -0800 <rdar://problem/89955906> 453953 2022-03-07 02:56:02 -0800 2022-03-08 01:26:53 -0800 Patch wcore-pdf-js-custom-style.diff text/plain 6108 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYzZlNThkN2I1YWYuLjk4OWE4NjNlMWExYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI2IEBACisyMDIyLTAzLTA3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBQREYuanMgY29udGVudCBzY3JpcHQgaXMgYWRkaW5nIGN1 c3RvbSBjb2NvYSBzdHlsZSB1bmNvbmRpdGlvbmFsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzUxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0aGUgY3VzdG9tIHN0eWxlIGZyb20gdGhlIFdl YktpdCBjb2RlIGluc3RlYWQgb2YgaW5qZWN0ZWQgY29udGVudCBzY3JpcHQgdG8gbWFrZSBpdCBl YXNpZXIgdG8gYWRkIHRoZSBzdHlsZQorICAgICAgICBkZXBlbmRpbmcgb24gdGhlIHBsYXRmb3Jt LiBNb3ZlIGN1cnJlbnQgY29jb2Egc3BlY2lmaWMgc3R5bGUgZmlsZXMgdG8gYSBjb2NvYSBkaXJl Y3RvcnkuCisKKyAgICAgICAgKiBNb2R1bGVzL3BkZmpzLWV4dHJhcy9jb2NvYS9hcnJvdy5kb3du LmNpcmNsZUAyeC5wbmc6IFJlbmFtZWQgZnJvbSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BkZmpz LWV4dHJhcy9hcnJvdy5kb3duLmNpcmNsZUAyeC5wbmcuCisgICAgICAgICogTW9kdWxlcy9wZGZq cy1leHRyYXMvY29jb2EvbWludXMubWFnbmlmeWluZ2dsYXNzQDJ4LnBuZzogUmVuYW1lZCBmcm9t IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGRmanMtZXh0cmFzL21pbnVzLm1hZ25pZnlpbmdnbGFz c0AyeC5wbmcuCisgICAgICAgICogTW9kdWxlcy9wZGZqcy1leHRyYXMvY29jb2EvcGx1cy5tYWdu aWZ5aW5nZ2xhc3NAMngucG5nOiBSZW5hbWVkIGZyb20gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9w ZGZqcy1leHRyYXMvcGx1cy5tYWduaWZ5aW5nZ2xhc3NAMngucG5nLgorICAgICAgICAqIE1vZHVs ZXMvcGRmanMtZXh0cmFzL2NvY29hL3N0eWxlLmNzczogUmVuYW1lZCBmcm9tIFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvcGRmanMtZXh0cmFzL3N0eWxlLWNvY29hLmNzcy4KKyAgICAgICAgKiBNb2R1 bGVzL3BkZmpzLWV4dHJhcy9jb250ZW50LXNjcmlwdC5qczoKKyAgICAgICAgKGNvbnN0LlBERkpT Q29udGVudFNjcmlwdC5pbmplY3RTdHlsZSk6IERlbGV0ZWQuCisgICAgICAgIChjb25zdC5QREZK U0NvbnRlbnRTY3JpcHQuaW5pdCk6IERlbGV0ZWQuCisgICAgICAgICogaHRtbC9QREZEb2N1bWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQREZEb2N1bWVudEV2ZW50TGlzdGVuZXI6OmhhbmRs ZUV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBERkRvY3VtZW50OjppbmplY3RTdHlsZUFuZENv bnRlbnRTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6UERGRG9jdW1lbnQ6OmluamVjdENvbnRl bnRTY3JpcHQpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwvUERGRG9jdW1lbnQuaDoKKwogMjAy Mi0wMy0wNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS11bV1BFXSBBZGQgaW5pdGlhbCBzdXBwb3J0IGZvciBQREYgZG9jdW1lbnRzIHVz aW5nIFBERi5qcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZGZqcy1leHRy YXMvYXJyb3cuZG93bi5jaXJjbGVAMngucG5nIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZGZq cy1leHRyYXMvY29jb2EvYXJyb3cuZG93bi5jaXJjbGVAMngucG5nCnNpbWlsYXJpdHkgaW5kZXgg MTAwJQpyZW5hbWUgZnJvbSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BkZmpzLWV4dHJhcy9hcnJv dy5kb3duLmNpcmNsZUAyeC5wbmcKcmVuYW1lIHRvIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGRm anMtZXh0cmFzL2NvY29hL2Fycm93LmRvd24uY2lyY2xlQDJ4LnBuZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9wZGZqcy1leHRyYXMvbWludXMubWFnbmlmeWluZ2dsYXNzQDJ4 LnBuZyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGRmanMtZXh0cmFzL2NvY29hL21pbnVzLm1h Z25pZnlpbmdnbGFzc0AyeC5wbmcKc2ltaWxhcml0eSBpbmRleCAxMDAlCnJlbmFtZSBmcm9tIFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvcGRmanMtZXh0cmFzL21pbnVzLm1hZ25pZnlpbmdnbGFzc0Ay eC5wbmcKcmVuYW1lIHRvIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGRmanMtZXh0cmFzL2NvY29h L21pbnVzLm1hZ25pZnlpbmdnbGFzc0AyeC5wbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvcGRmanMtZXh0cmFzL3BsdXMubWFnbmlmeWluZ2dsYXNzQDJ4LnBuZyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvcGRmanMtZXh0cmFzL2NvY29hL3BsdXMubWFnbmlmeWluZ2dsYXNz QDJ4LnBuZwpzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZyb20gU291cmNlL1dlYkNvcmUv TW9kdWxlcy9wZGZqcy1leHRyYXMvcGx1cy5tYWduaWZ5aW5nZ2xhc3NAMngucG5nCnJlbmFtZSB0 byBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BkZmpzLWV4dHJhcy9jb2NvYS9wbHVzLm1hZ25pZnlp bmdnbGFzc0AyeC5wbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGRmanMt ZXh0cmFzL3N0eWxlLWNvY29hLmNzcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGRmanMtZXh0 cmFzL2NvY29hL3N0eWxlLmNzcwpzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZyb20gU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9wZGZqcy1leHRyYXMvc3R5bGUtY29jb2EuY3NzCnJlbmFtZSB0 byBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BkZmpzLWV4dHJhcy9jb2NvYS9zdHlsZS5jc3MKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGRmanMtZXh0cmFzL2NvbnRlbnQtc2Ny aXB0LmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZGZqcy1leHRyYXMvY29udGVudC1zY3Jp cHQuanMKaW5kZXggZmU0OWQwNTM0ZGIwLi42MDIxOTJlYzMxYWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvcGRmanMtZXh0cmFzL2NvbnRlbnQtc2NyaXB0LmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvcGRmanMtZXh0cmFzL2NvbnRlbnQtc2NyaXB0LmpzCkBAIC0y MywxOCArMjMsNyBAQAogICovCiAKIGNvbnN0IFBERkpTQ29udGVudFNjcmlwdCA9IHsKLSAgICBp bmplY3RTdHlsZSgpIHsKLSAgICAgICAgY29uc3Qgc3R5bGVzaGVldCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImxpbmsiKTsKLSAgICAgICAgc3R5bGVzaGVldC5yZWwgPSAic3R5bGVzaGVldCI7 Ci0gICAgICAgIHN0eWxlc2hlZXQuaHJlZiA9ICIuLi9leHRyYXMvc3R5bGUtY29jb2EuY3NzIjsK LSAgICAgICAgZG9jdW1lbnQuaGVhZC5hcHBlbmRDaGlsZChzdHlsZXNoZWV0KTsKLSAgICB9LAot ICAgIGluaXQoKSB7Ci0gICAgICAgIHRoaXMuaW5qZWN0U3R5bGUoKTsKLSAgICB9LAogICAgIG9w ZW4oZGF0YSkgewogICAgICAgICBQREZWaWV3ZXJBcHBsaWNhdGlvbi5vcGVuKGRhdGEpOwogICAg IH0KIH07Ci0KLVBERkpTQ29udGVudFNjcmlwdC5pbml0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL1BERkRvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvUERGRG9j dW1lbnQuY3BwCmluZGV4IDc4NDJkYTMwNDc3NS4uNWUyODFlNDc2NDkxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL1BERkRvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL1BERkRvY3VtZW50LmNwcApAQCAtMzMsOCArMzMsMTAgQEAKICNpbmNsdWRlICJGcmFtZS5o IgogI2luY2x1ZGUgIkhUTUxBbmNob3JFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTEJvZHlFbGVt ZW50LmgiCisjaW5jbHVkZSAiSFRNTEhlYWRFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTEh0bWxF bGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTElGcmFtZUVsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1M TGlua0VsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MU2Ny aXB0RWxlbWVudC5oIgogI2luY2x1ZGUgIlJhd0RhdGFEb2N1bWVudFBhcnNlci5oIgpAQCAtMTA5 LDcgKzExMSw3IEBAIHByaXZhdGU6CiB2b2lkIFBERkRvY3VtZW50RXZlbnRMaXN0ZW5lcjo6aGFu ZGxlRXZlbnQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIEV2ZW50JiBldmVudCkKIHsKICAgICBp ZiAoaXM8SFRNTElGcmFtZUVsZW1lbnQ+KGV2ZW50LnRhcmdldCgpKSAmJiBldmVudC50eXBlKCkg PT0gZXZlbnROYW1lcygpLmxvYWRFdmVudCkgewotICAgICAgICBtX2RvY3VtZW50LT5pbmplY3RD b250ZW50U2NyaXB0KCk7CisgICAgICAgIG1fZG9jdW1lbnQtPmluamVjdFN0eWxlQW5kQ29udGVu dFNjcmlwdCgpOwogICAgIH0gZWxzZSBpZiAoaXM8SFRNTFNjcmlwdEVsZW1lbnQ+KGV2ZW50LnRh cmdldCgpKSAmJiBldmVudC50eXBlKCkgPT0gZXZlbnROYW1lcygpLmxvYWRFdmVudCkgewogICAg ICAgICBtX2RvY3VtZW50LT5zZXRDb250ZW50U2NyaXB0TG9hZGVkKHRydWUpOwogICAgICAgICBp ZiAobV9kb2N1bWVudC0+aXNGaW5pc2hlZFBhcnNpbmcoKSkKQEAgLTIwNCwxMSArMjA2LDE4IEBA IHZvaWQgUERGRG9jdW1lbnQ6OnNlbmRQREZBcnJheUJ1ZmZlcigpCiAgICAgY2FsbChnbG9iYWxP YmplY3QsIG9wZW5GdW5jdGlvbiwgY2FsbERhdGEsIGdsb2JhbE9iamVjdCwgYXJndW1lbnRzKTsK IH0KIAotdm9pZCBQREZEb2N1bWVudDo6aW5qZWN0Q29udGVudFNjcmlwdCgpCit2b2lkIFBERkRv Y3VtZW50OjppbmplY3RTdHlsZUFuZENvbnRlbnRTY3JpcHQoKQogewotICAgIGF1dG8gY29udGVu dERvY3VtZW50ID0gbV9pZnJhbWUtPmNvbnRlbnREb2N1bWVudCgpOwotICAgIEFTU0VSVChjb250 ZW50RG9jdW1lbnQtPmJvZHkoKSk7CisgICAgYXV0byogY29udGVudERvY3VtZW50ID0gbV9pZnJh bWUtPmNvbnRlbnREb2N1bWVudCgpOworICAgIEFTU0VSVChjb250ZW50RG9jdW1lbnQtPmhlYWQo KSk7CisgICAgYXV0byBsaW5rID0gSFRNTExpbmtFbGVtZW50OjpjcmVhdGUoSFRNTE5hbWVzOjps aW5rVGFnLCAqY29udGVudERvY3VtZW50LCBmYWxzZSk7CisgICAgbGluay0+c2V0QXR0cmlidXRl KHJlbEF0dHIsICJzdHlsZXNoZWV0Il9zKTsKKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICBsaW5r LT5zZXRBdHRyaWJ1dGUoaHJlZkF0dHIsICJ3ZWJraXQtcGRmanMtdmlld2VyOi8vcGRmanMvZXh0 cmFzL2NvY29hL3N0eWxlLmNzcyJfcyk7CisjZW5kaWYKKyAgICBjb250ZW50RG9jdW1lbnQtPmhl YWQoKS0+YXBwZW5kQ2hpbGQobGluayk7CiAKKyAgICBBU1NFUlQoY29udGVudERvY3VtZW50LT5i b2R5KCkpOwogICAgIGF1dG8gc2NyaXB0ID0gSFRNTFNjcmlwdEVsZW1lbnQ6OmNyZWF0ZShzY3Jp cHRUYWcsICpjb250ZW50RG9jdW1lbnQsIGZhbHNlKTsKICAgICBzY3JpcHQtPmFkZEV2ZW50TGlz dGVuZXIoImxvYWQiLCBtX2xpc3RlbmVyLnJlbGVhc2VOb25OdWxsKCksIGZhbHNlKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9QREZEb2N1bWVudC5oIGIvU291cmNlL1dlYkNv cmUvaHRtbC9QREZEb2N1bWVudC5oCmluZGV4IDQ5ODJmZTM4OWVmNi4uOTMxMDkwMWQ1Mzg5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1BERkRvY3VtZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9QREZEb2N1bWVudC5oCkBAIC00MSw3ICs0MSw3IEBAIHB1YmxpYzoKIAog ICAgIHZvaWQgdXBkYXRlRHVyaW5nUGFyc2luZygpOwogICAgIHZvaWQgZmluaXNoZWRQYXJzaW5n KCk7Ci0gICAgdm9pZCBpbmplY3RDb250ZW50U2NyaXB0KCk7CisgICAgdm9pZCBpbmplY3RTdHls ZUFuZENvbnRlbnRTY3JpcHQoKTsKIAogICAgIHZvaWQgc2VuZFBERkFycmF5QnVmZmVyKCk7CiAg ICAgYm9vbCBpc0ZpbmlzaGVkUGFyc2luZygpIGNvbnN0IHsgcmV0dXJuIG1faXNGaW5pc2hlZFBh cnNpbmc7IH0K