[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 8a766b210e1b4fc299b49befb76cae98a2662f77
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 14:22:32 2010 +0000

    2010-09-23  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            [WINCE] Remove usage of MemoryManager
            https://bugs.webkit.org/show_bug.cgi?id=46206
    
            MemoryManager does not provide any extra value, so remove it.
    
            * page/wince/FrameWinCE.cpp:
            (WebCore::imageFromSelection):
            * platform/graphics/wince/PlatformPathWinCE.cpp:
            (WebCore::drawPolygons):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68135 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c47e031..fbf938b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-23  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        [WINCE] Remove usage of MemoryManager
+        https://bugs.webkit.org/show_bug.cgi?id=46206
+
+        MemoryManager does not provide any extra value, so remove it.
+
+        * page/wince/FrameWinCE.cpp:
+        (WebCore::imageFromSelection):
+        * platform/graphics/wince/PlatformPathWinCE.cpp:
+        (WebCore::drawPolygons):
+
 2010-09-23  Darin Adler  <darin at apple.com>
 
         Reviewed by Chris Fleizach.
diff --git a/WebCore/page/wince/FrameWinCE.cpp b/WebCore/page/wince/FrameWinCE.cpp
index dfea864..9eb487b 100644
--- a/WebCore/page/wince/FrameWinCE.cpp
+++ b/WebCore/page/wince/FrameWinCE.cpp
@@ -129,11 +129,11 @@ HBITMAP imageFromSelection(Frame* frame, bool forceBlackText)
     }
 
     OwnPtr<HDC> bmpDC(CreateCompatibleDC(g_screenDC));
-    HBITMAP hBmp = MemoryManager::createCompatibleBitmap(g_screenDC, w, h);
+    HBITMAP hBmp = CreateCompatibleBitmap(g_screenDC, w, h);
     if (!hBmp)
         return 0;
 
-    HBITMAP hbmpOld = (HBITMAP)SelectObject(bmpDC.get(), hBmp);
+    HGDIOBJ hbmpOld = SelectObject(bmpDC.get(), hBmp);
 
     {
         GraphicsContext gc(bmpDC.get());
diff --git a/WebCore/platform/graphics/wince/PlatformPathWinCE.cpp b/WebCore/platform/graphics/wince/PlatformPathWinCE.cpp
index 4072a18..80e01a9 100644
--- a/WebCore/platform/graphics/wince/PlatformPathWinCE.cpp
+++ b/WebCore/platform/graphics/wince/PlatformPathWinCE.cpp
@@ -234,7 +234,6 @@ static void addArcPoints(PathPolygon& poly, const PlatformPathElement::ArcTo& da
 
 static void drawPolygons(HDC dc, const Vector<PathPolygon>& polygons, bool fill, const AffineTransform* transformation)
 {
-    MemoryAllocationCanFail canFail;
     for (Vector<PathPolygon>::const_iterator i = polygons.begin(); i != polygons.end(); ++i) {
         int npoints = i->size();
         if (!npoints)

-- 
WebKit Debian packaging