Title: [126420] trunk/Source/WebCore
- Revision
- 126420
- Author
- [email protected]
- Date
- 2012-08-23 06:11:33 -0700 (Thu, 23 Aug 2012)
Log Message
Unreviewed trivial build fix for Qt/Mac on OS X 10.6: Avoid using an
enum value that clashes with an existing class name that's used in the
same file.
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::valueRealType):
(JSC::Bindings::convertValueToQVariant):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126419 => 126420)
--- trunk/Source/WebCore/ChangeLog 2012-08-23 13:04:48 UTC (rev 126419)
+++ trunk/Source/WebCore/ChangeLog 2012-08-23 13:11:33 UTC (rev 126420)
@@ -1,3 +1,13 @@
+2012-08-23 Simon Hausmann <[email protected]>
+
+ Unreviewed trivial build fix for Qt/Mac on OS X 10.6: Avoid using an
+ enum value that clashes with an existing class name that's used in the
+ same file.
+
+ * bridge/qt/qt_runtime.cpp:
+ (JSC::Bindings::valueRealType):
+ (JSC::Bindings::convertValueToQVariant):
+
2012-08-22 Patrick Gansterer <[email protected]>
Build fix for WinCE after r126359.
Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.cpp (126419 => 126420)
--- trunk/Source/WebCore/bridge/qt/qt_runtime.cpp 2012-08-23 13:04:48 UTC (rev 126419)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.cpp 2012-08-23 13:11:33 UTC (rev 126420)
@@ -104,7 +104,7 @@
Object,
Null,
RTArray,
- JSUint8ClampedArray
+ RTUint8ClampedArray
} JSRealType;
#if defined(QTWK_RUNTIME_CONVERSION_DEBUG) || defined(QTWK_RUNTIME_MATCH_DEBUG)
@@ -162,7 +162,7 @@
else if (val.isNull())
return Null;
else if (isJSUint8ClampedArray(val))
- return JSUint8ClampedArray;
+ return RTUint8ClampedArray;
else if (val.isObject()) {
JSObject *object = val.toObject(exec);
if (object->inherits(&RuntimeArray::s_info)) // RuntimeArray 'inherits' from Array, but not in C++
@@ -264,7 +264,7 @@
case QObj:
hint = QMetaType::QObjectStar;
break;
- case JSUint8ClampedArray:
+ case RTUint8ClampedArray:
hint = QMetaType::QByteArray;
break;
case Array:
@@ -484,7 +484,7 @@
}
case QMetaType::QByteArray: {
- if (type == JSUint8ClampedArray) {
+ if (type == RTUint8ClampedArray) {
WTF::Uint8ClampedArray* arr = toUint8ClampedArray(value);
ret = QVariant(QByteArray(reinterpret_cast<const char*>(arr->data()), arr->length()));
dist = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
