133377 2014-05-29 07:28:57 -0700 [GTK] Add support for HiDPI icons 2014-05-29 09:06:16 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 131562 1 cgarcia webkit-unassigned bunhere cdumez commit-queue gyuyoung.kim rakuco sergio oldest_to_newest 1012416 0 cgarcia 2014-05-29 07:28:57 -0700 We should use the @2x versions of the icons when device scale factor is >=2 1012417 1 232248 cgarcia 2014-05-29 07:33:34 -0700 Created attachment 232248 Patch 1012420 2 232248 mrobinson 2014-05-29 07:58:17 -0700 Comment on attachment 232248 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232248&action=review > Source/WebKit2/PlatformGTK.cmake:520 > + " <file alias=\"images/deleteButton@2x\">deleteButton@2x.png</file>\n" > " <file alias=\"images/missingImage\">missingImage.png</file>\n" > + " <file alias=\"images/missingImage@2x\">missingImage@2x.png</file>\n" > " <file alias=\"images/panIcon\">panIcon.png</file>\n" > " <file alias=\"images/textAreaResizeCorner\">textAreaResizeCorner.png</file>\n" > + " <file alias=\"images/textAreaResizeCorner@2x\">textAreaResizeCorner@2x.png</file>\n" Don't we need to add these files as well? 1012421 3 cgarcia 2014-05-29 08:00:51 -0700 (In reply to comment #2) > (From update of attachment 232248 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=232248&action=review > > > Source/WebKit2/PlatformGTK.cmake:520 > > + " <file alias=\"images/deleteButton@2x\">deleteButton@2x.png</file>\n" > > " <file alias=\"images/missingImage\">missingImage.png</file>\n" > > + " <file alias=\"images/missingImage@2x\">missingImage@2x.png</file>\n" > > " <file alias=\"images/panIcon\">panIcon.png</file>\n" > > " <file alias=\"images/textAreaResizeCorner\">textAreaResizeCorner.png</file>\n" > > + " <file alias=\"images/textAreaResizeCorner@2x\">textAreaResizeCorner@2x.png</file>\n" > > Don't we need to add these files as well? What do you mean? add which ones? where? 1012427 4 232248 mrobinson 2014-05-29 08:07:41 -0700 Comment on attachment 232248 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232248&action=review >>> Source/WebKit2/PlatformGTK.cmake:520 >>> + " <file alias=\"images/textAreaResizeCorner@2x\">textAreaResizeCorner@2x.png</file>\n" >> >> Don't we need to add these files as well? > > What do you mean? add which ones? where? I see now that they are already checked into the repository. 1012429 5 cgarcia 2014-05-29 08:11:48 -0700 (In reply to comment #4) > (From update of attachment 232248 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=232248&action=review > > >>> Source/WebKit2/PlatformGTK.cmake:520 > >>> + " <file alias=\"images/textAreaResizeCorner@2x\">textAreaResizeCorner@2x.png</file>\n" > >> > >> Don't we need to add these files as well? > > > > What do you mean? add which ones? where? > > I see now that they are already checked into the repository. Ah, you meant in the repo :-) 1012438 6 cgarcia 2014-05-29 09:06:16 -0700 Committed r169446: <http://trac.webkit.org/changeset/169446> 232248 2014-05-29 07:33:34 -0700 2014-05-29 08:07:40 -0700 Patch wk-hires-icons.diff text/plain 3738 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZmY4NDJmLi5iNDdkMTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTQtMDUtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEFkZCBzdXBwb3J0IGZvciBIaURQSSBpY29ucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzc3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHRoZSBHVEsrIG1pc3Np bmcgaWNvbiBhdCAxNiBvciAzMiBzaXplIGRlcGVuZGluZyBvbiB0aGUgZGV2aWNlCisgICAgICAg IHNjYWxlIGZhY3Rvci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0 ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2FkTWlzc2luZ0ltYWdlSWNvbkZyb21UaGVtZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UpOgorCiAyMDE0 LTA1LTI5ICBPd2VuIFRheWxvciAgPG90YXlsb3JAcmVkaGF0LmNvbT4KIAogICAgICAgICBbR1RL XSBBZGQgSGlnaERQSSBzdXBwb3J0IGZvciBub24tYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgY29u dGVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9J bWFnZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VH dGsuY3BwCmluZGV4IDBhM2I1YzMuLmUxYjJiYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdlR3RrLmNwcApAQCAtNjAsMjIgKzYwLDIzIEBAIHZv aWQgQml0bWFwSW1hZ2U6OmludmFsaWRhdGVQbGF0Zm9ybURhdGEoKQogewogfQogCi1zdGF0aWMg UGFzc1JlZlB0cjxJbWFnZT4gbG9hZE1pc3NpbmdJbWFnZUljb25Gcm9tVGhlbWUoKQorc3RhdGlj IFBhc3NSZWZQdHI8SW1hZ2U+IGxvYWRNaXNzaW5nSW1hZ2VJY29uRnJvbVRoZW1lKGNvbnN0IGNo YXIqIG5hbWUpCiB7CisgICAgaW50IGljb25TaXplID0gZ19zdHJfaGFzX3N1ZmZpeChuYW1lLCAi QDJ4IikgPyAzMiA6IDE2OwogICAgIFJlZlB0cjxCaXRtYXBJbWFnZT4gaWNvbiA9IEJpdG1hcElt YWdlOjpjcmVhdGUoKTsKLSAgICBHVW5pcXVlUHRyPEd0a0ljb25JbmZvPiBpY29uSW5mbyhndGtf aWNvbl90aGVtZV9sb29rdXBfaWNvbihndGtfaWNvbl90aGVtZV9nZXRfZGVmYXVsdCgpLCBHVEtf U1RPQ0tfTUlTU0lOR19JTUFHRSwgMTYsIEdUS19JQ09OX0xPT0tVUF9OT19TVkcpKTsKKyAgICBH VW5pcXVlUHRyPEd0a0ljb25JbmZvPiBpY29uSW5mbyhndGtfaWNvbl90aGVtZV9sb29rdXBfaWNv bihndGtfaWNvbl90aGVtZV9nZXRfZGVmYXVsdCgpLCBHVEtfU1RPQ0tfTUlTU0lOR19JTUFHRSwg aWNvblNpemUsIEdUS19JQ09OX0xPT0tVUF9OT19TVkcpKTsKICAgICBpZiAoaWNvbkluZm8pIHsK ICAgICAgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gbG9hZFJlc291cmNlU2hhcmVk QnVmZmVyKGd0a19pY29uX2luZm9fZ2V0X2ZpbGVuYW1lKGljb25JbmZvLmdldCgpKSk7CiAgICAg ICAgIGljb24tPnNldERhdGEoYnVmZmVyLnJlbGVhc2UoKSwgdHJ1ZSk7CiAgICAgICAgIHJldHVy biBpY29uLnJlbGVhc2UoKTsKICAgICB9CiAKLSAgICByZXR1cm4gbG9hZEltYWdlRnJvbUdSZXNv dXJjZSgibWlzc2luZ0ltYWdlIik7CisgICAgcmV0dXJuIGxvYWRJbWFnZUZyb21HUmVzb3VyY2Uo bmFtZSk7CiB9CiAKIFBhc3NSZWZQdHI8SW1hZ2U+IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJj ZShjb25zdCBjaGFyKiBuYW1lKQogewotICAgIHJldHVybiAhc3RyY21wKCJtaXNzaW5nSW1hZ2Ui LCBuYW1lKSA/IGxvYWRNaXNzaW5nSW1hZ2VJY29uRnJvbVRoZW1lKCkgOiBsb2FkSW1hZ2VGcm9t R1Jlc291cmNlKG5hbWUpOworICAgIHJldHVybiBnX3N0cl9oYXNfcHJlZml4KG5hbWUsICJtaXNz aW5nSW1hZ2UiKSA/IGxvYWRNaXNzaW5nSW1hZ2VJY29uRnJvbVRoZW1lKG5hbWUpIDogbG9hZElt YWdlRnJvbUdSZXNvdXJjZShuYW1lKTsKIH0KIAogR2RrUGl4YnVmKiBCaXRtYXBJbWFnZTo6Z2V0 R2RrUGl4YnVmKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA3OGQ2NmVmLi4yZDRlNjlkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTQtMDUtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEFkZCBzdXBwb3J0IGZvciBIaURQSSBpY29u cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzc3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQbGF0 Zm9ybUdUSy5jbWFrZTogQ29tcGlsZSBhbHNvIHRoZSBAMnggdmVyc2lvbnMgZm9yIHRoZSBidWls dGluIGljb25zLgorCiAyMDE0LTA1LTI5ICBPd2VuIFRheWxvciAgPG90YXlsb3JAcmVkaGF0LmNv bT4KIAogICAgICAgICBbR1RLXSBBZGQgSGlnaERQSSBzdXBwb3J0IGZvciBub24tYWNjZWxlcmF0 ZWQgY29tcG9zaXRpbmcgY29udGVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRm b3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggZDQy NGVlMi4uNzY0OWYxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21h a2UKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKQEAgLTUxMiw5ICs1MTIs MTIgQEAgYWRkX2N1c3RvbV9jb21tYW5kKAogCiBzZXQoV2ViS2l0MlJlc291cmNlcwogICAgICIg ICAgICAgIDxmaWxlIGFsaWFzPVwiaW1hZ2VzL2RlbGV0ZUJ1dHRvblwiPmRlbGV0ZUJ1dHRvbi5w bmc8L2ZpbGU+XG4iCisgICAgIiAgICAgICAgPGZpbGUgYWxpYXM9XCJpbWFnZXMvZGVsZXRlQnV0 dG9uQDJ4XCI+ZGVsZXRlQnV0dG9uQDJ4LnBuZzwvZmlsZT5cbiIKICAgICAiICAgICAgICA8Zmls ZSBhbGlhcz1cImltYWdlcy9taXNzaW5nSW1hZ2VcIj5taXNzaW5nSW1hZ2UucG5nPC9maWxlPlxu IgorICAgICIgICAgICAgIDxmaWxlIGFsaWFzPVwiaW1hZ2VzL21pc3NpbmdJbWFnZUAyeFwiPm1p c3NpbmdJbWFnZUAyeC5wbmc8L2ZpbGU+XG4iCiAgICAgIiAgICAgICAgPGZpbGUgYWxpYXM9XCJp bWFnZXMvcGFuSWNvblwiPnBhbkljb24ucG5nPC9maWxlPlxuIgogICAgICIgICAgICAgIDxmaWxl IGFsaWFzPVwiaW1hZ2VzL3RleHRBcmVhUmVzaXplQ29ybmVyXCI+dGV4dEFyZWFSZXNpemVDb3Ju ZXIucG5nPC9maWxlPlxuIgorICAgICIgICAgICAgIDxmaWxlIGFsaWFzPVwiaW1hZ2VzL3RleHRB cmVhUmVzaXplQ29ybmVyQDJ4XCI+dGV4dEFyZWFSZXNpemVDb3JuZXJAMngucG5nPC9maWxlPlxu IgogKQogCiBpZiAoRU5BQkxFX0lDT05EQVRBQkFTRSkK