Commit c14d66b7 authored by danakj@chromium.org's avatar danakj@chromium.org
Browse files

[chromium] Remove the WebVideoFrame, WebVideoFrameProvider,...

[chromium] Remove the WebVideoFrame, WebVideoFrameProvider, WebStreamTextureClient, and WebVideoLayer classes.
https://bugs.webkit.org/show_bug.cgi?id=112483

Reviewed by James Robinson.

Source/Platform:

These classes are no longer used, so remove them. And remove APIs
to provide them.

* Platform.gypi:
* chromium/public/WebCompositorSupport.h:
(WebKit):
* chromium/public/WebVideoFrame.h: Removed.
* chromium/public/WebVideoFrameProvider.h: Removed.
* chromium/public/WebVideoLayer.h: Removed.

Source/WebKit/chromium:

These classes are no longer used, so remove them.

* WebKit.gyp:
* public/WebMediaPlayer.h:
(WebKit):
(WebMediaPlayer):
* public/WebStreamTextureClient.h: Removed.
* public/WebVideoFrame.h: Removed.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146957 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 15745130
2013-03-26 Dana Jansens <danakj@chromium.org>
[chromium] Remove the WebVideoFrame, WebVideoFrameProvider, WebStreamTextureClient, and WebVideoLayer classes.
https://bugs.webkit.org/show_bug.cgi?id=112483
Reviewed by James Robinson.
These classes are no longer used, so remove them. And remove APIs
to provide them.
* Platform.gypi:
* chromium/public/WebCompositorSupport.h:
(WebKit):
* chromium/public/WebVideoFrame.h: Removed.
* chromium/public/WebVideoFrameProvider.h: Removed.
* chromium/public/WebVideoLayer.h: Removed.
2013-03-25 Dana Jansens <danakj@chromium.org>
[chromium] Move ownership of compositor VideoLayer to WebMediaPlayer
......
......@@ -150,9 +150,6 @@
'chromium/public/WebURLRequest.h',
'chromium/public/WebURLResponse.h',
'chromium/public/WebVector.h',
'chromium/public/WebVideoLayer.h',
'chromium/public/WebVideoFrame.h',
'chromium/public/WebVideoFrameProvider.h',
'chromium/public/WebWorkerRunLoop.h',
'chromium/public/android/WebSandboxSupport.h',
'chromium/public/android/WebThemeEngine.h',
......
......@@ -50,8 +50,6 @@ class WebSolidColorLayer;
class WebThread;
class WebTransformAnimationCurve;
class WebTransformOperations;
class WebVideoFrameProvider;
class WebVideoLayer;
class WebCompositorSupport {
public:
......@@ -83,8 +81,6 @@ public:
virtual WebSolidColorLayer* createSolidColorLayer() { return 0; }
virtual WebVideoLayer* createVideoLayer(WebVideoFrameProvider*) { return 0; }
virtual WebScrollbarLayer* createScrollbarLayer(WebScrollbar*, WebScrollbarThemePainter, WebScrollbarThemeGeometry*) { return 0; }
......
/*
* Copyright (C) 2010 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef WebVideoFrame_h
#define WebVideoFrame_h
#define REMOVE_WEBVIDEOFRAME
#include "WebRect.h"
#include "WebSize.h"
namespace WebKit {
// A base class for the container which holds a media::VideoFrame.
class WebVideoFrame {
public:
virtual ~WebVideoFrame() { }
};
} // namespace WebKit
#endif
/*
* Copyright (C) 2010 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef WebVideoFrameProvider_h
#define WebVideoFrameProvider_h
#include "WebCommon.h"
#include "WebVideoFrame.h"
namespace WebKit {
// Threading notes: This class may be used in a multi threaded manner. Specifically, the implementation
// may call getCurrentFrame() / putCurrentFrame() from a non-main thread. If so, the caller is responsible
// for making sure Client::didReceiveFrame and Client::didUpdateMatrix are only called from this thread.
class WebVideoFrameProvider {
public:
virtual ~WebVideoFrameProvider() { }
class Client {
public:
// Provider will call this method to tell the client to stop using it.
// stopUsingProvider() may be called from any thread. The client should
// block until it has putCurrentFrame any outstanding frames.
virtual void stopUsingProvider() = 0;
// Notifies the provider's client that a call to getCurrentFrame() will return new data.
virtual void didReceiveFrame() = 0;
// Notifies the provider's client of a new UV transform matrix to be used when drawing frames
// of type WebVideoFrame::FormatStreamTexture.
virtual void didUpdateMatrix(const float*) = 0;
};
// May be called from any thread, but there must be some external guarantee
// that the provider is not destroyed before this call returns.
virtual void setVideoFrameProviderClient(Client*) = 0;
// This function places a lock on the current frame and returns a pointer to it.
// Calls to this method should always be followed with a call to putCurrentFrame().
// The ownership of the object is not transferred to the caller and
// the caller should not free the returned object. Only the current provider
// client should call this function.
virtual WebVideoFrame* getCurrentFrame() = 0;
// This function releases the lock on the video frame in chromium. It should
// always be called after getCurrentFrame(). Frames passed into this method
// should no longer be referenced after the call is made. Only the current
// provider client should call this function.
virtual void putCurrentFrame(WebVideoFrame*) = 0;
};
} // namespace WebKit
#endif
/*
* Copyright (C) 2011 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef WebVideoLayer_h
#define WebVideoLayer_h
#include "WebCommon.h"
#include "WebLayer.h"
namespace WebKit {
class WebVideoFrameProvider;
class WebVideoLayer {
public:
virtual ~WebVideoLayer() { }
virtual WebLayer* layer() = 0;
// Returns true if this layer is actively rendering (e.g. currently attached to a WebLayerTreeView).
virtual bool active() const = 0;
};
} // namespace WebKit
#endif // WebVideoLayer_h
2013-03-26 Dana Jansens <danakj@chromium.org>
[chromium] Remove the WebVideoFrame, WebVideoFrameProvider, WebStreamTextureClient, and WebVideoLayer classes.
https://bugs.webkit.org/show_bug.cgi?id=112483
Reviewed by James Robinson.
These classes are no longer used, so remove them.
* WebKit.gyp:
* public/WebMediaPlayer.h:
(WebKit):
(WebMediaPlayer):
* public/WebStreamTextureClient.h: Removed.
* public/WebVideoFrame.h: Removed.
2013-03-26 Sheriff Bot <webkit.review.bot@gmail.com>
 
Unreviewed. Rolled Chromium DEPS to r190706. Requested by
......
......@@ -262,7 +262,6 @@
'public/WebStorageQuotaType.h',
'public/WebStorageQuotaError.h',
'public/WebSurroundingText.h',
'public/WebStreamTextureClient.h',
'public/WebTextAffinity.h',
'public/WebTextCaseSensitivity.h',
'public/WebTextCheckingCompletion.h',
......
......@@ -33,7 +33,6 @@
#include "../../../Platform/chromium/public/WebCanvas.h"
#include "../../../Platform/chromium/public/WebString.h"
#include "../../../Platform/chromium/public/WebVideoFrame.h"
#include "WebTimeRange.h"
namespace WebKit {
......@@ -42,7 +41,6 @@ class WebAudioSourceProvider;
class WebAudioSourceProviderClient;
class WebMediaPlayerClient;
class WebMediaSource;
class WebStreamTextureClient;
class WebString;
class WebURL;
struct WebRect;
......@@ -155,23 +153,9 @@ public:
virtual unsigned audioDecodedByteCount() const = 0;
virtual unsigned videoDecodedByteCount() const = 0;
// This function returns a pointer to a WebVideoFrame, which is
// a WebKit wrapper for a video frame in chromium. This places a lock
// on the frame in chromium, and calls to this method should always be
// followed with a call to putCurrentFrame(). The ownership of this object
// is not transferred to the caller, and the caller should not free the
// returned object.
virtual WebVideoFrame* getCurrentFrame() { return 0; }
// This function releases the lock on the current video frame in Chromium.
// It should always be called after getCurrentFrame(). Frame passed to this
// method should no longer be referenced after the call is made.
virtual void putCurrentFrame(WebVideoFrame*) { }
// Do a GPU-GPU textures copy if possible.
virtual bool copyVideoTextureToPlatformTexture(WebGraphicsContext3D*, unsigned texture, unsigned level, unsigned internalFormat, bool premultiplyAlpha, bool flipY) { return false; }
virtual void setStreamTextureClient(WebStreamTextureClient*) { }
virtual WebAudioSourceProvider* audioSourceProvider() { return 0; }
// Returns whether keySystem is supported. If true, the result will be
......
/*
* Copyright (C) 2012 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef WebStreamTextureClient_h
#define WebStreamTextureClient_h
namespace WebKit {
class WebStreamTextureClient {
public:
virtual void didReceiveFrame() = 0;
virtual void didUpdateMatrix(const float*) = 0;
protected:
virtual ~WebStreamTextureClient() { }
};
} // namespace WebKit
#endif
/*
* Copyright (C) 2012 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "../../../Platform/chromium/public/WebVideoFrame.h"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment