wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-06 07:17:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2490 - Part 16: Convert CSSFontFeatureValuesRule to WebIDL.

Browse source
This commit is contained in:
Moonchild 2024-04-04 10:20:43 +02:00 • committed by roytam1
commit f0de637255
8 changed files with 55 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
layout/style/nsCSSRules.cpp
View file

@ -40,6 +40,7 @@
#include "mozilla/dom/CSSMozDocumentRuleBinding.h"
#include "mozilla/dom/CSSPageRuleBinding.h"
#include "mozilla/dom/CSSFontFaceRuleBinding.h"
#include "mozilla/dom/CSSFontFeatureValuesRuleBinding.h"
#include "StyleRule.h"
#include "nsFont.h"
#include "nsIURI.h"
@ -1796,7 +1797,6 @@ NS_IMPL_RELEASE_INHERITED(nsCSSFontFeatureValuesRule, mozilla::css::Rule)
// implementation.
NS_INTERFACE_MAP_BEGIN(nsCSSFontFeatureValuesRule)
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSFontFeatureValuesRule)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSFontFeatureValuesRule)
NS_INTERFACE_MAP_END_INHERITING(mozilla::css::Rule)
bool
@ -1905,6 +1905,20 @@ nsCSSFontFeatureValuesRule::GetCssTextImpl(nsAString& aCssText) const
FontFeatureValuesRuleToString(mFamilyList, mFeatureValues, aCssText);
}
void
nsCSSFontFeatureValuesRule::SetFontFamily(const nsAString& aFamily,
ErrorResult& aRv)
{
aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
}
void
nsCSSFontFeatureValuesRule::SetValueText(const nsAString& aFamily,
ErrorResult& aRv)
{
aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
}
NS_IMETHODIMP
nsCSSFontFeatureValuesRule::GetFontFamily(nsAString& aFamilyListStr)
{
@ -1997,8 +2011,7 @@ nsCSSFontFeatureValuesRule::SizeOfIncludingThis(
nsCSSFontFeatureValuesRule::WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aGivenProto)
{
NS_NOTREACHED("We called SetIsNotDOMBinding() in our constructor");
return nullptr;
return CSSFontFeatureValuesRuleBinding::Wrap(aCx, this, aGivenProto);
}
// -------------------------------------------

6
layout/style/nsCSSRules.h
View file

@ -322,7 +322,6 @@ public:
nsCSSFontFeatureValuesRule(uint32_t aLineNumber, uint32_t aColumnNumber)
: mozilla::css::Rule(aLineNumber, aColumnNumber)
{
SetIsNotDOMBinding();
}
nsCSSFontFeatureValuesRule(const nsCSSFontFeatureValuesRule& aCopy)
@ -331,7 +330,6 @@ public:
, mFamilyList(aCopy.mFamilyList)
, mFeatureValues(aCopy.mFeatureValues)
{
SetIsNotDOMBinding();
}
NS_DECL_ISUPPORTS_INHERITED
@ -350,6 +348,10 @@ public:
// WebIDL interface
uint16_t Type() const override;
void GetCssTextImpl(nsAString& aCssText) const override;
// Our XPCOM GetFontFamily is OK
void SetFontFamily(const nsAString& aFamily, mozilla::ErrorResult& aRv);
// Our XPCOM GetValueText is OK
void SetValueText(const nsAString& aFamily, mozilla::ErrorResult& aRv);
const mozilla::FontFamilyList& GetFamilyList() { return mFamilyList; }
void SetFamilyList(const mozilla::FontFamilyList& aFamilyList);