зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1427512 - Part 8: Remove nsIDOMCSSFontFeatureValuesRule. r=xidorn
MozReview-Commit-ID: FTBV7XxYd4t
This commit is contained in:
Родитель
e40121ddcd
Коммит
7d9dd0ec73
|
@ -67,7 +67,6 @@ interface nsIDOMCSSPrimitiveValue;
|
||||||
interface nsIDOMCSSRule;
|
interface nsIDOMCSSRule;
|
||||||
interface nsIDOMCSSRuleList;
|
interface nsIDOMCSSRuleList;
|
||||||
interface nsIDOMCSSKeyframeRule;
|
interface nsIDOMCSSKeyframeRule;
|
||||||
interface nsIDOMCSSFontFeatureValuesRule;
|
|
||||||
interface nsIDOMCSSStyleSheet;
|
interface nsIDOMCSSStyleSheet;
|
||||||
interface nsIDOMCSSStyleDeclaration;
|
interface nsIDOMCSSStyleDeclaration;
|
||||||
interface nsIDOMCounter;
|
interface nsIDOMCounter;
|
||||||
|
|
|
@ -9,7 +9,6 @@ with Files("**"):
|
||||||
|
|
||||||
XPIDL_SOURCES += [
|
XPIDL_SOURCES += [
|
||||||
'nsIDOMCounter.idl',
|
'nsIDOMCounter.idl',
|
||||||
'nsIDOMCSSFontFeatureValuesRule.idl',
|
|
||||||
'nsIDOMCSSImportRule.idl',
|
'nsIDOMCSSImportRule.idl',
|
||||||
'nsIDOMCSSKeyframeRule.idl',
|
'nsIDOMCSSKeyframeRule.idl',
|
||||||
'nsIDOMCSSKeyframesRule.idl',
|
'nsIDOMCSSKeyframesRule.idl',
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
#include "nsISupports.idl"
|
|
||||||
|
|
||||||
[scriptable, uuid(a343d27f-1da6-4fc3-9355-d4ca434f958e)]
|
|
||||||
interface nsIDOMCSSFontFeatureValuesRule : nsISupports
|
|
||||||
{
|
|
||||||
attribute DOMString fontFamily;
|
|
||||||
// raises(DOMException) on setting
|
|
||||||
|
|
||||||
attribute DOMString valueText;
|
|
||||||
// raises(DOMException) on setting
|
|
||||||
};
|
|
|
@ -10,29 +10,8 @@
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
namespace dom {
|
namespace dom {
|
||||||
|
|
||||||
NS_IMPL_ADDREF_INHERITED(CSSFontFeatureValuesRule, css::Rule)
|
|
||||||
NS_IMPL_RELEASE_INHERITED(CSSFontFeatureValuesRule, css::Rule)
|
|
||||||
|
|
||||||
// QueryInterface implementation for CSSFontFeatureValuesRule
|
|
||||||
// If this ever gets its own cycle-collection bits, reevaluate our IsCCLeaf
|
// If this ever gets its own cycle-collection bits, reevaluate our IsCCLeaf
|
||||||
// implementation.
|
// implementation.
|
||||||
NS_INTERFACE_MAP_BEGIN(CSSFontFeatureValuesRule)
|
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSFontFeatureValuesRule)
|
|
||||||
NS_INTERFACE_MAP_END_INHERITING(mozilla::css::Rule)
|
|
||||||
|
|
||||||
void
|
|
||||||
CSSFontFeatureValuesRule::SetFontFamily(const nsAString& aFamily,
|
|
||||||
ErrorResult& aRv)
|
|
||||||
{
|
|
||||||
aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
CSSFontFeatureValuesRule::SetValueText(const nsAString& aFamily,
|
|
||||||
ErrorResult& aRv)
|
|
||||||
{
|
|
||||||
aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
CSSFontFeatureValuesRule::IsCCLeaf() const
|
CSSFontFeatureValuesRule::IsCCLeaf() const
|
||||||
|
|
|
@ -10,33 +10,27 @@
|
||||||
#include "mozilla/css/Rule.h"
|
#include "mozilla/css/Rule.h"
|
||||||
|
|
||||||
#include "nsICSSDeclaration.h"
|
#include "nsICSSDeclaration.h"
|
||||||
#include "nsIDOMCSSFontFeatureValuesRule.h"
|
|
||||||
#include "nsIDOMCSSStyleDeclaration.h"
|
#include "nsIDOMCSSStyleDeclaration.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
namespace dom {
|
namespace dom {
|
||||||
|
|
||||||
class CSSFontFeatureValuesRule : public css::Rule
|
class CSSFontFeatureValuesRule : public css::Rule
|
||||||
, public nsIDOMCSSFontFeatureValuesRule
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
NS_DECL_ISUPPORTS_INHERITED
|
|
||||||
|
|
||||||
virtual bool IsCCLeaf() const override;
|
virtual bool IsCCLeaf() const override;
|
||||||
|
|
||||||
int32_t GetType() const final { return Rule::FONT_FEATURE_VALUES_RULE; }
|
int32_t GetType() const final { return Rule::FONT_FEATURE_VALUES_RULE; }
|
||||||
using Rule::GetType;
|
using Rule::GetType;
|
||||||
virtual already_AddRefed<mozilla::css::Rule> Clone() const override = 0;
|
virtual already_AddRefed<mozilla::css::Rule> Clone() const override = 0;
|
||||||
|
|
||||||
using nsIDOMCSSFontFeatureValuesRule::SetFontFamily;
|
|
||||||
using nsIDOMCSSFontFeatureValuesRule::SetValueText;
|
|
||||||
// WebIDL interfaces
|
// WebIDL interfaces
|
||||||
uint16_t Type() const final { return nsIDOMCSSRule::FONT_FEATURE_VALUES_RULE; }
|
uint16_t Type() const final { return nsIDOMCSSRule::FONT_FEATURE_VALUES_RULE; }
|
||||||
virtual void GetCssTextImpl(nsAString& aCssText) const override = 0;
|
virtual void GetCssTextImpl(nsAString& aCssText) const override = 0;
|
||||||
// The XPCOM GetFontFamily is fine
|
virtual void GetFontFamily(nsAString& aFamily) = 0;
|
||||||
void SetFontFamily(const nsAString& aFamily, mozilla::ErrorResult& aRv);
|
virtual void SetFontFamily(const nsAString& aFamily, mozilla::ErrorResult& aRv) = 0;
|
||||||
// The XPCOM GetValueText is fine
|
virtual void GetValueText(nsAString& aValueText) = 0;
|
||||||
void SetValueText(const nsAString& aFamily, mozilla::ErrorResult& aRv);
|
virtual void SetValueText(const nsAString& aValueText, mozilla::ErrorResult& aRv) = 0;
|
||||||
|
|
||||||
virtual size_t
|
virtual size_t
|
||||||
SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override = 0;
|
SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override = 0;
|
||||||
|
|
|
@ -26,13 +26,6 @@ ServoFontFeatureValuesRule::~ServoFontFeatureValuesRule()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMPL_ADDREF_INHERITED(ServoFontFeatureValuesRule, CSSFontFeatureValuesRule)
|
|
||||||
NS_IMPL_RELEASE_INHERITED(ServoFontFeatureValuesRule, CSSFontFeatureValuesRule)
|
|
||||||
|
|
||||||
// QueryInterface implementation for FontFeatureValuesRule
|
|
||||||
NS_INTERFACE_MAP_BEGIN(ServoFontFeatureValuesRule)
|
|
||||||
NS_INTERFACE_MAP_END_INHERITING(CSSFontFeatureValuesRule)
|
|
||||||
|
|
||||||
already_AddRefed<css::Rule>
|
already_AddRefed<css::Rule>
|
||||||
ServoFontFeatureValuesRule::Clone() const
|
ServoFontFeatureValuesRule::Clone() const
|
||||||
{
|
{
|
||||||
|
@ -73,30 +66,30 @@ ServoFontFeatureValuesRule::GetCssTextImpl(nsAString& aCssText) const
|
||||||
|
|
||||||
/* CSSFontFeatureValuesRule implementation */
|
/* CSSFontFeatureValuesRule implementation */
|
||||||
|
|
||||||
NS_IMETHODIMP
|
void
|
||||||
ServoFontFeatureValuesRule::GetFontFamily(nsAString& aFamilyListStr)
|
ServoFontFeatureValuesRule::GetFontFamily(nsAString& aFamilyListStr)
|
||||||
{
|
{
|
||||||
Servo_FontFeatureValuesRule_GetFontFamily(mRawRule, &aFamilyListStr);
|
Servo_FontFeatureValuesRule_GetFontFamily(mRawRule, &aFamilyListStr);
|
||||||
return NS_OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
void
|
||||||
ServoFontFeatureValuesRule::GetValueText(nsAString& aValueText)
|
ServoFontFeatureValuesRule::GetValueText(nsAString& aValueText)
|
||||||
{
|
{
|
||||||
Servo_FontFeatureValuesRule_GetValueText(mRawRule, &aValueText);
|
Servo_FontFeatureValuesRule_GetValueText(mRawRule, &aValueText);
|
||||||
return NS_OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
void
|
||||||
ServoFontFeatureValuesRule::SetFontFamily(const nsAString& aFontFamily)
|
ServoFontFeatureValuesRule::SetFontFamily(const nsAString& aFontFamily,
|
||||||
|
ErrorResult& aRv)
|
||||||
{
|
{
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
void
|
||||||
ServoFontFeatureValuesRule::SetValueText(const nsAString& aValueText)
|
ServoFontFeatureValuesRule::SetValueText(const nsAString& aValueText,
|
||||||
|
ErrorResult& aRv)
|
||||||
{
|
{
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace mozilla
|
} // namespace mozilla
|
||||||
|
|
|
@ -20,15 +20,14 @@ public:
|
||||||
ServoFontFeatureValuesRule(RefPtr<RawServoFontFeatureValuesRule> aRawRule,
|
ServoFontFeatureValuesRule(RefPtr<RawServoFontFeatureValuesRule> aRawRule,
|
||||||
uint32_t aLine, uint32_t aColumn);
|
uint32_t aLine, uint32_t aColumn);
|
||||||
|
|
||||||
NS_DECL_ISUPPORTS_INHERITED
|
|
||||||
|
|
||||||
RawServoFontFeatureValuesRule* Raw() const { return mRawRule; }
|
RawServoFontFeatureValuesRule* Raw() const { return mRawRule; }
|
||||||
|
|
||||||
// nsIDOMCSSFontFeatureValuesRule interface
|
|
||||||
NS_DECL_NSIDOMCSSFONTFEATUREVALUESRULE
|
|
||||||
|
|
||||||
// WebIDL interface
|
// WebIDL interface
|
||||||
void GetCssTextImpl(nsAString& aCssText) const override;
|
void GetCssTextImpl(nsAString& aCssText) const override;
|
||||||
|
void GetFontFamily(nsAString& aFamily) final;
|
||||||
|
void SetFontFamily(const nsAString& aFamily, mozilla::ErrorResult& aRv) final;
|
||||||
|
void GetValueText(nsAString& aValueText) final;
|
||||||
|
void SetValueText(const nsAString& aValueText, mozilla::ErrorResult& aRv) final;
|
||||||
|
|
||||||
// Methods of mozilla::css::Rule
|
// Methods of mozilla::css::Rule
|
||||||
already_AddRefed<css::Rule> Clone() const final;
|
already_AddRefed<css::Rule> Clone() const final;
|
||||||
|
|
|
@ -655,15 +655,6 @@ nsCSSFontFeatureValuesRule::Clone() const
|
||||||
return clone.forget();
|
return clone.forget();
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMPL_ADDREF_INHERITED(nsCSSFontFeatureValuesRule, dom::CSSFontFeatureValuesRule)
|
|
||||||
NS_IMPL_RELEASE_INHERITED(nsCSSFontFeatureValuesRule, dom::CSSFontFeatureValuesRule)
|
|
||||||
|
|
||||||
// QueryInterface implementation for nsCSSFontFeatureValuesRule
|
|
||||||
// If this ever gets its own cycle-collection bits, reevaluate our IsCCLeaf
|
|
||||||
// implementation.
|
|
||||||
NS_INTERFACE_MAP_BEGIN(nsCSSFontFeatureValuesRule)
|
|
||||||
NS_INTERFACE_MAP_END_INHERITING(dom::CSSFontFeatureValuesRule)
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
FeatureValuesToString(
|
FeatureValuesToString(
|
||||||
const nsTArray<gfxFontFeatureValueSet::FeatureValues>& aFeatureValues,
|
const nsTArray<gfxFontFeatureValueSet::FeatureValues>& aFeatureValues,
|
||||||
|
@ -746,30 +737,30 @@ nsCSSFontFeatureValuesRule::List(FILE* out, int32_t aIndent) const
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
NS_IMETHODIMP
|
void
|
||||||
nsCSSFontFeatureValuesRule::GetFontFamily(nsAString& aFamilyListStr)
|
nsCSSFontFeatureValuesRule::GetFontFamily(nsAString& aFamilyListStr)
|
||||||
{
|
{
|
||||||
nsStyleUtil::AppendEscapedCSSFontFamilyList(mFamilyList, aFamilyListStr);
|
nsStyleUtil::AppendEscapedCSSFontFamilyList(mFamilyList, aFamilyListStr);
|
||||||
return NS_OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
void
|
||||||
nsCSSFontFeatureValuesRule::GetValueText(nsAString& aValueText)
|
nsCSSFontFeatureValuesRule::GetValueText(nsAString& aValueText)
|
||||||
{
|
{
|
||||||
FeatureValuesToString(mFeatureValues, aValueText);
|
FeatureValuesToString(mFeatureValues, aValueText);
|
||||||
return NS_OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
void
|
||||||
nsCSSFontFeatureValuesRule::SetFontFamily(const nsAString& aFontFamily)
|
nsCSSFontFeatureValuesRule::SetFontFamily(const nsAString& aFontFamily,
|
||||||
|
ErrorResult& aRv)
|
||||||
{
|
{
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
void
|
||||||
nsCSSFontFeatureValuesRule::SetValueText(const nsAString& aValueText)
|
nsCSSFontFeatureValuesRule::SetValueText(const nsAString& aValueText,
|
||||||
|
ErrorResult& aRv)
|
||||||
{
|
{
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
#include "nsCSSPropertyID.h"
|
#include "nsCSSPropertyID.h"
|
||||||
#include "nsCSSValue.h"
|
#include "nsCSSValue.h"
|
||||||
#include "nsDOMCSSDeclaration.h"
|
#include "nsDOMCSSDeclaration.h"
|
||||||
#include "nsIDOMCSSFontFeatureValuesRule.h"
|
|
||||||
#include "nsTArray.h"
|
#include "nsTArray.h"
|
||||||
|
|
||||||
class nsMediaList;
|
class nsMediaList;
|
||||||
|
@ -166,18 +165,17 @@ public:
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_DECL_ISUPPORTS_INHERITED
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
void List(FILE* out = stdout, int32_t aIndent = 0) const final;
|
void List(FILE* out = stdout, int32_t aIndent = 0) const final;
|
||||||
#endif
|
#endif
|
||||||
already_AddRefed<mozilla::css::Rule> Clone() const final;
|
already_AddRefed<mozilla::css::Rule> Clone() const final;
|
||||||
|
|
||||||
// nsIDOMCSSFontFeatureValuesRule interface
|
|
||||||
NS_DECL_NSIDOMCSSFONTFEATUREVALUESRULE
|
|
||||||
|
|
||||||
// WebIDL interface
|
// WebIDL interface
|
||||||
void GetCssTextImpl(nsAString& aCssText) const final;
|
void GetCssTextImpl(nsAString& aCssText) const final;
|
||||||
|
void GetFontFamily(nsAString& aFamily) final;
|
||||||
|
void SetFontFamily(const nsAString& aFamily, mozilla::ErrorResult& aRv) final;
|
||||||
|
void GetValueText(nsAString& aValueText) final;
|
||||||
|
void SetValueText(const nsAString& aValueText, mozilla::ErrorResult& aRv) final;
|
||||||
|
|
||||||
mozilla::SharedFontList* GetFamilyList() const { return mFamilyList; }
|
mozilla::SharedFontList* GetFamilyList() const { return mFamilyList; }
|
||||||
void SetFamilyList(mozilla::SharedFontList* aFamilyList)
|
void SetFamilyList(mozilla::SharedFontList* aFamilyList)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче