Title: [126783] trunk/Source/WebCore
- Revision
- 126783
- Author
- [email protected]
- Date
- 2012-08-27 12:06:54 -0700 (Mon, 27 Aug 2012)
Log Message
Fix compilation when both OS(WINCE) and PLATFORM(QT) are true
https://bugs.webkit.org/show_bug.cgi?id=95050
Patch by Kevin Funk <[email protected]> on 2012-08-27
Reviewed by Simon Hausmann.
The compilation of NativeImagePtr.h breaks when both OS(WINCE) and PLATFORM(QT) are enabled.
This patch fixes this.
* platform/graphics/NativeImagePtr.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126782 => 126783)
--- trunk/Source/WebCore/ChangeLog 2012-08-27 19:01:22 UTC (rev 126782)
+++ trunk/Source/WebCore/ChangeLog 2012-08-27 19:06:54 UTC (rev 126783)
@@ -1,3 +1,15 @@
+2012-08-27 Kevin Funk <[email protected]>
+
+ Fix compilation when both OS(WINCE) and PLATFORM(QT) are true
+ https://bugs.webkit.org/show_bug.cgi?id=95050
+
+ Reviewed by Simon Hausmann.
+
+ The compilation of NativeImagePtr.h breaks when both OS(WINCE) and PLATFORM(QT) are enabled.
+ This patch fixes this.
+
+ * platform/graphics/NativeImagePtr.h:
+
2012-08-27 Tommy Widenflycht <[email protected]>
MediaStream API: Fix review comments from patch #93119
Modified: trunk/Source/WebCore/platform/graphics/NativeImagePtr.h (126782 => 126783)
--- trunk/Source/WebCore/platform/graphics/NativeImagePtr.h 2012-08-27 19:01:22 UTC (rev 126782)
+++ trunk/Source/WebCore/platform/graphics/NativeImagePtr.h 2012-08-27 19:06:54 UTC (rev 126783)
@@ -52,6 +52,8 @@
#if USE(CG)
typedef CGImageRef NativeImagePtr;
+#elif PLATFORM(QT)
+typedef QImage* NativeImagePtr;
#elif PLATFORM(OPENVG)
class TiledImageOpenVG;
typedef TiledImageOpenVG* NativeImagePtr;
@@ -69,8 +71,6 @@
typedef RefPtr<SharedBitmap> NativeImagePtr;
#elif PLATFORM(BLACKBERRY)
typedef void* NativeImagePtr;
-#elif PLATFORM(QT)
-typedef QImage* NativeImagePtr;
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
