85286 2012-05-01 09:14:18 -0700 [GTK] Compilation warnings in RenderTheme 2012-05-03 07:03:41 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pnormand pnormand oldest_to_newest 613440 0 pnormand 2012-05-01 09:14:18 -0700 ../../Source/WebCore/platform/gtk/RenderThemeGtk.cpp: In member function ‘virtual WTF::String WebCore::RenderThemeGtk::fileListNameForWidth(const WebCore::FileList*, const WebCore::Font&, int, bool) const’: ../../Source/WebCore/platform/gtk/RenderThemeGtk.cpp:716:16: warning: unused variable ‘systemBasename’ [-Wunused-variable] ../../Source/WebCore/platform/gtk/RenderThemeGtk.cpp: At global scope: ../../Source/WebCore/platform/gtk/RenderThemeGtk.cpp:694:13: warning: ‘bool WebCore::stringByAdoptingFileSystemRepresentation(gchar*, WTF::String&)’ defined but not used [-Wunused-function] Patch incoming. 613455 1 139639 pnormand 2012-05-01 09:25:23 -0700 Created attachment 139639 Patch 613490 2 139639 mrobinson 2012-05-01 10:03:10 -0700 Comment on attachment 139639 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139639&action=review > Source/WebCore/platform/gtk/RenderThemeGtk.cpp:-717 > - if (fileList->length() == 1) { > - CString systemFilename = fileSystemRepresentation(fileList->item(0)->path()); > - gchar* systemBasename = g_path_get_basename(systemFilename.data()); > - } else if (fileList->length() > 1) I'm pretty sure the right thing to do is to actually use the basename of the file if there is only one of them. It looks like this code now returns fileButtonNoFilesSelectedLabel. Quite likely you need to add something like this here: if (fileList->length()) string = pathGetFileName(fileList->item(0)->path()); 614103 3 139770 pnormand 2012-05-02 01:59:31 -0700 Created attachment 139770 Patch 614308 4 139770 mrobinson 2012-05-02 08:14:20 -0700 Comment on attachment 139770 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139770&action=review > Source/WebCore/platform/gtk/RenderThemeGtk.cpp:707 > String string = fileButtonNoFileSelectedLabel(); > if (multipleFilesAllowed) > string = fileButtonNoFilesSelectedLabel(); > > - if (fileList->length() == 1) { > - CString systemFilename = fileSystemRepresentation(fileList->item(0)->path()); > - gchar* systemBasename = g_path_get_basename(systemFilename.data()); > - } else if (fileList->length() > 1) > - return StringTruncator::rightTruncate(multipleFileUploadText(fileList->length()), width, font, StringTruncator::EnableRoundingHacks); > + if (fileList->length()) > + string = pathGetFileName(fileList->item(0)->path()); Now that I look at this again, it seems like it should be structured as an if-else if-else block: String string; if (fileList->length()) string = pathGetFileName(fileList->item(0)->path()); else if (multipleFilesAllowed) string = fileButtonNoFilesSelectedLabel(); else if string = fileButtonNoFileSelectedLabel(); Sorry for not mentioning it before. 614439 5 pnormand 2012-05-02 10:57:14 -0700 Committed r115852: <http://trac.webkit.org/changeset/115852> 139639 2012-05-01 09:25:23 -0700 2012-05-02 01:59:24 -0700 Patch bug-85286-20120501182520.patch text/plain 2509 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTg4NDViZWM0NDMxM2M3 ZWI1NTFlMDllY2YwM2IwYjFmNzIzYzc2MS4uYWM3OGQ2YTg5ZWQ5NzE0YmU0NzBmMGNiMDAyNzgw MGIxZTU3ODMzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTAxICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBDb21w aWxhdGlvbiB3YXJuaW5ncyBpbiBSZW5kZXJUaGVtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUyODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIHVuLW5lZWRlZCBjb2RlIGFuZCByZWZhY3Rv cmVkIGZpbGVMaXN0TmFtZUZvcldpZHRoCisgICAgICAgIGFjY29yZGluZ2x5IHRvIGF2b2lkIHVu LXVzZWQgdmFyaWFibGUgd2FybmluZ3MgZHVyaW5nIGNvbXBpbGF0aW9uLgorCisgICAgICAgICog cGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6OmZpbGVMaXN0TmFtZUZvcldpZHRoKToKKwog MjAxMi0wNC0zMCAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg W0Nocm9taXVtL1dpbmRvd3NdIEFkZCBMb2NhbGl6ZWREYXRlV2luCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcAppbmRleCBlNzFkOTlhZjNmNzA1M2Q5 MGIzM2I5OTNmMmEzMGNjZjVlODIwODVjLi4wMDE3NTdiYjVkYWMxMzAxNmNiMTBhM2EyMzA5NWI4 NTY3ZGJjYmMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVy VGhlbWVHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVt ZUd0ay5jcHAKQEAgLTY5MSwzMiArNjkxLDE4IEBAIEludFJlY3QgUmVuZGVyVGhlbWVHdGs6OmNh bGN1bGF0ZVByb2dyZXNzUmVjdChSZW5kZXJPYmplY3QqIHJlbmRlck9iamVjdCwgY29uc3QKIH0K ICNlbmRpZgogCi1zdGF0aWMgYm9vbCBzdHJpbmdCeUFkb3B0aW5nRmlsZVN5c3RlbVJlcHJlc2Vu dGF0aW9uKGdjaGFyKiBzeXN0ZW1GaWxlbmFtZSwgU3RyaW5nJiByZXN1bHQpCi17Ci0gICAgaWYg KCFzeXN0ZW1GaWxlbmFtZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgcmVzdWx0ID0g ZmlsZW5hbWVUb1N0cmluZyhzeXN0ZW1GaWxlbmFtZSk7Ci0gICAgZ19mcmVlKHN5c3RlbUZpbGVu YW1lKTsKLQotICAgIHJldHVybiB0cnVlOwotfQotCiBTdHJpbmcgUmVuZGVyVGhlbWVHdGs6OmZp bGVMaXN0TmFtZUZvcldpZHRoKGNvbnN0IEZpbGVMaXN0KiBmaWxlTGlzdCwgY29uc3QgRm9udCYg Zm9udCwgaW50IHdpZHRoLCBib29sIG11bHRpcGxlRmlsZXNBbGxvd2VkKSBjb25zdAogewogICAg IGlmICh3aWR0aCA8PSAwKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAKKyAgICBpZiAoZmls ZUxpc3QtPmxlbmd0aCgpID4gMSkKKyAgICAgICAgcmV0dXJuIFN0cmluZ1RydW5jYXRvcjo6cmln aHRUcnVuY2F0ZShtdWx0aXBsZUZpbGVVcGxvYWRUZXh0KGZpbGVMaXN0LT5sZW5ndGgoKSksIHdp ZHRoLCBmb250LCBTdHJpbmdUcnVuY2F0b3I6OkVuYWJsZVJvdW5kaW5nSGFja3MpOworCiAgICAg U3RyaW5nIHN0cmluZyA9IGZpbGVCdXR0b25Ob0ZpbGVTZWxlY3RlZExhYmVsKCk7CiAgICAgaWYg KG11bHRpcGxlRmlsZXNBbGxvd2VkKQogICAgICAgICBzdHJpbmcgPSBmaWxlQnV0dG9uTm9GaWxl c1NlbGVjdGVkTGFiZWwoKTsKIAotICAgIGlmIChmaWxlTGlzdC0+bGVuZ3RoKCkgPT0gMSkgewot ICAgICAgICBDU3RyaW5nIHN5c3RlbUZpbGVuYW1lID0gZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9u KGZpbGVMaXN0LT5pdGVtKDApLT5wYXRoKCkpOwotICAgICAgICBnY2hhciogc3lzdGVtQmFzZW5h bWUgPSBnX3BhdGhfZ2V0X2Jhc2VuYW1lKHN5c3RlbUZpbGVuYW1lLmRhdGEoKSk7Ci0gICAgfSBl bHNlIGlmIChmaWxlTGlzdC0+bGVuZ3RoKCkgPiAxKQotICAgICAgICByZXR1cm4gU3RyaW5nVHJ1 bmNhdG9yOjpyaWdodFRydW5jYXRlKG11bHRpcGxlRmlsZVVwbG9hZFRleHQoZmlsZUxpc3QtPmxl bmd0aCgpKSwgd2lkdGgsIGZvbnQsIFN0cmluZ1RydW5jYXRvcjo6RW5hYmxlUm91bmRpbmdIYWNr cyk7Ci0KICAgICByZXR1cm4gU3RyaW5nVHJ1bmNhdG9yOjpjZW50ZXJUcnVuY2F0ZShzdHJpbmcs IHdpZHRoLCBmb250LCBTdHJpbmdUcnVuY2F0b3I6OkVuYWJsZVJvdW5kaW5nSGFja3MpOwogfQog Cg== 139770 2012-05-02 01:59:31 -0700 2012-05-03 07:03:41 -0700 Patch bug-85286-20120502105928.patch text/plain 2598 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTg4NDViZWM0NDMxM2M3 ZWI1NTFlMDllY2YwM2IwYjFmNzIzYzc2MS4uYWIyYmEzYTQ2NDdlOGFiMGY5NzY4MzRhZjQyMzI4 MmJmZmNhOTU1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTAyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBDb21w aWxhdGlvbiB3YXJuaW5ncyBpbiBSZW5kZXJUaGVtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUyODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIHVuLW5lZWRlZCBjb2RlIGFuZCByZWZhY3Rv cmVkIGZpbGVMaXN0TmFtZUZvcldpZHRoCisgICAgICAgIGFjY29yZGluZ2x5IHRvIGF2b2lkIHVu LXVzZWQgdmFyaWFibGUgd2FybmluZ3MgZHVyaW5nIGNvbXBpbGF0aW9uLgorCisgICAgICAgICog cGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6OmZpbGVMaXN0TmFtZUZvcldpZHRoKToKKwog MjAxMi0wNC0zMCAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg W0Nocm9taXVtL1dpbmRvd3NdIEFkZCBMb2NhbGl6ZWREYXRlV2luCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcAppbmRleCBlNzFkOTlhZjNmNzA1M2Q5 MGIzM2I5OTNmMmEzMGNjZjVlODIwODVjLi5kMzkwZjA4ZWMzYjQ3NzM1OGQ2ZWRhYmU1NDE4MmRh OTllZDIxMzkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVy VGhlbWVHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVt ZUd0ay5jcHAKQEAgLTY5MSwzMSArNjkxLDIwIEBAIEludFJlY3QgUmVuZGVyVGhlbWVHdGs6OmNh bGN1bGF0ZVByb2dyZXNzUmVjdChSZW5kZXJPYmplY3QqIHJlbmRlck9iamVjdCwgY29uc3QKIH0K ICNlbmRpZgogCi1zdGF0aWMgYm9vbCBzdHJpbmdCeUFkb3B0aW5nRmlsZVN5c3RlbVJlcHJlc2Vu dGF0aW9uKGdjaGFyKiBzeXN0ZW1GaWxlbmFtZSwgU3RyaW5nJiByZXN1bHQpCi17Ci0gICAgaWYg KCFzeXN0ZW1GaWxlbmFtZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgcmVzdWx0ID0g ZmlsZW5hbWVUb1N0cmluZyhzeXN0ZW1GaWxlbmFtZSk7Ci0gICAgZ19mcmVlKHN5c3RlbUZpbGVu YW1lKTsKLQotICAgIHJldHVybiB0cnVlOwotfQotCiBTdHJpbmcgUmVuZGVyVGhlbWVHdGs6OmZp bGVMaXN0TmFtZUZvcldpZHRoKGNvbnN0IEZpbGVMaXN0KiBmaWxlTGlzdCwgY29uc3QgRm9udCYg Zm9udCwgaW50IHdpZHRoLCBib29sIG11bHRpcGxlRmlsZXNBbGxvd2VkKSBjb25zdAogewogICAg IGlmICh3aWR0aCA8PSAwKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAKKyAgICBpZiAoZmls ZUxpc3QtPmxlbmd0aCgpID4gMSkKKyAgICAgICAgcmV0dXJuIFN0cmluZ1RydW5jYXRvcjo6cmln aHRUcnVuY2F0ZShtdWx0aXBsZUZpbGVVcGxvYWRUZXh0KGZpbGVMaXN0LT5sZW5ndGgoKSksIHdp ZHRoLCBmb250LCBTdHJpbmdUcnVuY2F0b3I6OkVuYWJsZVJvdW5kaW5nSGFja3MpOworCiAgICAg U3RyaW5nIHN0cmluZyA9IGZpbGVCdXR0b25Ob0ZpbGVTZWxlY3RlZExhYmVsKCk7CiAgICAgaWYg KG11bHRpcGxlRmlsZXNBbGxvd2VkKQogICAgICAgICBzdHJpbmcgPSBmaWxlQnV0dG9uTm9GaWxl c1NlbGVjdGVkTGFiZWwoKTsKIAotICAgIGlmIChmaWxlTGlzdC0+bGVuZ3RoKCkgPT0gMSkgewot ICAgICAgICBDU3RyaW5nIHN5c3RlbUZpbGVuYW1lID0gZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9u KGZpbGVMaXN0LT5pdGVtKDApLT5wYXRoKCkpOwotICAgICAgICBnY2hhciogc3lzdGVtQmFzZW5h bWUgPSBnX3BhdGhfZ2V0X2Jhc2VuYW1lKHN5c3RlbUZpbGVuYW1lLmRhdGEoKSk7Ci0gICAgfSBl bHNlIGlmIChmaWxlTGlzdC0+bGVuZ3RoKCkgPiAxKQotICAgICAgICByZXR1cm4gU3RyaW5nVHJ1 bmNhdG9yOjpyaWdodFRydW5jYXRlKG11bHRpcGxlRmlsZVVwbG9hZFRleHQoZmlsZUxpc3QtPmxl bmd0aCgpKSwgd2lkdGgsIGZvbnQsIFN0cmluZ1RydW5jYXRvcjo6RW5hYmxlUm91bmRpbmdIYWNr cyk7CisgICAgaWYgKGZpbGVMaXN0LT5sZW5ndGgoKSkKKyAgICAgICAgc3RyaW5nID0gcGF0aEdl dEZpbGVOYW1lKGZpbGVMaXN0LT5pdGVtKDApLT5wYXRoKCkpOwogCiAgICAgcmV0dXJuIFN0cmlu Z1RydW5jYXRvcjo6Y2VudGVyVHJ1bmNhdGUoc3RyaW5nLCB3aWR0aCwgZm9udCwgU3RyaW5nVHJ1 bmNhdG9yOjpFbmFibGVSb3VuZGluZ0hhY2tzKTsKIH0K