Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 83 deletions

diff --git a/WebCore/css/CSSProperty.h b/WebCore/css/CSSProperty.h
deleted file mode 100644
index 106171d..0000000
--- a/WebCore/css/CSSProperty.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
- *
- * 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 CSSProperty_h
-#define CSSProperty_h
-
-#include "CSSValue.h"
-#include "RenderStyleConstants.h"
-#include "TextDirection.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class CSSProperty : public FastAllocBase {
-public:
-    CSSProperty(int propID, PassRefPtr<CSSValue> value, bool important = false, int shorthandID = 0, bool implicit = false)
-        : m_id(propID)
-        , m_shorthandID(shorthandID)
-        , m_important(important)
-        , m_implicit(implicit)
-        , m_value(value)
-    {
-    }
-
-    CSSProperty& operator=(const CSSProperty& other)
-    {
-        m_id = other.m_id;
-        m_shorthandID = other.m_shorthandID;
-        m_important = other.m_important;
-        m_implicit = other.m_implicit;
-        m_value = other.m_value;
-        return *this;
-    }
-
-    int id() const { return m_id; }
-    int shorthandID() const { return m_shorthandID; }
-
-    bool isImportant() const { return m_important; }
-    bool isImplicit() const { return m_implicit; }
-
-    CSSValue* value() const { return m_value.get(); }
-    
-    String cssText() const;
-
-    static int resolveDirectionAwareProperty(int propertyID, TextDirection, WritingMode);
-
-    friend bool operator==(const CSSProperty&, const CSSProperty&);
-
-    // Make sure the following fits in 4 bytes. Really.
-    int m_id : 15;
-    int m_shorthandID : 15; // If this property was set as part of a shorthand, gives the shorthand.
-    bool m_important : 1;
-    bool m_implicit : 1; // Whether or not the property was set implicitly as the result of a shorthand.
-
-    RefPtr<CSSValue> m_value;
-};
-
-} // namespace WebCore
-
-namespace WTF {
-    // Properties in Vector can be initialized with memset and moved using memcpy.
-    template<> struct VectorTraits<WebCore::CSSProperty> : SimpleClassVectorTraits { };
-}
-
-#endif // CSSProperty_h