Modified: trunk/Source/_javascript_Core/API/JSClassRef.cpp (103156 => 103157)
--- trunk/Source/_javascript_Core/API/JSClassRef.cpp 2011-12-17 21:19:21 UTC (rev 103156)
+++ trunk/Source/_javascript_Core/API/JSClassRef.cpp 2011-12-17 23:17:26 UTC (rev 103157)
@@ -78,11 +78,8 @@
m_staticValues = adoptPtr(new OpaqueJSClassStaticValuesTable);
while (staticValue->name) {
UString valueName = tryCreateStringFromUTF8(staticValue->name);
- if (!valueName.isNull()) {
- // Use a local variable here to sidestep an RVCT compiler bug.
- OwnPtr<StaticValueEntry> entry = adoptPtr(new StaticValueEntry(staticValue->getProperty, staticValue->setProperty, staticValue->attributes));
- m_staticValues->set(valueName.impl(), entry.release());
- }
+ if (!valueName.isNull())
+ m_staticValues->set(valueName.impl(), adoptPtr(new StaticValueEntry(staticValue->getProperty, staticValue->setProperty, staticValue->attributes)));
++staticValue;
}
}
@@ -91,11 +88,8 @@
m_staticFunctions = adoptPtr(new OpaqueJSClassStaticFunctionsTable);
while (staticFunction->name) {
UString functionName = tryCreateStringFromUTF8(staticFunction->name);
- if (!functionName.isNull()) {
- // Use a local variable here to sidestep an RVCT compiler bug.
- OwnPtr<StaticFunctionEntry> entry = adoptPtr(new StaticFunctionEntry(staticFunction->callAsFunction, staticFunction->attributes));
- m_staticFunctions->set(functionName.impl(), entry.release());
- }
+ if (!functionName.isNull())
+ m_staticFunctions->set(functionName.impl(), adoptPtr(new StaticFunctionEntry(staticFunction->callAsFunction, staticFunction->attributes)));
++staticFunction;
}
}
@@ -154,9 +148,7 @@
OpaqueJSClassStaticValuesTable::const_iterator end = jsClass->m_staticValues->end();
for (OpaqueJSClassStaticValuesTable::const_iterator it = jsClass->m_staticValues->begin(); it != end; ++it) {
ASSERT(!it->first->isIdentifier());
- // Use a local variable here to sidestep an RVCT compiler bug.
- OwnPtr<StaticValueEntry> entry = adoptPtr(new StaticValueEntry(it->second->getProperty, it->second->setProperty, it->second->attributes));
- staticValues->add(StringImpl::create(it->first->characters(), it->first->length()), entry.release());
+ staticValues->add(StringImpl::create(it->first->characters(), it->first->length()), adoptPtr(new StaticValueEntry(it->second->getProperty, it->second->setProperty, it->second->attributes)));
}
}
@@ -165,9 +157,7 @@
OpaqueJSClassStaticFunctionsTable::const_iterator end = jsClass->m_staticFunctions->end();
for (OpaqueJSClassStaticFunctionsTable::const_iterator it = jsClass->m_staticFunctions->begin(); it != end; ++it) {
ASSERT(!it->first->isIdentifier());
- // Use a local variable here to sidestep an RVCT compiler bug.
- OwnPtr<StaticFunctionEntry> entry = adoptPtr(new StaticFunctionEntry(it->second->callAsFunction, it->second->attributes));
- staticFunctions->add(StringImpl::create(it->first->characters(), it->first->length()), entry.release());
+ staticFunctions->add(StringImpl::create(it->first->characters(), it->first->length()), adoptPtr(new StaticFunctionEntry(it->second->callAsFunction, it->second->attributes)));
}
}
}
Modified: trunk/Source/_javascript_Core/ChangeLog (103156 => 103157)
--- trunk/Source/_javascript_Core/ChangeLog 2011-12-17 21:19:21 UTC (rev 103156)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-12-17 23:17:26 UTC (rev 103157)
@@ -1,3 +1,17 @@
+2011-12-10 Andreas Kling <[email protected]>
+
+ OpaqueJSClass: Remove RVCT2 workarounds.
+ <http://webkit.org/b/74250>
+
+ Reviewed by Benjamin Poulain.
+
+ We no longer need workarounds for the RVCT2 compiler since it was
+ only used for the Symbian port of WebKit which is now defunct.
+
+ * API/JSClassRef.cpp:
+ (OpaqueJSClass::OpaqueJSClass):
+ (OpaqueJSClassContextData::OpaqueJSClassContextData):
+
2011-12-16 Benjamin Poulain <[email protected]>
Remove the duplicated code from ASCIICType.h
