2009-06-10 Simon Hausmann <simon.hausmann@nokia.com>

        Fix the Qt build.

        ImageDecoderQt needs m_size and m_sizeAvailable to be protected.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@44562 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 487d656..23e47fe 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-10  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Fix the Qt build.
+
+        ImageDecoderQt needs m_size and m_sizeAvailable to be protected.
+
+        * platform/image-decoders/ImageDecoder.h:
+

 2009-06-10  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         Reviewed by Simon Hausmann.
 2009-06-10  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         Reviewed by Simon Hausmann.

diff --git a/WebCore/platform/image-decoders/ImageDecoder.h b/WebCore/platform/image-decoders/ImageDecoder.h
index 23660e0..21ee08f 100644 (file)
--- a/WebCore/platform/image-decoders/ImageDecoder.h
+++ b/WebCore/platform/image-decoders/ImageDecoder.h
@@ -220,6 +220,8 @@ namespace WebCore {
         RefPtr<SharedBuffer> m_data; // The encoded data.
         Vector<RGBA32Buffer> m_frameBufferCache;
         mutable bool m_failed;
         RefPtr<SharedBuffer> m_data; // The encoded data.
         Vector<RGBA32Buffer> m_frameBufferCache;
         mutable bool m_failed;

+        IntSize m_size;
+        bool m_sizeAvailable;

 
     private:
         // Some code paths compute the size of the image as "width * height * 4"
 
     private:
         // Some code paths compute the size of the image as "width * height * 4"


@@ -232,9 +234,6 @@ namespace WebCore {
                                           * static_cast<unsigned long long>(height);
             return total_size > ((1 << 29) - 1);
         }
                                           * static_cast<unsigned long long>(height);
             return total_size > ((1 << 29) - 1);
         }

-
-        IntSize m_size;
-        bool m_sizeAvailable;

     };
 
 } // namespace WebCore
     };
 
 } // namespace WebCore