- Revision
- 149284
- Author
- [email protected]
- Date
- 2013-04-29 08:04:10 -0700 (Mon, 29 Apr 2013)
Log Message
Remove OS(WINCE) from (Render|Scrollbar)ThemeWin.cpp
https://bugs.webkit.org/show_bug.cgi?id=115348
Reviewed by Andreas Kling.
Compile DIBPixelData.cpp on Windows CE too, which allows us
to get rid of a few #if OS(WINCE) in other code parts.
* PlatformWinCE.cmake:
* platform/graphics/win/DIBPixelData.cpp:
(WebCore::DIBPixelData::setRGBABitmapAlpha):
* platform/win/ScrollbarThemeWin.cpp:
(WebCore::ScrollbarThemeWin::paintTrackPiece):
(WebCore::ScrollbarThemeWin::paintButton):
(WebCore::ScrollbarThemeWin::paintThumb):
* rendering/RenderThemeWin.cpp:
(WebCore::drawControl):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149283 => 149284)
--- trunk/Source/WebCore/ChangeLog 2013-04-29 14:55:05 UTC (rev 149283)
+++ trunk/Source/WebCore/ChangeLog 2013-04-29 15:04:10 UTC (rev 149284)
@@ -1,3 +1,23 @@
+2013-04-29 Patrick Gansterer <[email protected]>
+
+ Remove OS(WINCE) from (Render|Scrollbar)ThemeWin.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=115348
+
+ Reviewed by Andreas Kling.
+
+ Compile DIBPixelData.cpp on Windows CE too, which allows us
+ to get rid of a few #if OS(WINCE) in other code parts.
+
+ * PlatformWinCE.cmake:
+ * platform/graphics/win/DIBPixelData.cpp:
+ (WebCore::DIBPixelData::setRGBABitmapAlpha):
+ * platform/win/ScrollbarThemeWin.cpp:
+ (WebCore::ScrollbarThemeWin::paintTrackPiece):
+ (WebCore::ScrollbarThemeWin::paintButton):
+ (WebCore::ScrollbarThemeWin::paintThumb):
+ * rendering/RenderThemeWin.cpp:
+ (WebCore::drawControl):
+
2013-04-29 Eli Fidler <[email protected]>
[BlackBerry] Fake-bold monospace fonts need to use non-fake-bold advances
Modified: trunk/Source/WebCore/PlatformWinCE.cmake (149283 => 149284)
--- trunk/Source/WebCore/PlatformWinCE.cmake 2013-04-29 14:55:05 UTC (rev 149283)
+++ trunk/Source/WebCore/PlatformWinCE.cmake 2013-04-29 15:04:10 UTC (rev 149284)
@@ -81,6 +81,7 @@
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/platform/graphics/win/DIBPixelData.cpp (149283 => 149284)
--- trunk/Source/WebCore/platform/graphics/win/DIBPixelData.cpp 2013-04-29 14:55:05 UTC (rev 149283)
+++ trunk/Source/WebCore/platform/graphics/win/DIBPixelData.cpp 2013-04-29 15:04:10 UTC (rev 149284)
@@ -90,11 +90,13 @@
DIBPixelData pixelData(bitmap);
ASSERT(pixelData.bitsPerPixel() == 32);
+ IntRect drawRect(dstRect);
+#if !OS(WINCE)
XFORM trans;
GetWorldTransform(hdc, &trans);
IntSize transformedPosition(trans.eDx, trans.eDy);
- IntRect drawRect(dstRect);
drawRect.move(transformedPosition);
+#endif
int pixelDataWidth = pixelData.size().width();
int pixelDataHeight = pixelData.size().height();
Modified: trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp (149283 => 149284)
--- trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2013-04-29 14:55:05 UTC (rev 149283)
+++ trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2013-04-29 15:04:10 UTC (rev 149284)
@@ -270,10 +270,8 @@
}
}
-#if !OS(WINCE)
if (!alphaBlend && !context->isInTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(windowsContext.hdc(), rect, 255);
-#endif
}
void ScrollbarThemeWin::paintButton(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part)
@@ -324,10 +322,8 @@
else
::DrawFrameControl(windowsContext.hdc(), &themeRect, DFC_SCROLL, classicState);
-#if !OS(WINCE)
if (!alphaBlend && !context->isInTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(windowsContext.hdc(), rect, 255);
-#endif
}
static IntRect gripperRect(int thickness, const IntRect& thumbRect)
@@ -383,10 +379,8 @@
} else
::DrawEdge(windowsContext.hdc(), &themeRect, EDGE_RAISED, BF_RECT | BF_MIDDLE);
-#if !OS(WINCE)
if (!alphaBlend && !context->isInTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(windowsContext.hdc(), rect, 255);
-#endif
}
}
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (149283 => 149284)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-04-29 14:55:05 UTC (rev 149283)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-04-29 15:04:10 UTC (rev 149284)
@@ -675,11 +675,8 @@
}
}
-
-#if !OS(WINCE)
if (!alphaBlend && !context->isInTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(windowsContext.hdc(), r, 255);
-#endif
}
bool RenderThemeWin::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& r)
