Commit 727ae2f0 authored by jamesr@google.com's avatar jamesr@google.com

[chromium] Remove WebLayerClient

https://bugs.webkit.org/show_bug.cgi?id=75481

Reviewed by Darin Fisher.

* WebKit.gyp:
* public/platform/WebContentLayer.h:
* public/platform/WebExternalTextureLayer.h:
* public/platform/WebLayer.h:
* public/platform/WebLayerClient.h: Removed.
* src/WebContentLayer.cpp:
* src/WebExternalTextureLayer.cpp:
* src/WebLayer.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@103970 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 58bd432d
2012-01-03 James Robinson <jamesr@chromium.org>
[chromium] Remove WebLayerClient
https://bugs.webkit.org/show_bug.cgi?id=75481
Reviewed by Darin Fisher.
* WebKit.gyp:
* public/platform/WebContentLayer.h:
* public/platform/WebExternalTextureLayer.h:
* public/platform/WebLayer.h:
* public/platform/WebLayerClient.h: Removed.
* src/WebContentLayer.cpp:
* src/WebExternalTextureLayer.cpp:
* src/WebLayer.cpp:
2012-01-03 Adrienne Walker <enne@google.com>
[chromium] Support RTL pages and elements in the compositor
......
......@@ -307,7 +307,6 @@
'public/platform/WebImage.h',
'public/platform/WebKitPlatformSupport.h',
'public/platform/WebLayer.h',
'public/platform/WebLayerClient.h',
'public/platform/WebLayerTreeView.h',
'public/platform/WebLayerTreeViewClient.h',
'public/platform/WebLocalizedString.h',
......
......@@ -33,13 +33,10 @@ namespace WebKit {
class WebContentLayerClient;
class WebContentLayerImpl;
struct WebFloatRect;
class WebLayerClient;
class WebContentLayer : public WebLayer {
public:
WEBKIT_EXPORT static WebContentLayer create(WebContentLayerClient*);
// FIXME: Remove this as soon as downstream clients are updated.
WEBKIT_EXPORT static WebContentLayer create(WebLayerClient*, WebContentLayerClient*);
WebContentLayer() { }
WebContentLayer(const WebContentLayer& layer) : WebLayer(layer) { }
......
......@@ -32,7 +32,6 @@
namespace WebKit {
class WebExternalTextureLayerImpl;
class WebLayerClient;
// This class represents a layer that renders a texture that is generated
// externally (not managed by the WebLayerTreeView).
......@@ -43,8 +42,6 @@ class WebLayerClient;
class WebExternalTextureLayer : public WebLayer {
public:
WEBKIT_EXPORT static WebExternalTextureLayer create();
// FIXME: Remove as soon as downstream clients are updated.
WEBKIT_EXPORT static WebExternalTextureLayer create(WebLayerClient*);
WebExternalTextureLayer() { }
WebExternalTextureLayer(const WebExternalTextureLayer& layer) : WebLayer(layer) { }
......
......@@ -35,14 +35,11 @@ namespace WebCore { class LayerChromium; }
namespace WebKit {
struct WebFloatPoint;
class WebLayerClient;
struct WebSize;
class WebLayer {
public:
WEBKIT_EXPORT static WebLayer create();
// FIXME: Remove this constructor once downstream clients are updated.
WEBKIT_EXPORT static WebLayer create(WebLayerClient*);
WebLayer() { }
WebLayer(const WebLayer& layer) { assign(layer); }
......
/*
* 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 WebLayerClient_h
#define WebLayerClient_h
namespace WebKit {
class WebLayerClient {
public:
// This empty interface exists only for legacy reasons - it will be deleted as soon
// as downstream consumers stop depending on this interface existing.
protected:
virtual ~WebLayerClient() { }
};
} // namespace WebKit
#endif // WebLayerClient_h
......@@ -36,11 +36,6 @@ WebContentLayer WebContentLayer::create(WebContentLayerClient* contentClient)
return WebContentLayer(WebContentLayerImpl::create(contentClient));
}
WebContentLayer WebContentLayer::create(WebLayerClient*, WebContentLayerClient* contentClient)
{
return WebContentLayer::create(contentClient);
}
void WebContentLayer::setDrawsContent(bool drawsContent)
{
unwrap<WebContentLayerImpl>()->setDrawsContent(drawsContent);
......
......@@ -31,11 +31,6 @@
namespace WebKit {
WebExternalTextureLayer WebExternalTextureLayer::create(WebLayerClient*)
{
return WebExternalTextureLayer::create();
}
WebExternalTextureLayer WebExternalTextureLayer::create()
{
return WebExternalTextureLayer(WebExternalTextureLayerImpl::create());
......
......@@ -74,11 +74,6 @@ SkMatrix44 skMatrix44FromTransformationMatrix(const TransformationMatrix& matrix
namespace WebKit {
WebLayer WebLayer::create(WebLayerClient*)
{
return WebLayer::create();
}
WebLayer WebLayer::create()
{
return WebLayer(WebLayerImpl::create());
......
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