[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 d58f8c6fe4b72d0c939b1fcd1e40af098b319ebf
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 30 19:31:52 2010 +0000

    2010-10-30  Patrick Gansterer  <paroga at webkit.org>
    
            Unreviewed, build fix after r70846.
    
            * platform/graphics/wince/ImageWinCE.cpp:
            (WebCore::RGBA32Buffer::asNewNativeImage):
    2010-10-30  Patrick Gansterer  <paroga at webkit.org>
    
            Unreviewed, build fix after r70574.
    
            * WebCoreSupport/FrameLoaderClientWinCE.cpp:
            (WebKit::FrameLoaderClientWinCE::transferLoadingResourceFromPage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70986 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b2bd971..074bf24 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-30  Patrick Gansterer  <paroga at webkit.org>
+
+        Unreviewed, build fix after r70846.
+
+        * platform/graphics/wince/ImageWinCE.cpp:
+        (WebCore::RGBA32Buffer::asNewNativeImage):
+
 2010-10-30  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Unreviewed, rolling out r70984.
diff --git a/WebCore/platform/graphics/wince/ImageWinCE.cpp b/WebCore/platform/graphics/wince/ImageWinCE.cpp
index ec7403e..c0b2b53 100644
--- a/WebCore/platform/graphics/wince/ImageWinCE.cpp
+++ b/WebCore/platform/graphics/wince/ImageWinCE.cpp
@@ -43,7 +43,7 @@ namespace WebCore {
 
 NativeImagePtr RGBA32Buffer::asNewNativeImage() const
 {
-    return SharedBitmap::create(m_bytes, m_size, hasAlpha());
+    return SharedBitmap::create(m_backingStore, m_size, hasAlpha());
 }
 
 bool FrameData::clear(bool clearMetaData)
diff --git a/WebKit/wince/ChangeLog b/WebKit/wince/ChangeLog
index bbf5d59..bfe70b3 100644
--- a/WebKit/wince/ChangeLog
+++ b/WebKit/wince/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-30  Patrick Gansterer  <paroga at webkit.org>
+
+        Unreviewed, build fix after r70574.
+
+        * WebCoreSupport/FrameLoaderClientWinCE.cpp:
+        (WebKit::FrameLoaderClientWinCE::transferLoadingResourceFromPage):
+
 2010-10-29  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp b/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
index 0b95213..f3643b2 100644
--- a/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
+++ b/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
@@ -165,7 +165,7 @@ void FrameLoaderClientWinCE::didTransferChildFrameToNewDocument(Page*)
 {
 }
 
-void FrameLoaderClientWinCE::transferLoadingResourceFromPage(unsigned long, DocumentLoader*, const ResourceRequest&, Page*)
+void FrameLoaderClientWinCE::transferLoadingResourceFromPage(unsigned long, DocumentLoader*, const WebCore::ResourceRequest&, Page*)
 {
 }
 

-- 
WebKit Debian packaging