summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/fxcrt/css/cfx_cssdatatable.h3
-rw-r--r--core/fxcrt/css/cfx_cssdeclaration.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/core/fxcrt/css/cfx_cssdatatable.h b/core/fxcrt/css/cfx_cssdatatable.h
index b6188f93bb..9a0b0af198 100644
--- a/core/fxcrt/css/cfx_cssdatatable.h
+++ b/core/fxcrt/css/cfx_cssdatatable.h
@@ -15,9 +15,6 @@
#include "core/fxcrt/css/cfx_cssvalue.h"
#include "core/fxcrt/fx_system.h"
-#define CFX_IsOnlyValue(type, enum) \
- (((type) & ~(enum)) == CFX_CSSVALUETYPE_Primitive)
-
struct CFX_CSSPropertyTable {
CFX_CSSProperty eName;
const wchar_t* pszName;
diff --git a/core/fxcrt/css/cfx_cssdeclaration.cpp b/core/fxcrt/css/cfx_cssdeclaration.cpp
index b65429edb7..c89f75c5fd 100644
--- a/core/fxcrt/css/cfx_cssdeclaration.cpp
+++ b/core/fxcrt/css/cfx_cssdeclaration.cpp
@@ -205,7 +205,8 @@ void CFX_CSSDeclaration::AddProperty(const CFX_CSSPropertyTable* pTable,
AddPropertyHolder(pTable->eName, pCSSValue, bImportant);
return;
}
- if (CFX_IsOnlyValue(dwType, g_ValueGuessOrder[i]))
+
+ if ((dwType & ~(g_ValueGuessOrder[i])) == CFX_CSSVALUETYPE_Primitive)
return;
}
break;