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

Issue #2112 - Part 10: Remove remaining Stylo/Servo includes and code

Browse source 
Some classes have been marked for removal/merging, macros used for forwarding/casting were moved to DeprecatedUtils.h.
This commit is contained in:
FranklinDM 2024-03-25 20:00:34 +08:00 • committed by roytam1
commit d6852b3170
54 changed files with 35 additions and 2957 deletions
Download patch file Download diff file Expand all files Collapse all files

39
layout/style/StyleStructContext.h
View file

@ -14,55 +14,26 @@ class nsDeviceContext;
/**
* Construction context for style structs.
*
* Certain Gecko style structs have historically taken an nsPresContext
* argument in their constructor, which is used to compute various things. This
* makes Gecko style structs document-specific (which Servo style structs are
* not), and means that the initial values for style-structs cannot be shared
* across the entire runtime (as is the case in Servo).
*
* We'd like to remove this constraint so that Gecko can get the benefits of the
* Servo model, and so that Gecko aligns better with the Servo style system when
* using it. Unfortunately, this may require a fair amount of work, especially
* related to text zoom.
*
* So as an intermediate step, we define a reduced API set of "things that are
* needed when constructing style structs". This just wraps and forwards to an
* nsPresContext in the Gecko case, and returns some default not-always-correct
* values in the Servo case. We can then focus on reducing this API surface to
* zero, at which point this can be removed.
*
* We don't put the type in namespace mozilla, since we expect it to be
* temporary, and the namespacing would clutter up nsStyleStruct.h.
* TODO: marked for removal.
*/
#define SERVO_DEFAULT(default_val) { MOZ_ASSERT(mPresContext); }
class StyleStructContext {
public:
MOZ_IMPLICIT StyleStructContext(nsPresContext* aPresContext)
: mPresContext(aPresContext) { MOZ_ASSERT(aPresContext); }
static StyleStructContext ServoContext() { return StyleStructContext(); }
// XXXbholley: Need to make text zoom work with stylo. This probably means
// moving the zoom handling out of computed values and into a post-
// computation.
float TextZoom()
{
SERVO_DEFAULT(1.0);
return mPresContext->TextZoom();
}
const nsFont* GetDefaultFont(uint8_t aFontID)
{
// NB: The servo case only differ from the default case in terms of which
// font pref cache gets used. The distinction is probably unnecessary.
SERVO_DEFAULT(mozilla::StaticPresData::Get()->
GetDefaultFont(aFontID, GetLanguageFromCharset()));
return mPresContext->GetDefaultFont(aFontID, GetLanguageFromCharset());
}
uint32_t GetBidi()
{
SERVO_DEFAULT(0);
return mPresContext->GetBidi();
}
@ -76,33 +47,27 @@ public:
typedef mozilla::LookAndFeel LookAndFeel;
nscolor DefaultColor()
{
SERVO_DEFAULT(LookAndFeel::GetColor(LookAndFeel::eColorID_WindowForeground,
NS_RGB(0x00, 0x00, 0x00)));
return mPresContext->DefaultColor();
}
mozilla::CounterStyle* BuildCounterStyle(const nsSubstring& aName)
{
SERVO_DEFAULT(mozilla::CounterStyleManager::GetBuiltinStyle(NS_STYLE_LIST_STYLE_DISC));
return mPresContext->CounterStyleManager()->BuildCounterStyle(aName);
}
nsIAtom* GetLanguageFromCharset() const
{
SERVO_DEFAULT(nsGkAtoms::x_western);
return mPresContext->GetLanguageFromCharset();
}
already_AddRefed<nsIAtom> GetContentLanguage() const
{
SERVO_DEFAULT(do_AddRef(nsGkAtoms::x_western));
return mPresContext->GetContentLanguage();
}
private:
nsDeviceContext* DeviceContext()
{
SERVO_DEFAULT(HackilyFindSomeDeviceContext());
return mPresContext->DeviceContext();
}
@ -112,6 +77,4 @@ private:
nsPresContext* mPresContext;
};
#undef SERVO_DEFAULT
#endif // mozilla_StyleStructContext_h