commit 25e1e01321f0e1ddee90e2e4f3e2d0fca2e92ec9
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Mar 25 23:29:40 2013
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Mar 25 23:29:40 2013
tree 43ab7ff27fd4faa526b15f7fb319423105697103
parent 3231d6d8ce9d0faba2b6ab1aee967c561c6da705

Unreviewed, rolling out r146819.
http://trac.webkit.org/changeset/146819
https://bugs.webkit.org/show_bug.cgi?id=113249

broke component build (Requested by danakj on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-03-25

Source/Platform:

* chromium/public/WebVideoFrame.h:

Source/WebKit/chromium:

* WebKit.gypi:
* public/WebMediaPlayerClient.h:
(WebKit):
* src/WebMediaPlayerClientImpl.cpp:
(WebKit::WebMediaPlayerClientImpl::~WebMediaPlayerClientImpl):
(WebKit::WebMediaPlayerClientImpl::readyStateChanged):
(WebKit::WebMediaPlayerClientImpl::repaint):
(WebKit::WebMediaPlayerClientImpl::setOpaque):
(WebKit::WebMediaPlayerClientImpl::disableAcceleratedCompositing):
(WebKit::WebMediaPlayerClientImpl::loadRequested):
(WebKit::WebMediaPlayerClientImpl::loadInternal):
(WebKit):
(WebKit::WebMediaPlayerClientImpl::platformLayer):
(WebKit::WebMediaPlayerClientImpl::paint):
(WebKit::WebMediaPlayerClientImpl::supportsAcceleratedRendering):
(WebKit::WebMediaPlayerClientImpl::acceleratedRenderingInUse):
(WebKit::WebMediaPlayerClientImpl::setVideoFrameProviderClient):
(WebKit::WebMediaPlayerClientImpl::getCurrentFrame):
(WebKit::WebMediaPlayerClientImpl::putCurrentFrame):
(WebKit::WebMediaPlayerClientImpl::create):
(WebKit::WebMediaPlayerClientImpl::supportsType):
* src/WebMediaPlayerClientImpl.h:
(WebKit):
(WebMediaPlayerClientImpl):
* tests/WebMediaPlayerClientImplTest.cpp: Added.
(WebKit):
(FakeWebMediaPlayerClientImpl):
(WebKit::FakeWebMediaPlayerClientImpl::create):
(WebKit::FakeWebMediaPlayerClientImpl::FakeWebMediaPlayerClientImpl):
(FakeVideoFrameProviderClient):
(WebKit::FakeVideoFrameProviderClient::create):
(WebKit::FakeVideoFrameProviderClient::~FakeVideoFrameProviderClient):
(WebKit::FakeVideoFrameProviderClient::didReceiveFrame):
(WebKit::FakeVideoFrameProviderClient::didUpdateMatrix):
(WebKit::FakeVideoFrameProviderClient::stopUsingProvider):
(WebKit::FakeVideoFrameProviderClient::provider):
(WebKit::FakeVideoFrameProviderClient::FakeVideoFrameProviderClient):
(WebKit::TEST):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk/Source/WebKit/chromium/public@146824 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebMediaPlayerClient.h

diff --git a/WebMediaPlayerClient.h b/WebMediaPlayerClient.h
index 8161ae6..089937c 100644
--- a/WebMediaPlayerClient.h
+++ b/WebMediaPlayerClient.h
@@ -36,7 +36,6 @@
 namespace WebKit {
 
 class WebFrame;
-class WebLayer;
 class WebMediaSource;
 class WebPlugin;
 class WebRequest;
@@ -81,8 +80,7 @@
     // Returns 0 if the plugin could not be instantiated.
     virtual WebPlugin* createHelperPlugin(const WebString& pluginType, WebFrame*) = 0;
     virtual void closeHelperPlugin() = 0;
-    virtual bool needsWebLayerForVideo() const = 0;
-    virtual void setWebLayer(WebLayer*) = 0;
+    virtual void disableAcceleratedCompositing() = 0;
 protected:
     ~WebMediaPlayerClient() { }
 };