wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix namespace usage in nsRuleNode. (Bug 363249) r=bzbarsky

Browse Source
This commit is contained in:
L. David Baron 2010-07-02 21:18:55 -07:00
parent 8d8f88a01a
commit e218c29644
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/style/nsRuleNode.cpp
View File

@ -82,6 +82,7 @@
#include "CSSCalc.h"
using namespace mozilla::dom;
namespace css = mozilla::css;
#define NS_SET_IMAGE_REQUEST(method_, context_, request_) \
if ((context_)->PresContext()->IsDynamic()) { \
@ -179,8 +180,8 @@ static nscoord CalcLengthWith(const nsCSSValue& aValue,
PRBool aUseUserFontSet,
PRBool& aCanStoreInRuleTree);
struct CalcLengthCalcOps : public mozilla::css::BasicCoordCalcOps,
public mozilla::css::NumbersAlreadyNormalizedOps
struct CalcLengthCalcOps : public css::BasicCoordCalcOps,
public css::NumbersAlreadyNormalizedOps
{
// All of the parameters to CalcLengthWith except aValue.
const nscoord mFontSize;
@ -327,7 +328,7 @@ static nscoord CalcLengthWith(const nsCSSValue& aValue,
CalcLengthCalcOps ops(aFontSize, aStyleFont, aStyleContext, aPresContext,
aUseProvidedRootEmSize, aUseUserFontSet,
aCanStoreInRuleTree);
return mozilla::css::ComputeCalc(aValue, ops);
return css::ComputeCalc(aValue, ops);
}
default:
NS_NOTREACHED("unexpected unit");
@ -2654,8 +2655,8 @@ ComputeScriptLevelSize(const nsStyleFont* aFont, const nsStyleFont* aParentFont,
}
#endif
struct SetFontSizeCalcOps : public mozilla::css::BasicCoordCalcOps,
public mozilla::css::NumbersAlreadyNormalizedOps
struct SetFontSizeCalcOps : public css::BasicCoordCalcOps,
public css::NumbersAlreadyNormalizedOps
{
// The parameters beyond aValue that we need for CalcLengthWith.
const nscoord mParentSize;
@ -2771,7 +2772,7 @@ nsRuleNode::SetFontSize(nsPresContext* aPresContext,
aFontData.mSize.IsCalcUnit()) {
SetFontSizeCalcOps ops(aParentSize, aParentFont, aPresContext, aAtRoot,
aCanStoreInRuleTree);
*aSize = mozilla::css::ComputeCalc(aFontData.mSize, ops);
*aSize = css::ComputeCalc(aFontData.mSize, ops);
if (*aSize < 0) {
NS_ABORT_IF_FALSE(aFontData.mSize.IsCalcUnit(),
"negative lengths and percents should be rejected "