Title: [110907] trunk/Source/WebCore
- Revision
- 110907
- Author
- [email protected]
- Date
- 2012-03-15 16:28:49 -0700 (Thu, 15 Mar 2012)
Log Message
[Qt] RenderThemeQt::fileListNameForWidth should override function in base class RenderTheme. (r110560)
https://bugs.webkit.org/show_bug.cgi?id=81107
Add "bool multipleFilesAllowed" to the parameter list of RenderThemeQt::fileListNameForWidth.
This way the base class function is properly overridden.
The need for this change became obvious after r110560 where the OVERRIDE keyword had been
added to the function signature.
Reviewed by Simon Hausmann.
* platform/qt/RenderThemeQt.cpp:
(WebCore::RenderThemeQt::fileListNameForWidth):
* platform/qt/RenderThemeQt.h:
(RenderThemeQt):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110906 => 110907)
--- trunk/Source/WebCore/ChangeLog 2012-03-15 23:21:41 UTC (rev 110906)
+++ trunk/Source/WebCore/ChangeLog 2012-03-15 23:28:49 UTC (rev 110907)
@@ -1,3 +1,20 @@
+2012-03-15 Zeno Albisser <[email protected]>
+
+ [Qt] RenderThemeQt::fileListNameForWidth should override function in base class RenderTheme. (r110560)
+ https://bugs.webkit.org/show_bug.cgi?id=81107
+
+ Add "bool multipleFilesAllowed" to the parameter list of RenderThemeQt::fileListNameForWidth.
+ This way the base class function is properly overridden.
+ The need for this change became obvious after r110560 where the OVERRIDE keyword had been
+ added to the function signature.
+
+ Reviewed by Simon Hausmann.
+
+ * platform/qt/RenderThemeQt.cpp:
+ (WebCore::RenderThemeQt::fileListNameForWidth):
+ * platform/qt/RenderThemeQt.h:
+ (RenderThemeQt):
+
2012-03-07 Jon Lee <[email protected]>
Move NotificationContents into Notification
Modified: trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp (110906 => 110907)
--- trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp 2012-03-15 23:21:41 UTC (rev 110906)
+++ trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp 2012-03-15 23:28:49 UTC (rev 110907)
@@ -869,8 +869,9 @@
return static_cast<QGuiApplication*>(qApp)->styleHints()->cursorFlashTime() / 1000.0 / 2.0;
}
-String RenderThemeQt::fileListNameForWidth(const FileList* fileList, const Font& font, int width) const
+String RenderThemeQt::fileListNameForWidth(const FileList* fileList, const Font& font, int width, bool multipleFilesAllowed) const
{
+ UNUSED_PARAM(multipleFilesAllowed);
if (width <= 0)
return String();
Modified: trunk/Source/WebCore/platform/qt/RenderThemeQt.h (110906 => 110907)
--- trunk/Source/WebCore/platform/qt/RenderThemeQt.h 2012-03-15 23:21:41 UTC (rev 110906)
+++ trunk/Source/WebCore/platform/qt/RenderThemeQt.h 2012-03-15 23:28:49 UTC (rev 110907)
@@ -155,7 +155,7 @@
#endif
virtual void computeSizeBasedOnStyle(RenderStyle*) const = 0;
- virtual String fileListNameForWidth(const FileList*, const Font&, int width) const OVERRIDE;
+ virtual String fileListNameForWidth(const FileList*, const Font&, int width, bool multipleFilesAllowed) const OVERRIDE;
virtual QRect inflateButtonRect(const QRect& originalRect) const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
