Bug 85286

Summary: [GTK] Compilation warnings in RenderTheme
Product: WebKit Reporter: Philippe Normand <pnormand>
Component: WebKitGTKAssignee: Philippe Normand <pnormand>
Status: RESOLVED FIXED    
Severity: Normal    
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch mrobinson: review+

Philippe Normand
Reported 2012-05-01 09:14:18 PDT
../../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.
Attachments
Patch (2.45 KB, patch)
2012-05-01 09:25 PDT, Philippe Normand
no flags
Patch (2.54 KB, patch)
2012-05-02 01:59 PDT, Philippe Normand
mrobinson: review+
Philippe Normand
Comment 1 2012-05-01 09:25:23 PDT
Martin Robinson
Comment 2 2012-05-01 10:03:10 PDT
Comment on attachment 139639 [details] 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());
Philippe Normand
Comment 3 2012-05-02 01:59:31 PDT
Martin Robinson
Comment 4 2012-05-02 08:14:20 PDT
Comment on attachment 139770 [details] 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.
Philippe Normand
Comment 5 2012-05-02 10:57:14 PDT
Note You need to log in before you can comment on or make changes to this bug.