[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
philn at webkit.org
philn at webkit.org
Thu Apr 8 02:06:22 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 68ff2c27753d0a79c43659eaad9de2a7c37ed624
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 2 08:30:03 2010 +0000
2010-03-01 Philippe Normand <pnormand at igalia.com>
Reviewed by Gustavo Noronha.
[GTK] Move gstreamer-related source files to platform/graphics/gstreamer
https://bugs.webkit.org/show_bug.cgi?id=35518
Moved GStreamer-related files to platform/graphics/gstreamer so
other ports could benefit from this media player implementation.
* GNUmakefile.am:
* platform/graphics/gstreamer/DataSourceGStreamer.cpp: Renamed from WebCore/platform/graphics/gtk/DataSourceGStreamer.cpp.
(_do_init):
(webkit_data_src_base_init):
(webkit_data_src_class_init):
(webkit_data_src_reset):
(webkit_data_src_init):
(webkit_data_src_finalize):
(webkit_data_src_change_state):
(webkit_data_src_uri_get_type):
(webkit_data_src_uri_get_protocols):
(webkit_data_src_uri_get_uri):
(webkit_data_src_uri_set_uri):
(webkit_data_src_uri_handler_init):
* platform/graphics/gstreamer/DataSourceGStreamer.h: Renamed from WebCore/platform/graphics/gtk/DataSourceGStreamer.h.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: Renamed from WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp.
(WebCore::greatestCommonDivisor):
(WebCore::mediaPlayerPrivateMessageCallback):
(WebCore::mediaPlayerPrivateSourceChangedCallback):
(WebCore::mediaPlayerPrivateVolumeChangedCallback):
(WebCore::notifyVolumeIdleCallback):
(WebCore::mediaPlayerPrivateMuteChangedCallback):
(WebCore::notifyMuteIdleCallback):
(WebCore::bufferingTimeoutCallback):
(WebCore::playbackPosition):
(WebCore::mediaPlayerPrivateRepaintCallback):
(WebCore::MediaPlayerPrivate::create):
(WebCore::MediaPlayerPrivate::registerMediaEngine):
(WebCore::doGstInit):
(WebCore::MediaPlayerPrivate::isAvailable):
(WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
(WebCore::MediaPlayerPrivate::~MediaPlayerPrivate):
(WebCore::MediaPlayerPrivate::load):
(WebCore::MediaPlayerPrivate::changePipelineState):
(WebCore::MediaPlayerPrivate::play):
(WebCore::MediaPlayerPrivate::pause):
(WebCore::MediaPlayerPrivate::duration):
(WebCore::MediaPlayerPrivate::currentTime):
(WebCore::MediaPlayerPrivate::seek):
(WebCore::MediaPlayerPrivate::startEndPointTimerIfNeeded):
(WebCore::MediaPlayerPrivate::cancelSeek):
(WebCore::MediaPlayerPrivate::endPointTimerFired):
(WebCore::MediaPlayerPrivate::paused):
(WebCore::MediaPlayerPrivate::seeking):
(WebCore::MediaPlayerPrivate::naturalSize):
(WebCore::MediaPlayerPrivate::hasVideo):
(WebCore::MediaPlayerPrivate::hasAudio):
(WebCore::MediaPlayerPrivate::setVolume):
(WebCore::MediaPlayerPrivate::volumeChangedCallback):
(WebCore::MediaPlayerPrivate::volumeChanged):
(WebCore::MediaPlayerPrivate::setRate):
(WebCore::MediaPlayerPrivate::networkState):
(WebCore::MediaPlayerPrivate::readyState):
(WebCore::MediaPlayerPrivate::buffered):
(WebCore::MediaPlayerPrivate::processBufferingStats):
(WebCore::MediaPlayerPrivate::queryBufferingStats):
(WebCore::MediaPlayerPrivate::maxTimeSeekable):
(WebCore::MediaPlayerPrivate::maxTimeLoaded):
(WebCore::MediaPlayerPrivate::bytesLoaded):
(WebCore::MediaPlayerPrivate::totalBytes):
(WebCore::MediaPlayerPrivate::cancelLoad):
(WebCore::MediaPlayerPrivate::updateStates):
(WebCore::MediaPlayerPrivate::mediaLocationChanged):
(WebCore::MediaPlayerPrivate::loadNextLocation):
(WebCore::MediaPlayerPrivate::loadStateChanged):
(WebCore::MediaPlayerPrivate::sizeChanged):
(WebCore::MediaPlayerPrivate::timeChanged):
(WebCore::MediaPlayerPrivate::didEnd):
(WebCore::MediaPlayerPrivate::durationChanged):
(WebCore::MediaPlayerPrivate::supportsMuting):
(WebCore::MediaPlayerPrivate::setMuted):
(WebCore::MediaPlayerPrivate::muteChangedCallback):
(WebCore::MediaPlayerPrivate::muteChanged):
(WebCore::MediaPlayerPrivate::loadingFailed):
(WebCore::MediaPlayerPrivate::setSize):
(WebCore::MediaPlayerPrivate::setVisible):
(WebCore::MediaPlayerPrivate::repaint):
(WebCore::MediaPlayerPrivate::paint):
(WebCore::mimeTypeCache):
(WebCore::MediaPlayerPrivate::getSupportedTypes):
(WebCore::MediaPlayerPrivate::supportsType):
(WebCore::MediaPlayerPrivate::hasSingleSecurityOrigin):
(WebCore::MediaPlayerPrivate::supportsFullscreen):
(WebCore::MediaPlayerPrivate::setAutobuffer):
(WebCore::MediaPlayerPrivate::createGSTPlayBin):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: Renamed from WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h.
(WebCore::MediaPlayerPrivate::pipelineReset):
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp: Renamed from WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp.
(webkit_video_sink_base_init):
(webkit_video_sink_init):
(webkit_video_sink_timeout_func):
(webkit_video_sink_render):
(webkit_video_sink_dispose):
(unlock_buffer_mutex):
(webkit_video_sink_unlock):
(webkit_video_sink_unlock_stop):
(webkit_video_sink_stop):
(webkit_video_sink_start):
(marshal_VOID__MINIOBJECT):
(webkit_video_sink_class_init):
(webkit_video_sink_new):
* platform/graphics/gstreamer/VideoSinkGStreamer.h: Renamed from WebCore/platform/graphics/gtk/VideoSinkGStreamer.h.
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: Renamed from WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.cpp.
(doInit):
(webkit_web_src_base_init):
(webkit_web_src_class_init):
(webkit_web_src_init):
(webKitWebSrcFinalize):
(webKitWebSrcSetProperty):
(webKitWebSrcGetProperty):
(webKitWebSrcStop):
(webKitWebSrcStart):
(webKitWebSrcChangeState):
(webKitWebSrcUriGetType):
(webKitWebSrcGetProtocols):
(webKitWebSrcGetUri):
(webKitWebSrcSetUri):
(webKitWebSrcUriHandlerInit):
(webKitWebSrcNeedDataMainCb):
(webKitWebSrcNeedDataCb):
(webKitWebSrcEnoughDataMainCb):
(webKitWebSrcEnoughDataCb):
(webKitWebSrcSeekMainCb):
(webKitWebSrcSeekDataCb):
(webKitWebSrcSetFrame):
(StreamingClient::StreamingClient):
(StreamingClient::~StreamingClient):
(StreamingClient::willSendRequest):
(StreamingClient::didReceiveResponse):
(StreamingClient::didReceiveData):
(StreamingClient::didFinishLoading):
(StreamingClient::didFail):
(StreamingClient::wasBlocked):
(StreamingClient::cannotShowURL):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.h: Renamed from WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.h.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55402 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b8e99ec..1c4750a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,149 @@
+2010-03-01 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by Gustavo Noronha.
+
+ [GTK] Move gstreamer-related source files to platform/graphics/gstreamer
+ https://bugs.webkit.org/show_bug.cgi?id=35518
+
+ Moved GStreamer-related files to platform/graphics/gstreamer so
+ other ports could benefit from this media player implementation.
+
+ * GNUmakefile.am:
+ * platform/graphics/gstreamer/DataSourceGStreamer.cpp: Renamed from WebCore/platform/graphics/gtk/DataSourceGStreamer.cpp.
+ (_do_init):
+ (webkit_data_src_base_init):
+ (webkit_data_src_class_init):
+ (webkit_data_src_reset):
+ (webkit_data_src_init):
+ (webkit_data_src_finalize):
+ (webkit_data_src_change_state):
+ (webkit_data_src_uri_get_type):
+ (webkit_data_src_uri_get_protocols):
+ (webkit_data_src_uri_get_uri):
+ (webkit_data_src_uri_set_uri):
+ (webkit_data_src_uri_handler_init):
+ * platform/graphics/gstreamer/DataSourceGStreamer.h: Renamed from WebCore/platform/graphics/gtk/DataSourceGStreamer.h.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: Renamed from WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp.
+ (WebCore::greatestCommonDivisor):
+ (WebCore::mediaPlayerPrivateMessageCallback):
+ (WebCore::mediaPlayerPrivateSourceChangedCallback):
+ (WebCore::mediaPlayerPrivateVolumeChangedCallback):
+ (WebCore::notifyVolumeIdleCallback):
+ (WebCore::mediaPlayerPrivateMuteChangedCallback):
+ (WebCore::notifyMuteIdleCallback):
+ (WebCore::bufferingTimeoutCallback):
+ (WebCore::playbackPosition):
+ (WebCore::mediaPlayerPrivateRepaintCallback):
+ (WebCore::MediaPlayerPrivate::create):
+ (WebCore::MediaPlayerPrivate::registerMediaEngine):
+ (WebCore::doGstInit):
+ (WebCore::MediaPlayerPrivate::isAvailable):
+ (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+ (WebCore::MediaPlayerPrivate::~MediaPlayerPrivate):
+ (WebCore::MediaPlayerPrivate::load):
+ (WebCore::MediaPlayerPrivate::changePipelineState):
+ (WebCore::MediaPlayerPrivate::play):
+ (WebCore::MediaPlayerPrivate::pause):
+ (WebCore::MediaPlayerPrivate::duration):
+ (WebCore::MediaPlayerPrivate::currentTime):
+ (WebCore::MediaPlayerPrivate::seek):
+ (WebCore::MediaPlayerPrivate::startEndPointTimerIfNeeded):
+ (WebCore::MediaPlayerPrivate::cancelSeek):
+ (WebCore::MediaPlayerPrivate::endPointTimerFired):
+ (WebCore::MediaPlayerPrivate::paused):
+ (WebCore::MediaPlayerPrivate::seeking):
+ (WebCore::MediaPlayerPrivate::naturalSize):
+ (WebCore::MediaPlayerPrivate::hasVideo):
+ (WebCore::MediaPlayerPrivate::hasAudio):
+ (WebCore::MediaPlayerPrivate::setVolume):
+ (WebCore::MediaPlayerPrivate::volumeChangedCallback):
+ (WebCore::MediaPlayerPrivate::volumeChanged):
+ (WebCore::MediaPlayerPrivate::setRate):
+ (WebCore::MediaPlayerPrivate::networkState):
+ (WebCore::MediaPlayerPrivate::readyState):
+ (WebCore::MediaPlayerPrivate::buffered):
+ (WebCore::MediaPlayerPrivate::processBufferingStats):
+ (WebCore::MediaPlayerPrivate::queryBufferingStats):
+ (WebCore::MediaPlayerPrivate::maxTimeSeekable):
+ (WebCore::MediaPlayerPrivate::maxTimeLoaded):
+ (WebCore::MediaPlayerPrivate::bytesLoaded):
+ (WebCore::MediaPlayerPrivate::totalBytes):
+ (WebCore::MediaPlayerPrivate::cancelLoad):
+ (WebCore::MediaPlayerPrivate::updateStates):
+ (WebCore::MediaPlayerPrivate::mediaLocationChanged):
+ (WebCore::MediaPlayerPrivate::loadNextLocation):
+ (WebCore::MediaPlayerPrivate::loadStateChanged):
+ (WebCore::MediaPlayerPrivate::sizeChanged):
+ (WebCore::MediaPlayerPrivate::timeChanged):
+ (WebCore::MediaPlayerPrivate::didEnd):
+ (WebCore::MediaPlayerPrivate::durationChanged):
+ (WebCore::MediaPlayerPrivate::supportsMuting):
+ (WebCore::MediaPlayerPrivate::setMuted):
+ (WebCore::MediaPlayerPrivate::muteChangedCallback):
+ (WebCore::MediaPlayerPrivate::muteChanged):
+ (WebCore::MediaPlayerPrivate::loadingFailed):
+ (WebCore::MediaPlayerPrivate::setSize):
+ (WebCore::MediaPlayerPrivate::setVisible):
+ (WebCore::MediaPlayerPrivate::repaint):
+ (WebCore::MediaPlayerPrivate::paint):
+ (WebCore::mimeTypeCache):
+ (WebCore::MediaPlayerPrivate::getSupportedTypes):
+ (WebCore::MediaPlayerPrivate::supportsType):
+ (WebCore::MediaPlayerPrivate::hasSingleSecurityOrigin):
+ (WebCore::MediaPlayerPrivate::supportsFullscreen):
+ (WebCore::MediaPlayerPrivate::setAutobuffer):
+ (WebCore::MediaPlayerPrivate::createGSTPlayBin):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: Renamed from WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h.
+ (WebCore::MediaPlayerPrivate::pipelineReset):
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp: Renamed from WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp.
+ (webkit_video_sink_base_init):
+ (webkit_video_sink_init):
+ (webkit_video_sink_timeout_func):
+ (webkit_video_sink_render):
+ (webkit_video_sink_dispose):
+ (unlock_buffer_mutex):
+ (webkit_video_sink_unlock):
+ (webkit_video_sink_unlock_stop):
+ (webkit_video_sink_stop):
+ (webkit_video_sink_start):
+ (marshal_VOID__MINIOBJECT):
+ (webkit_video_sink_class_init):
+ (webkit_video_sink_new):
+ * platform/graphics/gstreamer/VideoSinkGStreamer.h: Renamed from WebCore/platform/graphics/gtk/VideoSinkGStreamer.h.
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: Renamed from WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.cpp.
+ (doInit):
+ (webkit_web_src_base_init):
+ (webkit_web_src_class_init):
+ (webkit_web_src_init):
+ (webKitWebSrcFinalize):
+ (webKitWebSrcSetProperty):
+ (webKitWebSrcGetProperty):
+ (webKitWebSrcStop):
+ (webKitWebSrcStart):
+ (webKitWebSrcChangeState):
+ (webKitWebSrcUriGetType):
+ (webKitWebSrcGetProtocols):
+ (webKitWebSrcGetUri):
+ (webKitWebSrcSetUri):
+ (webKitWebSrcUriHandlerInit):
+ (webKitWebSrcNeedDataMainCb):
+ (webKitWebSrcNeedDataCb):
+ (webKitWebSrcEnoughDataMainCb):
+ (webKitWebSrcEnoughDataCb):
+ (webKitWebSrcSeekMainCb):
+ (webKitWebSrcSeekDataCb):
+ (webKitWebSrcSetFrame):
+ (StreamingClient::StreamingClient):
+ (StreamingClient::~StreamingClient):
+ (StreamingClient::willSendRequest):
+ (StreamingClient::didReceiveResponse):
+ (StreamingClient::didReceiveData):
+ (StreamingClient::didFinishLoading):
+ (StreamingClient::didFail):
+ (StreamingClient::wasBlocked):
+ (StreamingClient::cannotShowURL):
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.h: Renamed from WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.h.
+
2010-03-01 Oliver Hunt <oliver at apple.com>
Reviewed by Maciej Stachowiak.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 1b43f3f..8308917 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -68,6 +68,7 @@ webcoregtk_cppflags += \
-I$(srcdir)/WebCore/loader/gtk \
-I$(srcdir)/WebCore/page/gtk \
-I$(srcdir)/WebCore/platform/graphics/cairo \
+ -I$(srcdir)/WebCore/platform/graphics/gstreamer \
-I$(srcdir)/WebCore/platform/graphics/gtk \
-I$(srcdir)/WebCore/platform/gtk \
-I$(srcdir)/WebCore/platform/network/soup
@@ -2418,14 +2419,14 @@ webcore_sources += \
WebCore/rendering/RenderVideo.h
webcoregtk_sources += \
- WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp \
- WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h \
- WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp \
- WebCore/platform/graphics/gtk/VideoSinkGStreamer.h \
- WebCore/platform/graphics/gtk/DataSourceGStreamer.cpp \
- WebCore/platform/graphics/gtk/DataSourceGStreamer.h \
- WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.cpp \
- WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.h
+ WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp \
+ WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h \
+ WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp \
+ WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h \
+ WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp \
+ WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h \
+ WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp \
+ WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h
webcore_libadd += \
-lgstinterfaces-0.10 \
diff --git a/WebCore/platform/graphics/gtk/DataSourceGStreamer.cpp b/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/DataSourceGStreamer.cpp
rename to WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp
diff --git a/WebCore/platform/graphics/gtk/DataSourceGStreamer.h b/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h
similarity index 100%
rename from WebCore/platform/graphics/gtk/DataSourceGStreamer.h
rename to WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h
diff --git a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
rename to WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
diff --git a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
similarity index 100%
rename from WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h
rename to WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
diff --git a/WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp b/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp
rename to WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
diff --git a/WebCore/platform/graphics/gtk/VideoSinkGStreamer.h b/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h
similarity index 100%
rename from WebCore/platform/graphics/gtk/VideoSinkGStreamer.h
rename to WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h
diff --git a/WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.cpp b/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.cpp
rename to WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
diff --git a/WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.h b/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h
similarity index 100%
rename from WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.h
rename to WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list