diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/win/PlatformScreenWin.cpp | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/win/PlatformScreenWin.cpp')
-rw-r--r-- | WebCore/platform/win/PlatformScreenWin.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/WebCore/platform/win/PlatformScreenWin.cpp b/WebCore/platform/win/PlatformScreenWin.cpp index 4af9e17..21fa10d 100644 --- a/WebCore/platform/win/PlatformScreenWin.cpp +++ b/WebCore/platform/win/PlatformScreenWin.cpp @@ -68,14 +68,18 @@ static DEVMODE deviceInfoForWidget(Widget* widget) int screenDepth(Widget* widget) { DEVMODE deviceInfo = deviceInfoForWidget(widget); + if (deviceInfo.dmBitsPerPel == 32) { + // Some video drivers return 32, but this function is supposed to ignore the alpha + // component. See <http://webkit.org/b/42972>. + return 24; + } return deviceInfo.dmBitsPerPel; } int screenDepthPerComponent(Widget* widget) { // FIXME: Assumes RGB -- not sure if this is right. - DEVMODE deviceInfo = deviceInfoForWidget(widget); - return deviceInfo.dmBitsPerPel / 3; + return screenDepth(widget) / 3; } bool screenIsMonochrome(Widget* widget) |