Merge WebKit at r66079 : Initial merge by git

Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7

7 files changed, 4 insertions, 190 deletions

diff --git a/WebCore/rendering/style/BindingURI.cpp b/WebCore/rendering/style/BindingURI.cpp
deleted file mode 100644
index fd96de4..0000000
--- a/WebCore/rendering/style/BindingURI.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "BindingURI.h"
-
-#if ENABLE(XBL)
-
-namespace WebCore {
-
-BindingURI::BindingURI(StringImpl* uri) 
-    : m_next(0)
-{ 
-    m_uri = uri;
-    if (uri)
-        uri->ref();
-}
-
-BindingURI::~BindingURI()
-{
-    if (m_uri)
-        m_uri->deref();
-    delete m_next;
-}
-
-BindingURI* BindingURI::copy()
-{
-    BindingURI* newBinding = new BindingURI(m_uri);
-    if (next()) {
-        BindingURI* nextCopy = next()->copy();
-        newBinding->setNext(nextCopy);
-    }
-    
-    return newBinding;
-}
-
-bool BindingURI::operator==(const BindingURI& o) const
-{
-    if ((m_next && !o.m_next) || (!m_next && o.m_next) ||
-        (m_next && o.m_next && *m_next != *o.m_next))
-        return false;
-    
-    if (m_uri == o.m_uri)
-        return true;
-    if (!m_uri || !o.m_uri)
-        return false;
-    
-    return String(m_uri) == String(o.m_uri);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(XBL)
diff --git a/WebCore/rendering/style/BindingURI.h b/WebCore/rendering/style/BindingURI.h
deleted file mode 100644
index c844b1d..0000000
--- a/WebCore/rendering/style/BindingURI.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
- *           (C) 2000 Antti Koivisto (koivisto@kde.org)
- *           (C) 2000 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef BindingURI_h
-#define BindingURI_h
-#if ENABLE(XBL)
-
-#include <wtf/text/StringImpl.h>
-
-namespace WebCore {
-
-// This struct holds information about shadows for the text-shadow and box-shadow properties.
-
-struct BindingURI {
-    BindingURI(StringImpl*);
-    ~BindingURI();
-
-    BindingURI* copy();
-
-    bool operator==(const BindingURI& o) const;
-    bool operator!=(const BindingURI& o) const
-    {
-        return !(*this == o);
-    }
-
-    BindingURI* next() { return m_next; }
-    void setNext(BindingURI* n) { m_next = n; }
-
-    StringImpl* uri() { return m_uri; }
-
-    BindingURI* m_next;
-    StringImpl* m_uri;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(XBL)
-#endif // BindingURI_h
diff --git a/WebCore/rendering/style/RenderStyle.cpp b/WebCore/rendering/style/RenderStyle.cpp
index 5a66c67..aaccbf7 100644
--- a/WebCore/rendering/style/RenderStyle.cpp
+++ b/WebCore/rendering/style/RenderStyle.cpp
@@ -699,20 +699,6 @@ void RenderStyle::applyTransform(TransformationMatrix& transform, const IntSize&
     }
 }
 
-#if ENABLE(XBL)
-void RenderStyle::addBindingURI(StringImpl* uri)
-{
-    BindingURI* binding = new BindingURI(uri);
-    if (!bindingURIs())
-        SET_VAR(rareNonInheritedData, bindingURI, binding)
-    else
-        for (BindingURI* b = bindingURIs(); b; b = b->next()) {
-            if (!b->next())
-                b->setNext(binding);
-        }
-}
-#endif
-
 void RenderStyle::setTextShadow(ShadowData* val, bool add)
 {
     ASSERT(!val || (!val->spread() && val->style() == Normal));
diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h
index df32d6b..1681890 100644
--- a/WebCore/rendering/style/RenderStyle.h
+++ b/WebCore/rendering/style/RenderStyle.h
@@ -87,10 +87,6 @@
 #include "SVGRenderStyle.h"
 #endif
 
-#if ENABLE(XBL)
-#include "BindingURI.h"
-#endif
-
 #if COMPILER(WINSCW)
 #define compareEqual(t, u)      ((t) == (u))
 #else
@@ -598,9 +594,6 @@ public:
     EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninherited_flags._page_break_after); }
 
     // CSS3 Getter Methods
-#if ENABLE(XBL)
-    BindingURI* bindingURIs() const { return rareNonInheritedData->bindingURI; }
-#endif
 
     int outlineOffset() const
     {
@@ -963,12 +956,6 @@ public:
     void setPageBreakAfter(EPageBreak b) { noninherited_flags._page_break_after = b; }
 
     // CSS3 Setters
-#if ENABLE(XBL)
-    void deleteBindingURIs() { SET_VAR(rareNonInheritedData, bindingURI, static_cast<BindingURI*>(0)); }
-    void inheritBindingURIs(BindingURI* other) { SET_VAR(rareNonInheritedData, bindingURI, other->copy()); }
-    void addBindingURI(StringImpl* uri);
-#endif
-
     void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v) }
     void setTextShadow(ShadowData* val, bool add=false);
     void setTextStrokeColor(const Color& c) { SET_VAR(rareInheritedData, textStrokeColor, c) }
diff --git a/WebCore/rendering/style/SVGRenderStyle.cpp b/WebCore/rendering/style/SVGRenderStyle.cpp
index 0df26f4..dc8a5af 100644
--- a/WebCore/rendering/style/SVGRenderStyle.cpp
+++ b/WebCore/rendering/style/SVGRenderStyle.cpp
@@ -178,6 +178,10 @@ StyleDifference SVGRenderStyle::diff(const SVGRenderStyle* other) const
 
     // NOTE: All comparisions below may only return StyleDifferenceRepaint
 
+    // Shadow changes need to cause repaints.
+    if (shadowSVG != other->shadowSVG)
+        return StyleDifferenceRepaint;
+
     // Painting related properties only need repaints. 
     if (miscNotEqual) {
         if (misc->floodColor != other->misc->floodColor
diff --git a/WebCore/rendering/style/StyleRareNonInheritedData.cpp b/WebCore/rendering/style/StyleRareNonInheritedData.cpp
index d5c9536..e293984 100644
--- a/WebCore/rendering/style/StyleRareNonInheritedData.cpp
+++ b/WebCore/rendering/style/StyleRareNonInheritedData.cpp
@@ -56,9 +56,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
     , m_perspective(RenderStyle::initialPerspective())
     , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX())
     , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY())
-#if ENABLE(XBL)
-    , bindingURI(0)
-#endif
     , m_pageSize()
     , m_pageSizeType(PAGE_SIZE_AUTO)
 {
@@ -97,9 +94,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
     , m_perspective(o.m_perspective)
     , m_perspectiveOriginX(o.m_perspectiveOriginX)
     , m_perspectiveOriginY(o.m_perspectiveOriginY)
-#if ENABLE(XBL)
-    , bindingURI(o.bindingURI ? o.bindingURI->copy() : 0)
-#endif
     , m_pageSize(o.m_pageSize)
     , m_pageSizeType(o.m_pageSizeType)
 {
@@ -109,18 +103,6 @@ StyleRareNonInheritedData::~StyleRareNonInheritedData()
 {
 }
 
-#if ENABLE(XBL)
-bool StyleRareNonInheritedData::bindingsEquivalent(const StyleRareNonInheritedData& o) const
-{
-    if (this == &o) return true;
-    if (!bindingURI && o.bindingURI || bindingURI && !o.bindingURI)
-        return false;
-    if (bindingURI && o.bindingURI && (*bindingURI != *o.bindingURI))
-        return false;
-    return true;
-}
-#endif
-
 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) const
 {
     return lineClamp == o.lineClamp
@@ -152,9 +134,6 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
         && transitionDataEquivalent(o)
         && m_mask == o.m_mask
         && m_maskBoxImage == o.m_maskBoxImage
-#if ENABLE(XBL)
-        && bindingsEquivalent(o)
-#endif
         && (m_transformStyle3D == o.m_transformStyle3D)
         && (m_backfaceVisibility == o.m_backfaceVisibility)
         && (m_perspective == o.m_perspective)
diff --git a/WebCore/rendering/style/StyleRareNonInheritedData.h b/WebCore/rendering/style/StyleRareNonInheritedData.h
index 1025d81..6003ea4 100644
--- a/WebCore/rendering/style/StyleRareNonInheritedData.h
+++ b/WebCore/rendering/style/StyleRareNonInheritedData.h
@@ -54,10 +54,6 @@ struct LengthSize;
 struct StyleDashboardRegion;
 #endif
 
-#if ENABLE(XBL)
-class BindingURI;
-#endif
-
 // Page size type.
 // StyleRareNonInheritedData::m_pageSize is meaningful only when 
 // StyleRareNonInheritedData::m_pageSizeType is PAGE_SIZE_RESOLVED.
@@ -77,10 +73,6 @@ public:
     PassRefPtr<StyleRareNonInheritedData> copy() const { return adoptRef(new StyleRareNonInheritedData(*this)); }
     ~StyleRareNonInheritedData();
     
-#if ENABLE(XBL)
-    bool bindingsEquivalent(const StyleRareNonInheritedData&) const;
-#endif
-
     bool operator==(const StyleRareNonInheritedData&) const;
     bool operator!=(const StyleRareNonInheritedData& o) const { return !(*this == o); }
 
@@ -137,10 +129,6 @@ public:
     LengthSize m_pageSize;
     PageSizeType m_pageSizeType;
 
-#if ENABLE(XBL)
-    OwnPtr<BindingURI> bindingURI; // The XBL binding URI list.
-#endif
-    
 private:
     StyleRareNonInheritedData();
     StyleRareNonInheritedData(const StyleRareNonInheritedData&);