Title: [88361] trunk/Source/WebCore
- Revision
- 88361
- Author
- caio.olive...@openbossa.org
- Date
- 2011-06-08 11:12:15 -0700 (Wed, 08 Jun 2011)
Log Message
2011-06-08 Caio Marcelo de Oliveira Filho <caio.olive...@openbossa.org>
Reviewed by Andreas Kling.
[Qt] Remove dead code from our JSC bridge
https://bugs.webkit.org/show_bug.cgi?id=62287
The m_defaultMethod member is not used since r36848 and QtMethod
was replaced by QtRuntimeMethod and subclasses in r29729.
* bridge/qt/qt_instance.cpp:
(JSC::Bindings::QtInstance::removeCachedMethod):
(JSC::Bindings::QtInstance::visitAggregate):
* bridge/qt/qt_instance.h:
* bridge/qt/qt_runtime.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (88360 => 88361)
--- trunk/Source/WebCore/ChangeLog 2011-06-08 18:04:43 UTC (rev 88360)
+++ trunk/Source/WebCore/ChangeLog 2011-06-08 18:12:15 UTC (rev 88361)
@@ -1,3 +1,19 @@
+2011-06-08 Caio Marcelo de Oliveira Filho <caio.olive...@openbossa.org>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Remove dead code from our JSC bridge
+ https://bugs.webkit.org/show_bug.cgi?id=62287
+
+ The m_defaultMethod member is not used since r36848 and QtMethod
+ was replaced by QtRuntimeMethod and subclasses in r29729.
+
+ * bridge/qt/qt_instance.cpp:
+ (JSC::Bindings::QtInstance::removeCachedMethod):
+ (JSC::Bindings::QtInstance::visitAggregate):
+ * bridge/qt/qt_instance.h:
+ * bridge/qt/qt_runtime.h:
+
2011-06-08 Ryan Sleevi <rsle...@chromium.org>
Reviewed by Tony Chang.
Modified: trunk/Source/WebCore/bridge/qt/qt_instance.cpp (88360 => 88361)
--- trunk/Source/WebCore/bridge/qt/qt_instance.cpp 2011-06-08 18:04:43 UTC (rev 88360)
+++ trunk/Source/WebCore/bridge/qt/qt_instance.cpp 2011-06-08 18:12:15 UTC (rev 88361)
@@ -151,9 +151,6 @@
void QtInstance::removeCachedMethod(JSObject* method)
{
- if (m_defaultMethod.get() == method)
- m_defaultMethod.clear();
-
for (QHash<QByteArray, WriteBarrier<JSObject> >::Iterator it = m_methods.begin(), end = m_methods.end(); it != end; ++it) {
if (it.value().get() == method) {
m_methods.erase(it);
@@ -190,8 +187,6 @@
void QtInstance::visitAggregate(SlotVisitor& visitor)
{
- if (m_defaultMethod)
- visitor.append(&m_defaultMethod);
for (QHash<QByteArray, WriteBarrier<JSObject> >::Iterator it = m_methods.begin(), end = m_methods.end(); it != end; ++it)
visitor.append(&it.value());
}
Modified: trunk/Source/WebCore/bridge/qt/qt_instance.h (88360 => 88361)
--- trunk/Source/WebCore/bridge/qt/qt_instance.h 2011-06-08 18:04:43 UTC (rev 88360)
+++ trunk/Source/WebCore/bridge/qt/qt_instance.h 2011-06-08 18:12:15 UTC (rev 88361)
@@ -98,7 +98,6 @@
QObject* m_hashkey;
mutable QHash<QByteArray, WriteBarrier<JSObject> > m_methods;
mutable QHash<QString, QtField*> m_fields;
- mutable WriteBarrier<QtRuntimeMetaMethod> m_defaultMethod;
QScriptEngine::ValueOwnership m_ownership;
};
Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.h (88360 => 88361)
--- trunk/Source/WebCore/bridge/qt/qt_runtime.h 2011-06-08 18:04:43 UTC (rev 88360)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.h 2011-06-08 18:12:15 UTC (rev 88361)
@@ -73,28 +73,6 @@
};
-class QtMethod : public Method
-{
-public:
- QtMethod(const QMetaObject *mo, int i, const QByteArray &ident, int numParameters)
- : m_metaObject(mo),
- m_index(i),
- m_identifier(ident),
- m_nParams(numParameters)
- { }
-
- virtual const char* name() const { return m_identifier.constData(); }
- virtual int numParameters() const { return m_nParams; }
-
-private:
- friend class QtInstance;
- const QMetaObject *m_metaObject;
- int m_index;
- QByteArray m_identifier;
- int m_nParams;
-};
-
-
template <typename T> class QtArray : public Array
{
public:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
