[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 14:52:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit dc828cd1e4b5ef8db4b900bd7a569ff9ae63973e
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 22 19:31:17 2010 +0000
2010-10-22 Patrick Gansterer <paroga at webkit.org>
Reviewed by Adam Roben.
[WINCE] Implement GraphicsContext::(get|release)WindowsContext
https://bugs.webkit.org/show_bug.cgi?id=48136
* platform/graphics/wince/GraphicsContextWinCE.cpp:
(WebCore::GraphicsContext::getWindowsContext):
(WebCore::GraphicsContext::releaseWindowsContext):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70325 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6a3ebc8..ba1c948 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-22 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Adam Roben.
+
+ [WINCE] Implement GraphicsContext::(get|release)WindowsContext
+ https://bugs.webkit.org/show_bug.cgi?id=48136
+
+ * platform/graphics/wince/GraphicsContextWinCE.cpp:
+ (WebCore::GraphicsContext::getWindowsContext):
+ (WebCore::GraphicsContext::releaseWindowsContext):
+
2010-10-22 Adam Roben <aroben at apple.com>
Attempt to fix the Windows build
diff --git a/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp b/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
index a0c10fc..1633c26 100644
--- a/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
+++ b/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
@@ -608,15 +608,13 @@ void GraphicsContext::setBitmap(PassRefPtr<SharedBitmap> bmp)
HDC GraphicsContext::getWindowsContext(const IntRect& dstRect, bool supportAlphaBlend, bool mayCreateBitmap)
{
- notImplemented();
- ASSERT_NOT_REACHED();
- return 0;
+ // FIXME: Add support for AlphaBlend.
+ ASSERT(!supportAlphaBlend);
+ return m_data->m_dc;
}
void GraphicsContext::releaseWindowsContext(HDC hdc, const IntRect& dstRect, bool supportAlphaBlend, bool mayCreateBitmap)
{
- notImplemented();
- ASSERT_NOT_REACHED();
}
void GraphicsContext::savePlatformState()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list