diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/webkit/renderer/compositor_bindings/web_image_layer_impl.cc | |
parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/webkit/renderer/compositor_bindings/web_image_layer_impl.cc')
-rw-r--r-- | chromium/webkit/renderer/compositor_bindings/web_image_layer_impl.cc | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/chromium/webkit/renderer/compositor_bindings/web_image_layer_impl.cc b/chromium/webkit/renderer/compositor_bindings/web_image_layer_impl.cc deleted file mode 100644 index 2074d05dbd0..00000000000 --- a/chromium/webkit/renderer/compositor_bindings/web_image_layer_impl.cc +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2012 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 "webkit/renderer/compositor_bindings/web_image_layer_impl.h" - -#include "base/command_line.h" -#include "cc/base/switches.h" -#include "cc/layers/image_layer.h" -#include "cc/layers/picture_image_layer.h" -#include "webkit/renderer/compositor_bindings/web_layer_impl.h" -#include "webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h" - -static bool usingPictureLayer() { - return cc::switches::IsImplSidePaintingEnabled(); -} - -namespace webkit { - -WebImageLayerImpl::WebImageLayerImpl() { - if (usingPictureLayer()) - layer_.reset(new WebLayerImplFixedBounds(cc::PictureImageLayer::Create())); - else - layer_.reset(new WebLayerImpl(cc::ImageLayer::Create())); -} - -WebImageLayerImpl::~WebImageLayerImpl() {} - -blink::WebLayer* WebImageLayerImpl::layer() { return layer_.get(); } - -void WebImageLayerImpl::setBitmap(SkBitmap bitmap) { - if (usingPictureLayer()) { - static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap); - static_cast<WebLayerImplFixedBounds*>(layer_.get())->SetFixedBounds( - gfx::Size(bitmap.width(), bitmap.height())); - } else { - static_cast<cc::ImageLayer*>(layer_->layer())->SetBitmap(bitmap); - } -} - -} // namespace webkit |