[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 55aa31ac5497fb588bf0a6112105492fa7887bbd
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 23 18:58:55 2010 +0000

    2010-10-23  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by David Kilzer.
    
            [WINCE] Rename SharedBitmap::createInstance to SharedBitmap::create
            https://bugs.webkit.org/show_bug.cgi?id=48180
    
            Also use better arguments for the create function.
    
            * platform/graphics/wince/GraphicsContextWinCE.cpp:
            (WebCore::GraphicsContextPlatformPrivate::getTransparentLayerBitmap):
            (WebCore::TransparentLayerDC::TransparentLayerDC):
            (WebCore::GraphicsContext::drawFrameControl):
            * platform/graphics/wince/ImageBufferWinCE.cpp:
            (WebCore::ImageBufferData::ImageBufferData):
            * platform/graphics/wince/ImageWinCE.cpp:
            (WebCore::RGBA32Buffer::asNewNativeImage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70397 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 667559a..61676ac 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-23  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by David Kilzer.
+
+        [WINCE] Rename SharedBitmap::createInstance to SharedBitmap::create
+        https://bugs.webkit.org/show_bug.cgi?id=48180
+
+        Also use better arguments for the create function.
+
+        * platform/graphics/wince/GraphicsContextWinCE.cpp:
+        (WebCore::GraphicsContextPlatformPrivate::getTransparentLayerBitmap):
+        (WebCore::TransparentLayerDC::TransparentLayerDC):
+        (WebCore::GraphicsContext::drawFrameControl):
+        * platform/graphics/wince/ImageBufferWinCE.cpp:
+        (WebCore::ImageBufferData::ImageBufferData):
+        * platform/graphics/wince/ImageWinCE.cpp:
+        (WebCore::RGBA32Buffer::asNewNativeImage):
+
 2010-10-23  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Unreviewed, rolling out r70369.
diff --git a/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp b/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
index 1633c26..a11b8d8 100644
--- a/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
+++ b/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
@@ -283,7 +283,7 @@ public:
                     return 0;
             }
 
-            RefPtr<SharedBitmap> bmp = SharedBitmap::createInstance(alphaPaint == AlphaPaintNone, origRect.width(), origRect.height(), false);
+            RefPtr<SharedBitmap> bmp = SharedBitmap::create(origRect.size(), alphaPaint == AlphaPaintNone ? BitmapInfo::BitCount16 : BitmapInfo::BitCount32, false);
             SetRect(&bmpRect, 0, 0, origRect.width(), origRect.height());
             if (bmp) {
                 switch (alphaPaint) {
@@ -523,7 +523,7 @@ TransparentLayerDC::TransparentLayerDC(GraphicsContextPlatformPrivate* data, Int
             origRect.inflateX(stableRound((width - origRect.width()) * 0.5));
             origRect.inflateY(stableRound((height - origRect.height()) * 0.5));
 
-            m_bitmap = SharedBitmap::createInstance(m_rotatedBitmap->is16bit(), m_origRect.width(), m_origRect.height(), true);
+            m_bitmap = SharedBitmap::create(m_origRect.size(), m_rotatedBitmap->is16bit() ? BitmapInfo::BitCount16 : BitmapInfo::BitCount32, true);
             if (m_bitmap)
                 rotateBitmap(m_bitmap.get(), m_rotatedBitmap.get(), -m_rotation);
             else
@@ -1777,7 +1777,7 @@ void GraphicsContext::drawFrameControl(const IntRect& rect, unsigned type, unsig
     RECT rectWin = trRect;
 
     if ((rectWin.right - rectWin.left) < boxWidthBest) {
-        RefPtr<SharedBitmap> bmp = SharedBitmap::createInstance(true, boxWidthBest, boxHeightBest, true);
+        RefPtr<SharedBitmap> bmp = SharedBitmap::create(IntSize(boxWidthBest, boxHeightBest), BitmapInfo::BitCount16, true);
         SharedBitmap::DCHolder memDC(bmp.get());
         if (memDC.get()) {
             RECT tempRect = {0, 0, boxWidthBest, boxHeightBest};
diff --git a/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp b/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp
index 147198c..ec8517b 100644
--- a/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp
+++ b/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp
@@ -64,7 +64,7 @@ void BufferedImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect
 }
 
 ImageBufferData::ImageBufferData(const IntSize& size)
-: m_bitmap(SharedBitmap::createInstance(false, size.width(), size.height(), false))
+    : m_bitmap(SharedBitmap::create(size, BitmapInfo::BitCount32, false))
 {
     // http://www.w3.org/TR/2009/WD-html5-20090212/the-canvas-element.html#canvaspixelarray
     // "When the canvas is initialized it must be set to fully transparent black."
diff --git a/WebCore/platform/graphics/wince/ImageWinCE.cpp b/WebCore/platform/graphics/wince/ImageWinCE.cpp
index 53b9b68..ec7403e 100644
--- a/WebCore/platform/graphics/wince/ImageWinCE.cpp
+++ b/WebCore/platform/graphics/wince/ImageWinCE.cpp
@@ -43,11 +43,7 @@ namespace WebCore {
 
 NativeImagePtr RGBA32Buffer::asNewNativeImage() const
 {
-    NativeImagePtr image = SharedBitmap::createInstance(false, width(), height(), false);
-
-    memcpy(image->bytes(), m_bytes.data(), m_bytes.size() * sizeof(PixelData));
-
-    return image;
+    return SharedBitmap::create(m_bytes, m_size, hasAlpha());
 }
 
 bool FrameData::clear(bool clearMetaData)

-- 
WebKit Debian packaging