Title: [109346] trunk/Source/WebCore
- Revision
- 109346
- Author
- [email protected]
- Date
- 2012-03-01 07:18:23 -0800 (Thu, 01 Mar 2012)
Log Message
[Qt] Remove dead style option code.
https://bugs.webkit.org/show_bug.cgi?id=80017
Reviewed by Kenneth Rohde Christiansen.
QtStyleOptionWebComboBox provides functionality (bool multiple()) that
is not called from anywhere (and the base class does not have it as a
virtual function).
* Target.pri:
* platform/qt/QtStyleOptionWebComboBox.h: Removed.
* platform/qt/RenderThemeQStyle.cpp:
(WebCore::RenderThemeQStyle::paintMenuList):
(WebCore::RenderThemeQStyle::paintMenuListButton):
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (109345 => 109346)
--- trunk/Source/WebCore/ChangeLog 2012-03-01 15:04:36 UTC (rev 109345)
+++ trunk/Source/WebCore/ChangeLog 2012-03-01 15:18:23 UTC (rev 109346)
@@ -1,3 +1,20 @@
+2012-03-01 Simon Hausmann <[email protected]>
+
+ [Qt] Remove dead style option code.
+ https://bugs.webkit.org/show_bug.cgi?id=80017
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ QtStyleOptionWebComboBox provides functionality (bool multiple()) that
+ is not called from anywhere (and the base class does not have it as a
+ virtual function).
+
+ * Target.pri:
+ * platform/qt/QtStyleOptionWebComboBox.h: Removed.
+ * platform/qt/RenderThemeQStyle.cpp:
+ (WebCore::RenderThemeQStyle::paintMenuList):
+ (WebCore::RenderThemeQStyle::paintMenuListButton):
+
2012-03-01 Stephen Chenney <[email protected]>
Crash in WebCore::SVGDocumentExtensions::removeAnimationElementFromTarget
Modified: trunk/Source/WebCore/Target.pri (109345 => 109346)
--- trunk/Source/WebCore/Target.pri 2012-03-01 15:04:36 UTC (rev 109345)
+++ trunk/Source/WebCore/Target.pri 2012-03-01 15:18:23 UTC (rev 109346)
@@ -2865,8 +2865,7 @@
}
contains(DEFINES, HAVE_QSTYLE=1) {
- HEADERS += platform/qt/QtStyleOptionWebComboBox.h \
- platform/qt/RenderThemeQStyle.h \
+ HEADERS += platform/qt/RenderThemeQStyle.h \
platform/qt/ScrollbarThemeQt.h
SOURCES += platform/qt/RenderThemeQStyle.cpp
}
Deleted: trunk/Source/WebCore/platform/qt/QtStyleOptionWebComboBox.h (109345 => 109346)
--- trunk/Source/WebCore/platform/qt/QtStyleOptionWebComboBox.h 2012-03-01 15:04:36 UTC (rev 109345)
+++ trunk/Source/WebCore/platform/qt/QtStyleOptionWebComboBox.h 2012-03-01 15:18:23 UTC (rev 109346)
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef QtStyleOptionWebComboBox_h
-#define QtStyleOptionWebComboBox_h
-
-#include "HTMLSelectElement.h"
-#include "RenderObject.h"
-#include "RenderThemeQt.h"
-
-#include <QStyleOption>
-
-namespace WebCore {
-
-class RenderObject;
-
-class QtStyleOptionWebComboBox : public QStyleOptionComboBox {
-public:
- QtStyleOptionWebComboBox(RenderObject* o)
- : QStyleOptionComboBox()
- , m_multiple(checkMultiple(o))
- {
- }
-
- bool multiple() const { return m_multiple; }
-
-private:
- bool m_multiple;
-
- bool checkMultiple(RenderObject* o)
- {
- if (RenderThemeQt::useMobileTheme())
- return false;
- HTMLSelectElement* select = o ? static_cast<HTMLSelectElement*>(o->node()) : 0;
- return select ? select->multiple() : false;
- }
-};
-
-}
-
-#endif // QtStyleOptionWebComboBox_h
Modified: trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp (109345 => 109346)
--- trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp 2012-03-01 15:04:36 UTC (rev 109345)
+++ trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp 2012-03-01 15:18:23 UTC (rev 109346)
@@ -47,7 +47,6 @@
#include "Page.h"
#include "PaintInfo.h"
#include "QWebPageClient.h"
-#include "QtStyleOptionWebComboBox.h"
#include "RenderBox.h"
#if ENABLE(PROGRESS_TAG)
#include "RenderProgress.h"
@@ -442,7 +441,7 @@
if (!p.isValid())
return true;
- QtStyleOptionWebComboBox opt(o);
+ QStyleOptionComboBox opt;
initStyleOption(p.widget, opt);
initializeCommonQStyleOptions(opt, o);
@@ -482,7 +481,7 @@
if (!p.isValid())
return true;
- QtStyleOptionWebComboBox option(o);
+ QStyleOptionComboBox option;
initStyleOption(p.widget, option);
initializeCommonQStyleOptions(option, o);
option.rect = r;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
