Skip to content

GitLab

T
tangled
Commit bc17b043 authored by kouhei@chromium.org's avatar kouhei@chromium.org
Browse files
Options

[SVG] remove deprecated SVG{Static,Animated}{,List}PropertyTearOff.h 

These header files are not being referenced from anywhere. They were replaced by NewSVGAnimatedProperty.h

BUG=349370
TBR=haraken,pdr,fs

Review URL: https://codereview.chromium.org/188413003

git-svn-id: svn://svn.chromium.org/blink/trunk@168589 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e78aebfd
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 498 deletions
third_party/WebKit/Source/core/svg/properties/SVGAnimatedListPropertyTearOff.h deleted 100644 → 0
View file @ e78aebfd
/*
* Copyright (C) Research In Motion Limited 2010. 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.
*/
#ifndef SVGAnimatedListPropertyTearOff_h
#define SVGAnimatedListPropertyTearOff_h
#include "core/svg/properties/SVGAnimatedProperty.h"
#include "core/svg/properties/SVGListPropertyTearOff.h"
#include "core/svg/properties/SVGStaticListPropertyTearOff.h"
namespace WebCore {
template<typename PropertyType>
class SVGPropertyTearOff;
template<typename PropertyType>
class SVGAnimatedListPropertyTearOff : public SVGAnimatedProperty {
public:
typedef typename SVGPropertyTraits<PropertyType>::ListItemType ListItemType;
typedef SVGPropertyTearOff<ListItemType> ListItemTearOff;
typedef Vector<RefPtr<ListItemTearOff> > ListWrapperCache;
typedef SVGListProperty<PropertyType> ListProperty;
typedef SVGListPropertyTearOff<PropertyType> ListPropertyTearOff;
typedef PropertyType ContentType;
virtual ~SVGAnimatedListPropertyTearOff()
{
if (m_baseVal)
static_cast<ListPropertyTearOff*>(m_baseVal.get())->clearAnimatedProperty();
if (m_animVal)
static_cast<ListPropertyTearOff*>(m_animVal.get())->clearAnimatedProperty();
}
virtual ListProperty* baseVal()
{
if (!m_baseVal)
m_baseVal = ListPropertyTearOff::create(this, BaseValRole, m_values, m_wrappers);
return static_cast<ListProperty*>(m_baseVal.get());
}
virtual ListProperty* animVal()
{
if (!m_animVal)
m_animVal = ListPropertyTearOff::create(this, AnimValRole, m_values, m_wrappers);
return static_cast<ListProperty*>(m_animVal.get());
}
virtual bool isAnimatedListTearOff() const { return true; }
int findItem(SVGProperty* property) const
{
// This should ever be called for our baseVal, as animVal can't modify the list.
// It's safe to cast to ListPropertyTearOff here as all classes inheriting from us supply their own removeItemFromList() method.
typedef SVGPropertyTearOff<typename SVGPropertyTraits<PropertyType>::ListItemType> ListItemTearOff;
return static_cast<ListPropertyTearOff*>(m_baseVal.get())->findItem(static_cast<ListItemTearOff*>(property));
}
void removeItemFromList(size_t itemIndex, bool shouldSynchronizeWrappers)
{
// This should ever be called for our baseVal, as animVal can't modify the list.
// It's safe to cast to ListPropertyTearOff here as all classes inheriting from us supply their own removeItemFromList() method.
static_cast<ListPropertyTearOff*>(m_baseVal.get())->removeItemFromList(itemIndex, shouldSynchronizeWrappers);
}
void detachListWrappers(unsigned newListSize)
{
ListProperty::detachListWrappersAndResize(&m_wrappers, newListSize);
}
PropertyType& currentAnimatedValue()
{
ASSERT(m_isAnimating);
ASSERT(m_animVal);
return static_cast<ListProperty*>(m_animVal.get())->values();
}
const PropertyType& currentBaseValue() const
{
return m_values;
}
void animationStarted(PropertyType* newAnimVal, bool shouldOwnValues = false)
{
ASSERT(!m_isAnimating);
ASSERT(newAnimVal);
ASSERT(m_values.size() == m_wrappers.size());
ASSERT(m_animatedWrappers.isEmpty());
// Switch to new passed in value type & new wrappers list. The new wrappers list must be created for the new value.
if (!newAnimVal->isEmpty())
m_animatedWrappers.fill(nullptr, newAnimVal->size());
ListProperty* animVal = static_cast<ListProperty*>(this->animVal());
animVal->setValuesAndWrappers(newAnimVal, &m_animatedWrappers, shouldOwnValues);
ASSERT(animVal->values().size() == animVal->wrappers().size());
ASSERT(animVal->wrappers().size() == m_animatedWrappers.size());
m_isAnimating = true;
}
void animationEnded()
{
ASSERT(m_isAnimating);
ASSERT(m_animVal);
ASSERT(contextElement());
ASSERT(m_values.size() == m_wrappers.size());
ListProperty* animVal = static_cast<ListProperty*>(m_animVal.get());
ASSERT(animVal->values().size() == animVal->wrappers().size());
ASSERT(animVal->wrappers().size() == m_animatedWrappers.size());
animVal->setValuesAndWrappers(&m_values, &m_wrappers, false);
ASSERT(animVal->values().size() == animVal->wrappers().size());
ASSERT(animVal->wrappers().size() == m_wrappers.size());
m_animatedWrappers.clear();
m_isAnimating = false;
}
void synchronizeWrappersIfNeeded()
{
// Eventually the wrapper list needs synchronization because any SVGAnimateLengthList::calculateAnimatedValue() call may
// mutate the length of our values() list, and thus the wrapper() cache needs synchronization, to have the same size.
// Also existing wrappers which point directly at elements in the existing SVGLengthList have to be detached (so a copy
// of them is created, so existing animVal variables in JS are kept-alive). If we'd detach them later the underlying
// SVGLengthList was already mutated, and our list item wrapper tear offs would point nowhere. Assertions would fire.
ListProperty* animVal = static_cast<ListProperty*>(m_animVal.get());
animVal->detachListWrappers(animVal->values().size());
ASSERT(animVal->values().size() == animVal->wrappers().size());
ASSERT(animVal->wrappers().size() == m_animatedWrappers.size());
}
void animValWillChange()
{
ASSERT(m_isAnimating);
ASSERT(m_animVal);
ASSERT(m_values.size() == m_wrappers.size());
synchronizeWrappersIfNeeded();
}
void animValDidChange()
{
ASSERT(m_isAnimating);
ASSERT(m_animVal);
ASSERT(m_values.size() == m_wrappers.size());
synchronizeWrappersIfNeeded();
}
static PassRefPtr<SVGAnimatedListPropertyTearOff<PropertyType> > create(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType, PropertyType& values)
{
ASSERT(contextElement);
return adoptRef(new SVGAnimatedListPropertyTearOff<PropertyType>(contextElement, attributeName, animatedPropertyType, values));
}
protected:
SVGAnimatedListPropertyTearOff(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType, PropertyType& values)
: SVGAnimatedProperty(contextElement, attributeName, animatedPropertyType)
, m_values(values)
{
if (!values.isEmpty())
m_wrappers.fill(nullptr, values.size());
}
PropertyType& m_values;
ListWrapperCache m_wrappers;
ListWrapperCache m_animatedWrappers;
RefPtr<SVGProperty> m_baseVal;
RefPtr<SVGProperty> m_animVal;
};
}
#endif // SVGAnimatedListPropertyTearOff_h
third_party/WebKit/Source/core/svg/properties/SVGAnimatedPropertyTearOff.h deleted 100644 → 0
View file @ e78aebfd
/*
* Copyright (C) Research In Motion Limited 2010. 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.
*/
#ifndef SVGAnimatedPropertyTearOff_h
#define SVGAnimatedPropertyTearOff_h
#include "bindings/v8/ScriptWrappable.h"
#include "core/svg/properties/SVGAnimatedProperty.h"
#include "core/svg/properties/SVGPropertyTearOff.h"
namespace WebCore {
template<typename PropertyType>
class SVGAnimatedPropertyTearOff FINAL : public SVGAnimatedProperty, public ScriptWrappable {
public:
typedef SVGPropertyTearOff<PropertyType> PropertyTearOff;
typedef PropertyType ContentType;
virtual ~SVGAnimatedPropertyTearOff()
{
if (m_baseVal) {
ASSERT(m_baseVal->animatedProperty() == this);
m_baseVal->setAnimatedProperty(0);
}
if (m_animVal) {
ASSERT(m_animVal->animatedProperty() == this);
m_animVal->setAnimatedProperty(0);
}
}
PropertyTearOff* baseVal()
{
if (!m_baseVal)
m_baseVal = PropertyTearOff::create(this, BaseValRole, m_property);
return m_baseVal.get();
}
PropertyTearOff* animVal()
{
if (!m_animVal)
m_animVal = PropertyTearOff::create(this, AnimValRole, m_property);
return m_animVal.get();
}
static PassRefPtr<SVGAnimatedPropertyTearOff<PropertyType> > create(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType, PropertyType& property)
{
ASSERT(contextElement);
return adoptRef(new SVGAnimatedPropertyTearOff<PropertyType>(contextElement, attributeName, animatedPropertyType, property));
}
PropertyType& currentAnimatedValue()
{
ASSERT(m_isAnimating);
ASSERT(m_animVal);
return m_animVal->propertyReference();
}
const PropertyType& currentBaseValue() const
{
return m_property;
}
void animationStarted(PropertyType* newAnimVal)
{
ASSERT(!m_isAnimating);
ASSERT(newAnimVal);
animVal()->setValue(*newAnimVal);
m_isAnimating = true;
}
void animationEnded()
{
ASSERT(m_isAnimating);
ASSERT(m_animVal);
m_animVal->setValue(m_property);
m_isAnimating = false;
}
void animValWillChange()
{
// no-op for non list types.
ASSERT(m_isAnimating);
ASSERT(m_animVal);
}
void animValDidChange()
{
// no-op for non list types.
ASSERT(m_isAnimating);
ASSERT(m_animVal);
}
private:
SVGAnimatedPropertyTearOff(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType, PropertyType& property)
: SVGAnimatedProperty(contextElement, attributeName, animatedPropertyType)
, m_property(property)
{
ScriptWrappable::init(this);
}
PropertyType& m_property;
RefPtr<PropertyTearOff> m_baseVal;
RefPtr<PropertyTearOff> m_animVal;
};
}
#endif // SVGAnimatedPropertyTearOff_h
third_party/WebKit/Source/core/svg/properties/SVGStaticListPropertyTearOff.h deleted 100644 → 0
View file @ e78aebfd
/*
* Copyright (C) Research In Motion Limited 2010. 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.
*/
#ifndef SVGStaticListPropertyTearOff_h
#define SVGStaticListPropertyTearOff_h
#include "core/svg/properties/SVGListProperty.h"
namespace WebCore {
class ExceptionState;
template<typename PropertyType>
class SVGStaticListPropertyTearOff : public SVGListProperty<PropertyType> {
public:
typedef SVGListProperty<PropertyType> Base;
typedef typename SVGPropertyTraits<PropertyType>::ListItemType ListItemType;
typedef SVGPropertyTearOff<ListItemType> ListItemTearOff;
using Base::m_role;
using Base::m_values;
static PassRefPtr<SVGStaticListPropertyTearOff<PropertyType> > create(SVGElement* contextElement, PropertyType& values)
{
ASSERT(contextElement);
return adoptRef(new SVGStaticListPropertyTearOff<PropertyType>(contextElement, values));
}
SVGElement* contextElement() const { return m_contextElement; }
// SVGList API
void clear(ExceptionState& exceptionState)
{
Base::clearValues(exceptionState);
}
ListItemType initialize(const ListItemType& newItem, ExceptionState& exceptionState)
{
return Base::initializeValues(newItem, exceptionState);
}
ListItemType getItem(unsigned index, ExceptionState& exceptionState)
{
return Base::getItemValues(index, exceptionState);
}
ListItemType insertItemBefore(const ListItemType& newItem, unsigned index, ExceptionState& exceptionState)
{
return Base::insertItemBeforeValues(newItem, index, exceptionState);
}
ListItemType replaceItem(const ListItemType& newItem, unsigned index, ExceptionState& exceptionState)
{
return Base::replaceItemValues(newItem, index, exceptionState);
}
ListItemType removeItem(unsigned index, ExceptionState& exceptionState)
{
return Base::removeItemValues(index, exceptionState);
}
ListItemType appendItem(const ListItemType& newItem, ExceptionState& exceptionState)
{
return Base::appendItemValues(newItem, exceptionState);
}
private:
SVGStaticListPropertyTearOff(SVGElement* contextElement, PropertyType& values)
: SVGListProperty<PropertyType>(UndefinedRole, values, 0)
, m_contextElement(contextElement)
{
m_contextElement->setContextElement();
}
virtual void commitChange()
{
ASSERT(m_values);
ASSERT(m_contextElement);
m_values->commitChange(m_contextElement);
}
virtual bool processIncomingListItemValue(const ListItemType&, unsigned*)
{
// no-op for static lists
return true;
}
virtual bool processIncomingListItemWrapper(RefPtr<ListItemTearOff>&, unsigned*)
{
ASSERT_NOT_REACHED();
return true;
}
private:
SVGElement* m_contextElement;
};
}
#endif // SVGStaticListPropertyTearOff_h
third_party/WebKit/Source/core/svg/properties/SVGStaticPropertyTearOff.h deleted 100644 → 0
View file @ e78aebfd
/*
* Copyright (C) Research In Motion Limited 2010. 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.
*/
#ifndef SVGStaticPropertyTearOff_h
#define SVGStaticPropertyTearOff_h
#include "core/svg/properties/SVGPropertyTearOff.h"
namespace WebCore {
#if COMPILER(MSVC)
// UpdateMethod is 12 bytes. We have to pack to a size greater than or equal to that to avoid an
// alignment warning (C4121). 16 is the next-largest size allowed for packing, so we use that.
#pragma pack(push, 16)
#endif
template<typename ContextElement, typename PropertyType>
class SVGStaticPropertyTearOff FINAL : public SVGPropertyTearOff<PropertyType> {
public:
typedef SVGStaticPropertyTearOff<ContextElement, PropertyType> Self;
typedef void (ContextElement::*UpdateMethod)();
// Used for non-animated POD types that are not associated with a SVGAnimatedProperty object, nor with a XML DOM attribute
// (for example: SVGSVGElement::currentTranslate).
static PassRefPtr<Self> create(ContextElement* contextElement, PropertyType& value, UpdateMethod update)
{
ASSERT(contextElement);
return adoptRef(new Self(contextElement, value, update));
}
virtual void commitChange() OVERRIDE { (m_contextElement.get()->*m_update)(); }
private:
SVGStaticPropertyTearOff(ContextElement* contextElement, PropertyType& value, UpdateMethod update)
: SVGPropertyTearOff<PropertyType>(0, UndefinedRole, value)
, m_update(update)
, m_contextElement(contextElement)
{
m_contextElement->setContextElement();
}
UpdateMethod m_update;
RefPtr<ContextElement> m_contextElement;
};
#if COMPILER(MSVC)
#pragma pack(pop)
#endif
}
#endif // SVGStaticPropertyTearOff_h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment