[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: https://svn.webkit.org/repository/webkit/trunk/Source/WebKit/chromium/public@146957 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebMediaPlayer.h b/WebMediaPlayer.h
index ad56c1b..749f038 100644
--- a/WebMediaPlayer.h
+++ b/WebMediaPlayer.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 WebAudioSourceProviderClient;
class WebMediaPlayerClient;
class WebMediaSource;
-class WebStreamTextureClient;
class WebString;
class WebURL;
struct WebRect;
@@ -155,23 +153,9 @@
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
diff --git a/WebStreamTextureClient.h b/WebStreamTextureClient.h
deleted file mode 100644
index 81002fb..0000000
--- a/WebStreamTextureClient.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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
diff --git a/WebVideoFrame.h b/WebVideoFrame.h
deleted file mode 100644
index 948a7a4..0000000
--- a/WebVideoFrame.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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"
