Commit 6a14e28b authored by tfarina@chromium.org's avatar tfarina@chromium.org

compositor_bindings: Stop overriding createSolidColorLayer().

This functions is not called anymore in Blink and thus it has no effect
here in Chromium. So no need to keep overriding it.

This also deletes web_solid_color_layer_impl.* because it becomes unused with this change.

BUG=None
TEST=None
R=enne@chromium.org

Review URL: https://codereview.chromium.org/431273002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288125 0039d316-1c4b-4281-b951-d872f2087c98
parent a36d2958
......@@ -145,8 +145,6 @@
'renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h',
'renderer/compositor_bindings/web_scrollbar_layer_impl.cc',
'renderer/compositor_bindings/web_scrollbar_layer_impl.h',
'renderer/compositor_bindings/web_solid_color_layer_impl.cc',
'renderer/compositor_bindings/web_solid_color_layer_impl.h',
'renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc',
'renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.h',
'renderer/compositor_bindings/web_transform_animation_curve_impl.cc',
......
......@@ -20,7 +20,6 @@
#include "content/renderer/compositor_bindings/web_nine_patch_layer_impl.h"
#include "content/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h"
#include "content/renderer/compositor_bindings/web_scrollbar_layer_impl.h"
#include "content/renderer/compositor_bindings/web_solid_color_layer_impl.h"
#include "content/renderer/compositor_bindings/web_transform_animation_curve_impl.h"
#include "content/renderer/compositor_bindings/web_transform_operations_impl.h"
......@@ -41,7 +40,6 @@ using blink::WebScrollbarLayer;
using blink::WebScrollbarThemeGeometry;
using blink::WebScrollbarThemePainter;
using blink::WebScrollOffsetAnimationCurve;
using blink::WebSolidColorLayer;
using blink::WebTransformAnimationCurve;
using blink::WebTransformOperations;
......@@ -75,10 +73,6 @@ blink::WebNinePatchLayer* WebCompositorSupportImpl::createNinePatchLayer() {
return new WebNinePatchLayerImpl();
}
WebSolidColorLayer* WebCompositorSupportImpl::createSolidColorLayer() {
return new WebSolidColorLayerImpl();
}
WebScrollbarLayer* WebCompositorSupportImpl::createScrollbarLayer(
WebScrollbar* scrollbar,
WebScrollbarThemePainter painter,
......
......@@ -32,7 +32,6 @@ class CONTENT_EXPORT WebCompositorSupportImpl
blink::WebExternalTextureLayerClient* client);
virtual blink::WebImageLayer* createImageLayer();
virtual blink::WebNinePatchLayer* createNinePatchLayer();
virtual blink::WebSolidColorLayer* createSolidColorLayer();
virtual blink::WebScrollbarLayer* createScrollbarLayer(
blink::WebScrollbar* scrollbar,
blink::WebScrollbarThemePainter painter,
......
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "content/renderer/compositor_bindings/web_solid_color_layer_impl.h"
#include "cc/layers/solid_color_layer.h"
#include "content/renderer/compositor_bindings/web_layer_impl.h"
using cc::SolidColorLayer;
namespace content {
WebSolidColorLayerImpl::WebSolidColorLayerImpl()
: layer_(new WebLayerImpl(SolidColorLayer::Create())) {
layer_->layer()->SetIsDrawable(true);
}
WebSolidColorLayerImpl::~WebSolidColorLayerImpl() {
}
blink::WebLayer* WebSolidColorLayerImpl::layer() {
return layer_.get();
}
void WebSolidColorLayerImpl::setBackgroundColor(blink::WebColor color) {
layer_->setBackgroundColor(color);
}
} // namespace content
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SOLID_COLOR_LAYER_IMPL_H_
#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SOLID_COLOR_LAYER_IMPL_H_
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "third_party/WebKit/public/platform/WebColor.h"
#include "third_party/WebKit/public/platform/WebSolidColorLayer.h"
namespace content {
class WebLayerImpl;
class WebSolidColorLayerImpl : public blink::WebSolidColorLayer {
public:
CONTENT_EXPORT WebSolidColorLayerImpl();
virtual ~WebSolidColorLayerImpl();
// blink::WebSolidColorLayer implementation.
virtual blink::WebLayer* layer();
virtual void setBackgroundColor(blink::WebColor);
private:
scoped_ptr<WebLayerImpl> layer_;
DISALLOW_COPY_AND_ASSIGN(WebSolidColorLayerImpl);
};
} // namespace content
#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SOLID_COLOR_LAYER_IMPL_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