Diff
Modified: trunk/Source/Platform/ChangeLog (114342 => 114343)
--- trunk/Source/Platform/ChangeLog 2012-04-17 05:08:58 UTC (rev 114342)
+++ trunk/Source/Platform/ChangeLog 2012-04-17 05:28:33 UTC (rev 114343)
@@ -1,3 +1,29 @@
+2012-04-16 Dana Jansens <[email protected]>
+
+ [chromium] Expose compositor filters to Aura through WebLayer
+ https://bugs.webkit.org/show_bug.cgi?id=80054
+
+ Reviewed by James Robinson.
+
+ * chromium/public/WebFilterOperation.h: Added.
+ (WebKit):
+ (WebFilterOperation):
+ (WebKit::WebFilterOperation::WebFilterOperation):
+ (WebBasicColorMatrixFilterOperation):
+ (WebKit::WebBasicColorMatrixFilterOperation::WebBasicColorMatrixFilterOperation):
+ (WebBasicComponentTransferFilterOperation):
+ (WebKit::WebBasicComponentTransferFilterOperation::WebBasicComponentTransferFilterOperation):
+ (WebBlurFilterOperation):
+ (WebKit::WebBlurFilterOperation::WebBlurFilterOperation):
+ (WebDropShadowFilterOperation):
+ (WebKit::WebDropShadowFilterOperation::WebDropShadowFilterOperation):
+ * chromium/public/WebFilterOperations.h: Added.
+ (WebKit):
+ (WebFilterOperations):
+ * chromium/public/WebLayer.h:
+ (WebKit):
+ (WebLayer):
+
2012-04-13 James Robinson <[email protected]>
[chromium] Expose WebVideoLayer to Platform API and port WebMediaPlayerClientImpl to using it
Added: trunk/Source/Platform/chromium/public/WebFilterOperation.h (0 => 114343)
--- trunk/Source/Platform/chromium/public/WebFilterOperation.h (rev 0)
+++ trunk/Source/Platform/chromium/public/WebFilterOperation.h 2012-04-17 05:28:33 UTC (rev 114343)
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2012 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 WebFilterOperation_h
+#define WebFilterOperation_h
+
+#include "WebCommon.h"
+
+#include "WebColor.h"
+
+#if WEBKIT_IMPLEMENTATION
+#include <wtf/PassRefPtr.h>
+#endif
+
+#if WEBKIT_IMPLEMENTATION
+namespace WebCore {
+class FilterOperation;
+}
+#endif
+
+namespace WebKit {
+
+struct WebFilterOperation {
+#if WEBKIT_IMPLEMENTATION
+ virtual PassRefPtr<WebCore::FilterOperation> toFilterOperation() const = 0;
+#endif
+
+protected:
+ WebFilterOperation() { }
+};
+
+struct WebBasicColorMatrixFilterOperation : public WebFilterOperation {
+ enum FilterType {
+ FilterTypeGrayscale = 1,
+ FilterTypeSepia = 2,
+ FilterTypeSaturate = 3,
+ FilterTypeHueRotate = 4
+ };
+
+ WebBasicColorMatrixFilterOperation(FilterType type, float amount)
+ : type(type)
+ , amount(amount)
+ { }
+
+#if WEBKIT_IMPLEMENTATION
+ virtual PassRefPtr<WebCore::FilterOperation> toFilterOperation() const OVERRIDE;
+#endif
+
+ FilterType type;
+ float amount;
+};
+
+struct WebBasicComponentTransferFilterOperation : public WebFilterOperation {
+ enum FilterType {
+ FilterTypeInvert = 5,
+ FilterTypeBrightness = 7,
+ FilterTypeContrast = 8
+ // Opacity is missing because this is more expensive than just setting opacity on the layer.
+ };
+
+ WebBasicComponentTransferFilterOperation(FilterType type, float amount)
+ : type(type)
+ , amount(amount)
+ { }
+
+#if WEBKIT_IMPLEMENTATION
+ virtual PassRefPtr<WebCore::FilterOperation> toFilterOperation() const OVERRIDE;
+#endif
+
+ FilterType type;
+ float amount;
+};
+
+struct WebBlurFilterOperation : public WebFilterOperation {
+ explicit WebBlurFilterOperation(int pixelRadius) : pixelRadius(pixelRadius) { }
+
+#if WEBKIT_IMPLEMENTATION
+ virtual PassRefPtr<WebCore::FilterOperation> toFilterOperation() const OVERRIDE;
+#endif
+
+ int pixelRadius;
+};
+
+class WebDropShadowFilterOperation : public WebFilterOperation {
+ WebDropShadowFilterOperation(int x, int y, int stdDeviation, WebColor color)
+ : x(x)
+ , y(y)
+ , stdDeviation(stdDeviation)
+ , color(color)
+ { }
+
+#if WEBKIT_IMPLEMENTATION
+ virtual PassRefPtr<WebCore::FilterOperation> toFilterOperation() const OVERRIDE;
+#endif
+
+ int x;
+ int y;
+ int stdDeviation;
+ WebColor color;
+};
+
+}
+
+#endif
Added: trunk/Source/Platform/chromium/public/WebFilterOperations.h (0 => 114343)
--- trunk/Source/Platform/chromium/public/WebFilterOperations.h (rev 0)
+++ trunk/Source/Platform/chromium/public/WebFilterOperations.h 2012-04-17 05:28:33 UTC (rev 114343)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2012 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 WebFilterOperations_h
+#define WebFilterOperations_h
+
+#include "WebCommon.h"
+#include "WebPrivateOwnPtr.h"
+
+#if WEBKIT_IMPLEMENTATION
+namespace WebCore {
+class FilterOperations;
+}
+#endif
+
+namespace WebKit {
+class WebFilterOperation;
+
+// An ordered set of filter operations.
+class WebFilterOperations {
+public:
+ WebFilterOperations();
+
+ void append(const WebFilterOperation&);
+
+ // Removes all filter operations.
+ void clear();
+
+#if WEBKIT_IMPLEMENTATION
+ const WebCore::FilterOperations& toFilterOperations() const;
+#endif
+
+private:
+ WebPrivateOwnPtr<WebCore::FilterOperations> m_private;
+};
+
+}
+
+#endif
Modified: trunk/Source/Platform/chromium/public/WebLayer.h (114342 => 114343)
--- trunk/Source/Platform/chromium/public/WebLayer.h 2012-04-17 05:08:58 UTC (rev 114342)
+++ trunk/Source/Platform/chromium/public/WebLayer.h 2012-04-17 05:28:33 UTC (rev 114343)
@@ -34,6 +34,7 @@
namespace WebCore { class LayerChromium; }
namespace WebKit {
+class WebFilterOperations;
struct WebFloatPoint;
struct WebSize;
@@ -98,6 +99,17 @@
WEBKIT_EXPORT void setDebugBorderColor(const WebColor&);
WEBKIT_EXPORT void setDebugBorderWidth(float);
+ // Clear the filters in use by passing in a newly instantiated
+ // WebFilterOperations object.
+ WEBKIT_EXPORT void setFilters(const WebFilterOperations&);
+
+ // Apply filters to pixels that show through the background of this layer.
+ // Note: These filters are only possible on layers that are drawn directly
+ // to the root render surface. This means if an ancestor of the background-
+ // filtered layer sets certain properties (opacity, transforms), it may
+ // conflict and hide the background filters.
+ WEBKIT_EXPORT void setBackgroundFilters(const WebFilterOperations&);
+
template<typename T> T to()
{
T res;
Modified: trunk/Source/WebCore/ChangeLog (114342 => 114343)
--- trunk/Source/WebCore/ChangeLog 2012-04-17 05:08:58 UTC (rev 114342)
+++ trunk/Source/WebCore/ChangeLog 2012-04-17 05:28:33 UTC (rev 114343)
@@ -1,3 +1,31 @@
+2012-04-16 Dana Jansens <[email protected]>
+
+ [chromium] Expose compositor filters to Aura through WebLayer
+ https://bugs.webkit.org/show_bug.cgi?id=80054
+
+ Reviewed by James Robinson.
+
+ Adds WebFilterOperation that wraps WebCore::FilterOperation and
+ WebFilterOperations that wraps WebCore::FilterOperations.
+
+ We add support for most of the FilterOperation subclasses, and
+ allow the user to set the WebFilterOperations for both layer
+ content filters and background filters.
+
+ * WebCore.gypi:
+ * platform/chromium/support/WebFilterOperation.cpp: Added.
+ (WebKit):
+ (WebKit::WebBasicColorMatrixFilterOperation::toFilterOperation):
+ (WebKit::WebBasicComponentTransferFilterOperation::toFilterOperation):
+ (WebKit::WebBlurFilterOperation::toFilterOperation):
+ (WebKit::WebDropShadowFilterOperation::toFilterOperation):
+ * platform/chromium/support/WebFilterOperations.cpp: Added.
+ (WebKit):
+ (WebKit::WebFilterOperations::WebFilterOperations):
+ (WebKit::WebFilterOperations::append):
+ (WebKit::WebFilterOperations::clear):
+ (WebKit::WebFilterOperations::toFilterOperations):
+
2012-04-16 Andrei Burago <[email protected]>
Auto-sized frames may be taller than expected
Modified: trunk/Source/WebCore/WebCore.gypi (114342 => 114343)
--- trunk/Source/WebCore/WebCore.gypi 2012-04-17 05:08:58 UTC (rev 114342)
+++ trunk/Source/WebCore/WebCore.gypi 2012-04-17 05:28:33 UTC (rev 114343)
@@ -8211,6 +8211,8 @@
'platform/chromium/support/WebData.cpp',
'platform/chromium/support/WebHTTPBody.cpp',
'platform/chromium/support/WebHTTPLoadInfo.cpp',
+ 'platform/chromium/support/WebFilterOperation.cpp',
+ 'platform/chromium/support/WebFilterOperations.cpp',
'platform/chromium/support/WebICECandidateDescriptor.cpp',
'platform/chromium/support/WebICEOptions.cpp',
'platform/chromium/support/WebMediaHints.cpp',
Added: trunk/Source/WebCore/platform/chromium/support/WebFilterOperation.cpp (0 => 114343)
--- trunk/Source/WebCore/platform/chromium/support/WebFilterOperation.cpp (rev 0)
+++ trunk/Source/WebCore/platform/chromium/support/WebFilterOperation.cpp 2012-04-17 05:28:33 UTC (rev 114343)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+#include "config.h"
+
+#include "FilterOperation.h"
+
+#include <public/WebFilterOperation.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+PassRefPtr<WebCore::FilterOperation> WebBasicColorMatrixFilterOperation::toFilterOperation() const
+{
+ return BasicColorMatrixFilterOperation::create(amount, static_cast<FilterOperation::OperationType>(type));
+}
+
+PassRefPtr<WebCore::FilterOperation> WebBasicComponentTransferFilterOperation::toFilterOperation() const
+{
+ return BasicComponentTransferFilterOperation::create(amount, static_cast<FilterOperation::OperationType>(type));
+}
+
+PassRefPtr<WebCore::FilterOperation> WebBlurFilterOperation::toFilterOperation() const
+{
+ return BlurFilterOperation::create(Length(pixelRadius, Fixed), FilterOperation::BLUR);
+}
+
+PassRefPtr<WebCore::FilterOperation> WebDropShadowFilterOperation::toFilterOperation() const
+{
+ return DropShadowFilterOperation::create(x, y, stdDeviation, color, FilterOperation::DROP_SHADOW);
+}
+
+} // namespace WebKit
Added: trunk/Source/WebCore/platform/chromium/support/WebFilterOperations.cpp (0 => 114343)
--- trunk/Source/WebCore/platform/chromium/support/WebFilterOperations.cpp (rev 0)
+++ trunk/Source/WebCore/platform/chromium/support/WebFilterOperations.cpp 2012-04-17 05:28:33 UTC (rev 114343)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+#include "config.h"
+
+#include "FilterOperations.h"
+
+#include <public/WebFilterOperation.h>
+#include <public/WebFilterOperations.h>
+#include <wtf/RefPtr.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+WebFilterOperations::WebFilterOperations()
+{
+ m_private.reset(new FilterOperations());
+}
+
+void WebFilterOperations::append(const WebFilterOperation& filter)
+{
+ m_private->operations().append(filter.toFilterOperation());
+}
+
+void WebFilterOperations::clear()
+{
+ m_private->operations().clear();
+}
+
+const FilterOperations& WebFilterOperations::toFilterOperations() const
+{
+ return *m_private.get();
+}
+
+} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/ChangeLog (114342 => 114343)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-17 05:08:58 UTC (rev 114342)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-17 05:28:33 UTC (rev 114343)
@@ -1,3 +1,16 @@
+2012-04-16 Dana Jansens <[email protected]>
+
+ [chromium] Expose compositor filters to Aura through WebLayer
+ https://bugs.webkit.org/show_bug.cgi?id=80054
+
+ Reviewed by James Robinson.
+
+ * WebKit.gyp:
+ * src/WebLayer.cpp:
+ (WebKit::WebLayer::setFilters):
+ (WebKit):
+ (WebKit::WebLayer::setBackgroundFilters):
+
2012-04-16 Sheriff Bot <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (114342 => 114343)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-04-17 05:08:58 UTC (rev 114342)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-04-17 05:28:33 UTC (rev 114343)
@@ -309,6 +309,8 @@
'public/platform/WebDragData.h',
'public/platform/WebExternalTextureLayer.h',
'public/platform/WebFileSystem.h',
+ 'public/platform/WebFilterOperation.h',
+ 'public/platform/WebFilterOperations.h',
'public/platform/WebFloatPoint.h',
'public/platform/WebFloatQuad.h',
'public/platform/WebFloatRect.h',
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (114342 => 114343)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-04-17 05:08:58 UTC (rev 114342)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-04-17 05:28:33 UTC (rev 114343)
@@ -43,6 +43,7 @@
#include "ExceptionCode.h"
#include "FileError.h"
#include "FileMetadata.h"
+#include "FilterOperation.h"
#include "FontDescription.h"
#include "FontSmoothingMode.h"
#include "GeolocationError.h"
@@ -105,6 +106,7 @@
#include "platform/WebMediaStreamSource.h"
#include "platform/WebPeerConnection00Handler.h"
#include "platform/WebPeerConnection00HandlerClient.h"
+#include <public/WebFilterOperation.h>
#include <wtf/Assertions.h>
#include <wtf/text/StringImpl.h>
@@ -317,6 +319,15 @@
COMPILE_ASSERT_MATCHING_ENUM(WebEditingActionPasted, EditorInsertActionPasted);
COMPILE_ASSERT_MATCHING_ENUM(WebEditingActionDropped, EditorInsertActionDropped);
+COMPILE_ASSERT_MATCHING_ENUM(WebBasicColorMatrixFilterOperation::FilterTypeGrayscale, FilterOperation::GRAYSCALE);
+COMPILE_ASSERT_MATCHING_ENUM(WebBasicColorMatrixFilterOperation::FilterTypeSepia, FilterOperation::SEPIA);
+COMPILE_ASSERT_MATCHING_ENUM(WebBasicColorMatrixFilterOperation::FilterTypeSaturate, FilterOperation::SATURATE);
+COMPILE_ASSERT_MATCHING_ENUM(WebBasicColorMatrixFilterOperation::FilterTypeHueRotate, FilterOperation::HUE_ROTATE);
+
+COMPILE_ASSERT_MATCHING_ENUM(WebBasicComponentTransferFilterOperation::FilterTypeInvert, FilterOperation::INVERT);
+COMPILE_ASSERT_MATCHING_ENUM(WebBasicComponentTransferFilterOperation::FilterTypeBrightness, FilterOperation::BRIGHTNESS);
+COMPILE_ASSERT_MATCHING_ENUM(WebBasicComponentTransferFilterOperation::FilterTypeContrast, FilterOperation::CONTRAST);
+
COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::GenericFamilyNone, FontDescription::NoFamily);
COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::GenericFamilyStandard, FontDescription::StandardFamily);
COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::GenericFamilySerif, FontDescription::SerifFamily);
Modified: trunk/Source/WebKit/chromium/src/WebLayer.cpp (114342 => 114343)
--- trunk/Source/WebKit/chromium/src/WebLayer.cpp 2012-04-17 05:08:58 UTC (rev 114342)
+++ trunk/Source/WebKit/chromium/src/WebLayer.cpp 2012-04-17 05:28:33 UTC (rev 114343)
@@ -26,14 +26,16 @@
#include "config.h"
#include "platform/WebLayer.h"
-#include "platform/WebFloatPoint.h"
#include "Color.h"
#include "LayerChromium.h"
#include "SkMatrix44.h"
#include "TransformationMatrix.h"
#include "WebLayerImpl.h"
+#include "platform/WebFloatPoint.h"
#include "platform/WebSize.h"
+#include <public/WebFilterOperations.h>
+
using namespace WebCore;
namespace {
@@ -246,6 +248,16 @@
m_private->setDebugBorderWidth(width);
}
+void WebLayer::setFilters(const WebFilterOperations& filters)
+{
+ m_private->setFilters(filters.toFilterOperations());
+}
+
+void WebLayer::setBackgroundFilters(const WebFilterOperations& filters)
+{
+ m_private->setBackgroundFilters(filters.toFilterOperations());
+}
+
WebLayer::WebLayer(const PassRefPtr<LayerChromium>& node)
: m_private(node)
{
