Title: [90062] trunk/Source/WebCore
- Revision
- 90062
- Author
- [email protected]
- Date
- 2011-06-29 16:42:03 -0700 (Wed, 29 Jun 2011)
Log Message
Speculative WinCE build correction after r90057.
* CMakeListsWinCE.txt: Roll back r90061, since GetWorldTransform
is not available in WinCE.
* platform/win/ScrollbarThemeWin.cpp: Conditionally exclude calls
to DIBPixelData::setRGBABitmapAlpha for WinCE.
(WebCore::ScrollbarThemeWin::paintTrackPiece):
(WebCore::ScrollbarThemeWin::paintButton):
(WebCore::ScrollbarThemeWin::paintThumb):
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeListsWinCE.txt (90061 => 90062)
--- trunk/Source/WebCore/CMakeListsWinCE.txt 2011-06-29 23:27:25 UTC (rev 90061)
+++ trunk/Source/WebCore/CMakeListsWinCE.txt 2011-06-29 23:42:03 UTC (rev 90062)
@@ -89,7 +89,6 @@
platform/graphics/opentype/OpenTypeUtilities.cpp
- platform/graphics/win/DIBPixelData.cpp
platform/graphics/win/GDIExtras.cpp
platform/graphics/win/IconWin.cpp
platform/graphics/win/ImageWin.cpp
Modified: trunk/Source/WebCore/ChangeLog (90061 => 90062)
--- trunk/Source/WebCore/ChangeLog 2011-06-29 23:27:25 UTC (rev 90061)
+++ trunk/Source/WebCore/ChangeLog 2011-06-29 23:42:03 UTC (rev 90062)
@@ -2,6 +2,18 @@
Speculative WinCE build correction after r90057.
+ * CMakeListsWinCE.txt: Roll back r90061, since GetWorldTransform
+ is not available in WinCE.
+ * platform/win/ScrollbarThemeWin.cpp: Conditionally exclude calls
+ to DIBPixelData::setRGBABitmapAlpha for WinCE.
+ (WebCore::ScrollbarThemeWin::paintTrackPiece):
+ (WebCore::ScrollbarThemeWin::paintButton):
+ (WebCore::ScrollbarThemeWin::paintThumb):
+
+2011-06-29 Brent Fulgham <[email protected]>
+
+ Speculative WinCE build correction after r90057.
+
* CMakeListsWinCE.txt: Add missing DIBPixelData.cpp to
WinCE build to support setting bitmap image alpha value.
Modified: trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp (90061 => 90062)
--- trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2011-06-29 23:27:25 UTC (rev 90061)
+++ trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2011-06-29 23:42:03 UTC (rev 90062)
@@ -270,8 +270,10 @@
}
}
+#if OS(WINCE)
if (!alphaBlend && !context->inTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(windowsContext.hdc(), rect, 255);
+#endif
}
void ScrollbarThemeWin::paintButton(GraphicsContext* context, Scrollbar* scrollbar, const IntRect& rect, ScrollbarPart part)
@@ -322,8 +324,10 @@
else
::DrawFrameControl(windowsContext.hdc(), &themeRect, DFC_SCROLL, classicState);
+#if OS(WINCE)
if (!alphaBlend && !context->inTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(windowsContext.hdc(), rect, 255);
+#endif
}
static IntRect gripperRect(int thickness, const IntRect& thumbRect)
@@ -379,8 +383,10 @@
} else
::DrawEdge(hdc, &themeRect, EDGE_RAISED, BF_RECT | BF_MIDDLE);
+#if OS(WINCE)
if (!alphaBlend && !context->inTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(hdc, rect, 255);
+#endif
context->releaseWindowsContext(hdc, rect, alphaBlend);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
