Modified: trunk/Source/WebCore/ChangeLog (118609 => 118610)
--- trunk/Source/WebCore/ChangeLog 2012-05-26 11:38:37 UTC (rev 118609)
+++ trunk/Source/WebCore/ChangeLog 2012-05-26 15:34:56 UTC (rev 118610)
@@ -1,3 +1,19 @@
+2012-05-25 Philippe Normand <[email protected]>
+
+ [GStreamer] Remove ImageGStreamerCG implementation
+ https://bugs.webkit.org/show_bug.cgi?id=87559
+
+ The ImageGStreamerCG abstraction is being removed until I manage to
+ port my gst-mac WebKit branch over to the WebKit2 mac port. No
+ need to update the XCode project because this file is not
+ referenced there anyway.
+
+ Reviewed by Martin Robinson.
+
+ * platform/graphics/gstreamer/ImageGStreamer.h:
+ (ImageGStreamer):
+ * platform/graphics/gstreamer/ImageGStreamerCG.mm: Removed.
+
2012-05-26 Rob Buis <[email protected]>
Bug 15799: textPath element does not re-render when referenced path changes
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h (118609 => 118610)
--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h 2012-05-26 11:38:37 UTC (rev 118609)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h 2012-05-26 15:34:56 UTC (rev 118610)
@@ -56,10 +56,6 @@
ImageGStreamer(GstBuffer*&, IntSize, QImage::Format);
#endif
-#if PLATFORM(MAC)
- ImageGStreamer(GstBuffer*&, IntSize);
-#endif
-
};
}
Deleted: trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCG.mm (118609 => 118610)
--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCG.mm 2012-05-26 11:38:37 UTC (rev 118609)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCG.mm 2012-05-26 15:34:56 UTC (rev 118610)
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2010 Igalia S.L
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include "GraphicsContextCG.h"
-#include "ImageGStreamer.h"
-#if ENABLE(VIDEO) && USE(GSTREAMER)
-
-using namespace WebCore;
-
-PassRefPtr<ImageGStreamer> ImageGStreamer::createImage(GstBuffer* buffer)
-{
- int width = 0, height = 0;
- GstCaps* caps = gst_buffer_get_caps(buffer);
- GstVideoFormat format;
- if (!gst_video_format_parse_caps(caps, &format, &width, &height)) {
- gst_caps_unref(caps);
- return NULL;
- }
-
- return adoptRef(new ImageGStreamer(buffer, IntSize(width, height)));
-}
-
-ImageGStreamer::ImageGStreamer(GstBuffer*& buffer, IntSize size)
- : m_image(0)
-{
- ASSERT(GST_BUFFER_SIZE(buffer));
-
- RetainPtr<CFDataRef> data(AdoptCF, CFDataCreateWithBytesNoCopy(0, static_cast<UInt8*>(GST_BUFFER_DATA(buffer)), GST_BUFFER_SIZE(buffer), kCFAllocatorNull));
- RetainPtr<CGDataProviderRef> provider(AdoptCF, CGDataProviderCreateWithCFData(data.get()));
- CGImageRef frameImage = CGImageCreate(size.width(), size.height(), 8, 32, size.width()*4, deviceRGBColorSpaceRef(),
- kCGBitmapByteOrder32Little | kCGImageAlphaFirst, provider.get(), 0, false, kCGRenderingIntentDefault);
- m_image = BitmapImage::create(frameImage);
-}
-
-ImageGStreamer::~ImageGStreamer()
-{
- if (m_image)
- m_image.clear();
-
- m_image = 0;
-}
-
-#endif // USE(GSTREAMER)
