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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit eec9b6cb98b3cd49b10d7dfd0d519efce2ae3282
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 14:05:06 2010 +0000

    2010-09-10  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Adam Roben.
    
            [WINCE] Remove ImageBuffer::toDataURL implementation
            https://bugs.webkit.org/show_bug.cgi?id=45478
    
            At the moment ImageBuffer::toDataURL uses JPEGEncoder.h and PNGEncoder.h.
            Both files are not in the repository. So remove the implementation for now.
    
            * platform/graphics/wince/ImageBufferWince.cpp:
            (WebCore::ImageBuffer::toDataURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67197 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f8a547..d0327e9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-10  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Adam Roben.
+
+        [WINCE] Remove ImageBuffer::toDataURL implementation
+        https://bugs.webkit.org/show_bug.cgi?id=45478
+
+        At the moment ImageBuffer::toDataURL uses JPEGEncoder.h and PNGEncoder.h.
+        Both files are not in the repository. So remove the implementation for now.
+
+        * platform/graphics/wince/ImageBufferWince.cpp:
+        (WebCore::ImageBuffer::toDataURL):
+
 2010-09-10  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Antonio Gomes.
diff --git a/WebCore/platform/graphics/wince/ImageBufferWince.cpp b/WebCore/platform/graphics/wince/ImageBufferWince.cpp
index 10e502d..1843a56 100644
--- a/WebCore/platform/graphics/wince/ImageBufferWince.cpp
+++ b/WebCore/platform/graphics/wince/ImageBufferWince.cpp
@@ -25,9 +25,7 @@
 #include "GraphicsContext.h"
 #include "Image.h"
 #include "ImageData.h"
-#include "JPEGEncoder.h"
 #include "NotImplemented.h"
-#include "PNGEncoder.h"
 #include "SharedBitmap.h"
 #include "UnusedParam.h"
 #include <wtf/UnusedParam.h>
@@ -250,28 +248,8 @@ String ImageBuffer::toDataURL(const String& mimeType, const double*) const
     if (!m_data.m_bitmap->bytes())
         return "data:,";
 
-    Vector<char> output;
-    const char* header;
-    if (mimeType.lower() == "image/png") {
-        if (!compressBitmapToPng(m_data.m_bitmap.get(), output))
-            return "data:,";
-        header = "data:image/png;base64,";
-    } else {
-        if (!compressBitmapToJpeg(m_data.m_bitmap.get(), output))
-            return "data:,";
-        header = "data:image/jpeg;base64,";
-    }
-
-    Vector<char> base64;
-    base64Encode(output, base64);
-
-    output.clear();
-
-    Vector<char> url;
-    url.append(header, strlen(header));
-    url.append(base64);
-
-    return String(url.data(), url.size());
+    notImplemented();
+    return String();
 }
 
 }

-- 
WebKit Debian packaging