Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119)

New snapshot with prospective build fix for incorrect QtWebKit master module header file creation

3 files changed, 16 insertions, 3 deletions

diff --git a/Source/WebCore/rendering/style/SVGRenderStyle.cpp b/Source/WebCore/rendering/style/SVGRenderStyle.cpp
index edb45cd4b..d74019d1c 100644
--- a/Source/WebCore/rendering/style/SVGRenderStyle.cpp
+++ b/Source/WebCore/rendering/style/SVGRenderStyle.cpp
@@ -223,6 +223,9 @@ StyleDifference SVGRenderStyle::diff(const SVGRenderStyle* other) const
     if (svg_noninherited_flags.f._vectorEffect != other->svg_noninherited_flags.f._vectorEffect)
         return StyleDifferenceRepaint;
 
+    if (svg_noninherited_flags.f.maskType != other->svg_noninherited_flags.f.maskType)
+        return StyleDifferenceRepaint;
+
     return StyleDifferenceEqual;
 }
 
diff --git a/Source/WebCore/rendering/style/SVGRenderStyle.h b/Source/WebCore/rendering/style/SVGRenderStyle.h
index e8984c048..be0a479bc 100644
--- a/Source/WebCore/rendering/style/SVGRenderStyle.h
+++ b/Source/WebCore/rendering/style/SVGRenderStyle.h
@@ -92,6 +92,7 @@ public:
     static String initialMarkerStartResource() { return String(); }
     static String initialMarkerMidResource() { return String(); }
     static String initialMarkerEndResource() { return String(); }
+    static EMaskType initialMaskType() { return MT_LUMINANCE; }
 
     static SVGLength initialBaselineShiftValue()
     {
@@ -146,7 +147,8 @@ public:
     void setWritingMode(SVGWritingMode val) { svg_inherited_flags._writingMode = val; }
     void setGlyphOrientationHorizontal(EGlyphOrientation val) { svg_inherited_flags._glyphOrientationHorizontal = val; }
     void setGlyphOrientationVertical(EGlyphOrientation val) { svg_inherited_flags._glyphOrientationVertical = val; }
-    
+    void setMaskType(EMaskType val) { svg_noninherited_flags.f.maskType = val; }
+
     void setFillOpacity(float obj)
     {
         if (!(fill->opacity == obj))
@@ -348,7 +350,8 @@ public:
     String markerStartResource() const { return inheritedResources->markerStart; }
     String markerMidResource() const { return inheritedResources->markerMid; }
     String markerEndResource() const { return inheritedResources->markerEnd; }
-    
+    EMaskType maskType() const { return (EMaskType) svg_noninherited_flags.f.maskType; }
+
     const SVGPaint::SVGPaintType& visitedLinkFillPaintType() const { return fill->visitedLinkPaintType; }
     const Color& visitedLinkFillPaintColor() const { return fill->visitedLinkPaintColor; }
     const String& visitedLinkFillPaintUri() const { return fill->visitedLinkPaintUri; }
@@ -416,7 +419,8 @@ protected:
                 unsigned _dominantBaseline : 4; // EDominantBaseline
                 unsigned _baselineShift : 2; // EBaselineShift
                 unsigned _vectorEffect: 1; // EVectorEffect
-                // 21 bits unused
+                unsigned maskType: 1; // EMaskType
+                // 20 bits unused
             } f;
             uint32_t _niflags;
         };
@@ -461,6 +465,7 @@ private:
         svg_noninherited_flags.f._dominantBaseline = initialDominantBaseline();
         svg_noninherited_flags.f._baselineShift = initialBaselineShift();
         svg_noninherited_flags.f._vectorEffect = initialVectorEffect();
+        svg_noninherited_flags.f.maskType = initialMaskType();
     }
 };
 
diff --git a/Source/WebCore/rendering/style/SVGRenderStyleDefs.h b/Source/WebCore/rendering/style/SVGRenderStyleDefs.h
index 931dbe3f9..e7308ca99 100644
--- a/Source/WebCore/rendering/style/SVGRenderStyleDefs.h
+++ b/Source/WebCore/rendering/style/SVGRenderStyleDefs.h
@@ -83,6 +83,11 @@ namespace WebCore {
         VE_NON_SCALING_STROKE
     };
 
+    enum EMaskType {
+        MT_LUMINANCE,
+        MT_ALPHA
+    };
+
     class CSSValue;
     class CSSValueList;
     class SVGPaint;