[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

jparent at chromium.org jparent at chromium.org
Fri Feb 26 22:21:28 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit c39a2073ca806d70f881b8211eb04499b52504ef
Author: jparent at chromium.org <jparent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 16 22:56:50 2010 +0000

    Unreviewed: Chromium build fix.
    
    http://trac.webkit.org/changeset/54823 introduced an unused variable.  Remove it.
    
    * platform/image-decoders/ImageDecoder.cpp:
    (WebCore::ImageDecoder::create):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54836 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 08fb4ad..cdec43d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-16  Julie Parent  <jparent at chromium.org>
+
+        Unreviewed: Chromium build fix.
+
+        http://trac.webkit.org/changeset/54823 introduced an unused variable.  Remove it.
+
+        * platform/image-decoders/ImageDecoder.cpp:
+        (WebCore::ImageDecoder::create):
+
 2010-02-16  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp
index 2acf98e..cc62126 100644
--- a/WebCore/platform/image-decoders/ImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/ImageDecoder.cpp
@@ -62,8 +62,6 @@ ImageDecoder* ImageDecoder::create(const SharedBuffer& data)
     if (length < maxMarkerLength)
         return 0;
 
-    const unsigned char* uContents = reinterpret_cast<const unsigned char*>(contents);
-
     // GIFs begin with GIF8(7 or 9).
     if (strncmp(contents, "GIF8", 4) == 0)
         return new GIFImageDecoder();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list