Title: [119706] trunk/Source/WebCore
- Revision
- 119706
- Author
- [email protected]
- Date
- 2012-06-07 04:49:06 -0700 (Thu, 07 Jun 2012)
Log Message
[Qt][Win] Use OS(WINDOWS) instead of Q_WS_WIN in WebCore/platform/graphics/GraphicsContext.h
https://bugs.webkit.org/show_bug.cgi?id=88305
Reviewed by Simon Hausmann.
* platform/graphics/GraphicsContext.h: Buildfix.
(GraphicsContext):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (119705 => 119706)
--- trunk/Source/WebCore/ChangeLog 2012-06-07 11:45:20 UTC (rev 119705)
+++ trunk/Source/WebCore/ChangeLog 2012-06-07 11:49:06 UTC (rev 119706)
@@ -1,3 +1,13 @@
+2012-06-07 Csaba Osztrogonác <[email protected]>
+
+ [Qt][Win] Use OS(WINDOWS) instead of Q_WS_WIN in WebCore/platform/graphics/GraphicsContext.h
+ https://bugs.webkit.org/show_bug.cgi?id=88305
+
+ Reviewed by Simon Hausmann.
+
+ * platform/graphics/GraphicsContext.h: Buildfix.
+ (GraphicsContext):
+
2012-06-07 Shinya Kawanaka <[email protected]>
Incorrect data retrieved in calls to get selection data in client->textWillBeReplaced from CharacterData::setDataAndUpdate
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (119705 => 119706)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2012-06-07 11:45:20 UTC (rev 119705)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2012-06-07 11:49:06 UTC (rev 119706)
@@ -96,7 +96,7 @@
#endif
#endif
-#if PLATFORM(QT) && defined(Q_WS_WIN)
+#if PLATFORM(QT) && OS(WINDOWS)
#include <windows.h>
#endif
@@ -488,7 +488,7 @@
void drawWindowsBitmap(WindowsBitmap*, const IntPoint&);
#endif
-#if (PLATFORM(QT) && defined(Q_WS_WIN)) || (PLATFORM(WX) && OS(WINDOWS))
+#if (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(WX) && OS(WINDOWS))
HDC getWindowsContext(const IntRect&, bool supportAlphaBlend = true, bool mayCreateBitmap = true);
void releaseWindowsContext(HDC, const IntRect&, bool supportAlphaBlend = true, bool mayCreateBitmap = true);
bool shouldIncludeChildWindows() const { return false; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
