Changeset 47938 in webkit

Timestamp:

Sep 1, 2009 9:12:23 AM (15 years ago)

Author:

pkasting@chromium.org

Message:

Unreviewed (build fix).

Try to fix Qt build, take 2. The Qt code had what looks like a
broken virtual function override.

• platform/graphics/qt/ImageDecoderQt.cpp:

(WebCore::ImageDecoderQt::ReadContext::ReadContext):
(WebCore::ImageDecoderQt::setData):

• platform/graphics/qt/ImageDecoderQt.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ImageDecoderQt.cpp (modified) (4 diffs)
• platform/graphics/qt/ImageDecoderQt.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-01  Peter Kasting  <pkasting@google.com>
+
+        Unreviewed (build fix).
+
+        Try to fix Qt build, take 2.  The Qt code had what looks like a
+        broken virtual function override.
+
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+        (WebCore::ImageDecoderQt::ReadContext::ReadContext):
+        (WebCore::ImageDecoderQt::setData):
+        * platform/graphics/qt/ImageDecoderQt.h:
+
 2009-09-01  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/platform/graphics/qt/ImageDecoderQt.cpp

@@ -79 +79 @@
             LoadComplete };
 
-    ReadContext(const IncomingData & data, LoadMode loadMode, ImageList &target);
+    ReadContext(SharedBuffer* data, LoadMode loadMode, ImageList &target);
 
     enum ReadResult { ReadEOF, ReadFailed, ReadPartial, ReadComplete };
@@ -109 +109 @@
 };
 
-ImageDecoderQt::ReadContext::ReadContext(const IncomingData & data, LoadMode loadMode, ImageList &target)
+ImageDecoderQt::ReadContext::ReadContext(SharedBuffer* data, LoadMode loadMode, ImageList &target)
     : m_loadMode(loadMode)
-    , m_data(data.data(), data.size())
+    , m_data(data->data(), data.size())
     , m_buffer(&m_data)
     , m_reader(&m_buffer)
@@ -222 +222 @@
 }
 
-void ImageDecoderQt::setData(const IncomingData &data, bool allDataReceived)
+void ImageDecoderQt::setData(SharedBuffer* data, bool allDataReceived)
 {
     reset();
@@ -228 +228 @@
 
     if (debugImageDecoderQt)
-        qDebug() << " setData " << data.size() << " image bytes, complete=" << allDataReceived;
+        qDebug() << " setData " << data->size() << " image bytes, complete=" << allDataReceived;
 
     const  ReadContext::ReadResult readResult =  readContext.read(allDataReceived);

trunk/WebCore/platform/graphics/qt/ImageDecoderQt.h

@@ -43 +43 @@
     ~ImageDecoderQt();
 
-    typedef Vector<char> IncomingData;
-
-    virtual void setData(const IncomingData& data, bool allDataReceived);
+    virtual void setData(SharedBuffer* data, bool allDataReceived);
     virtual bool isSizeAvailable();
     virtual size_t frameCount() const;