Changeset 154133 in webkit for trunk/Source/WebCore/css/CSSValue.cpp

Timestamp:

Aug 15, 2013, 2:29:26 PM (12 years ago)

Author:

[email protected]

Message:

Implement CSS Image filter() function
​https://bugs.webkit.org/show_bug.cgi?id=119845

Reviewed by Dean Jackson.

Source/WebCore:

The Filter Effects specification defines a new CSS Image function called
filter(). This function takes another CSS Image as well as a filter function
list as input and can be used by various CSS properties.

Example:

background-image: -webkit-filter(url(image.png), brightness(0.5))

This patch implements the current definition of filter() based on other
image generation classes like CSSCrossfadeValue.
A new class called CSSFilterImageValue was added together with an
image observer.

The function is implemented prefixed and behind the compiler flag CSS_FILTERS.

Tests: fast/filter-image/filter-image.html

fast/filter-image/parse-filter-image.html

• CMakeLists.txt: Added new files to build systems.
• GNUmakefile.list.am:
• Target.pri:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSAllInOne.cpp:
• css/CSSCrossfadeValue.cpp: Share code together with CSSFilterImageValue

in CSSImageGeneratorValue.cpp.

(WebCore::CSSCrossfadeValue::isPending):
(WebCore::CSSCrossfadeValue::loadSubimages):

• css/CSSFilterImageValue.cpp: Added.

(WebCore::CSSFilterImageValue::~CSSFilterImageValue):
(WebCore::CSSFilterImageValue::customCssText):
(WebCore::CSSFilterImageValue::fixedSize):
(WebCore::CSSFilterImageValue::isPending):
(WebCore::CSSFilterImageValue::knownToBeOpaque):
(WebCore::CSSFilterImageValue::loadSubimages):
(WebCore::CSSFilterImageValue::image):
(WebCore::CSSFilterImageValue::filterImageChanged):
(WebCore::CSSFilterImageValue::createFilterOperations):
(WebCore::CSSFilterImageValue::FilterSubimageObserverProxy::imageChanged):
(WebCore::CSSFilterImageValue::hasFailedOrCanceledSubresources):
(WebCore::CSSFilterImageValue::equals):

• css/CSSFilterImageValue.h: Added.

(WebCore::CSSFilterImageValue::create):
(WebCore::CSSFilterImageValue::isFixedSize):
(WebCore::CSSFilterImageValue::CSSFilterImageValue):
(WebCore::CSSFilterImageValue::FilterSubimageObserverProxy::FilterSubimageObserverProxy):
(WebCore::CSSFilterImageValue::FilterSubimageObserverProxy::~FilterSubimageObserverProxy):
(WebCore::CSSFilterImageValue::FilterSubimageObserverProxy::setReady):

• css/CSSImageGeneratorValue.cpp: Shared code between CSSCrossfadeValue and

CSSFilterImageValue.

(WebCore::CSSImageGeneratorValue::image):
(WebCore::CSSImageGeneratorValue::isFixedSize):
(WebCore::CSSImageGeneratorValue::fixedSize):
(WebCore::CSSImageGeneratorValue::isPending):
(WebCore::CSSImageGeneratorValue::knownToBeOpaque):
(WebCore::CSSImageGeneratorValue::loadSubimages):
(WebCore::CSSImageGeneratorValue::subimageIsPending):
(WebCore::CSSImageGeneratorValue::cachedImageForCSSValue):

• css/CSSImageGeneratorValue.h:
• css/CSSParser.cpp: Added parsing information for new image function.

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::isGeneratedImageValue):
(WebCore::CSSParser::parseGeneratedImage):
(WebCore::CSSParser::parseFilterImage):
(WebCore::CSSParser::parseFilter):

• css/CSSParser.h:
• css/CSSValue.cpp:

(WebCore::CSSValue::hasFailedOrCanceledSubresources):
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):

• css/CSSValue.h:

(WebCore::CSSValue::isFilterImageValue):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::generatedOrPendingFromValue):
(WebCore::StyleResolver::createFilterOperations):

• css/StyleResolver.h: StyleResolver needs to be passed to

CSSFilterImageValue in order to resolve blur() and
drop-shadow() function. Both needs to be resolved together
with all other properties and can't be done earlier or later.

• rendering/FilterEffectRenderer.cpp:

(WebCore::FilterEffectRenderer::build): Pass an argument whether the

intermediate filter results should be clipped or not. The filter
property for instance doesn't clip but scales the intermediate
image sizes.

• rendering/FilterEffectRenderer.h:

LayoutTests:

Test parsing, style resolving, computed style and behavior of new
CSS image function filter().

• fast/filter-image/filter-image-expected.html: Added.
• fast/filter-image/filter-image.html: Added.
• fast/filter-image/parse-filter-image-expected.txt: Added.
• fast/filter-image/parse-filter-image.html: Added.
• fast/filter-image/resources/image.svg: Added.

File:

• trunk/Source/WebCore/css/CSSValue.cpp (modified) (6 diffs)

trunk/Source/WebCore/css/CSSValue.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2011 Andreas Kling ([email protected])
+ * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34 +35 @@
 #include "CSSCrossfadeValue.h"
 #include "CSSCursorImageValue.h"
+#include "CSSFilterImageValue.h"
 #include "CSSFontFaceSrcValue.h"
 #include "CSSFunctionValue.h"
@@ -138 +140 @@
     if (classType() == CrossfadeClass)
         return static_cast<const CSSCrossfadeValue*>(this)->hasFailedOrCanceledSubresources();
+#if ENABLE(CSS_FILTERS)
+    if (classType() == FilterImageClass)
+        return static_cast<const CSSFilterImageValue*>(this)->hasFailedOrCanceledSubresources();
+#endif
 #if ENABLE(CSS_IMAGE_SET)
     if (classType() == ImageSetClass)
@@ -168 +174 @@
         case CursorImageClass:
             return compareCSSValues<CSSCursorImageValue>(*this, other);
+#if ENABLE(CSS_FILTERS)
+        case FilterImageClass:
+            return compareCSSValues<CSSFilterImageValue>(*this, other);
+#endif
         case FontClass:
             return compareCSSValues<FontValue>(*this, other);
@@ -268 +278 @@
     case CursorImageClass:
         return static_cast<const CSSCursorImageValue*>(this)->customCssText();
+#if ENABLE(CSS_FILTERS)
+    case FilterImageClass:
+        return static_cast<const CSSFilterImageValue*>(this)->customCssText();
+#endif
     case FontClass:
         return static_cast<const FontValue*>(this)->customCssText();
@@ -454 +468 @@
 #endif
 #if ENABLE(CSS_FILTERS)
+    case FilterImageClass:
+        delete static_cast<CSSFilterImageValue*>(this);
+        return;
     case WebKitCSSFilterClass:
         delete static_cast<WebKitCSSFilterValue*>(this);