| Index: ui/gfx/compositor/layer.cc
|
| diff --git a/ui/gfx/compositor/layer.cc b/ui/gfx/compositor/layer.cc
|
| index c865a12ae9832c7cf17ea8de713084548a76a15f..398ecc942f960609942a3bf989a7adf90f7ff331 100644
|
| --- a/ui/gfx/compositor/layer.cc
|
| +++ b/ui/gfx/compositor/layer.cc
|
| @@ -10,12 +10,14 @@
|
| #include "base/debug/trace_event.h"
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebContentLayer.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebExternalTextureLayer.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatPoint.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatRect.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSolidColorLayer.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayer.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer.h"
|
| #include "ui/base/animation/animation.h"
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/compositor/compositor_switches.h"
|
| @@ -183,6 +185,16 @@ void Layer::SetOpacity(float opacity) {
|
| GetAnimator()->SetOpacity(opacity);
|
| }
|
|
|
| +void Layer::SetBackgroundBlur(int blur_radius)
|
| +{
|
| + WebKit::WebFilterOperations filters;
|
| + if (blur_radius)
|
| + filters.append(WebKit::WebBlurFilterOperation(blur_radius));
|
| + web_layer_.setBackgroundFilters(filters);
|
| +
|
| + background_blur_radius_ = blur_radius;
|
| +}
|
| +
|
| float Layer::GetTargetOpacity() const {
|
| if (animator_.get() && animator_->IsAnimatingProperty(
|
| LayerAnimationElement::OPACITY))
|
|
|