aboutsummaryrefslogtreecommitdiff
path: root/src/css.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/css.cc')
-rw-r--r--src/css.cc32
1 files changed, 7 insertions, 25 deletions
diff --git a/src/css.cc b/src/css.cc
index d8f086db..8b3e5371 100644
--- a/src/css.cc
+++ b/src/css.cc
@@ -489,39 +489,21 @@ void CssStyleSheet::apply (CssPropertyList *props,
}
}
-CssStyleSheet *CssContext::userAgentStyle;
-CssStyleSheet *CssContext::userStyle;
-CssStyleSheet *CssContext::userImportantStyle;
-
CssContext::CssContext () {
pos = 0;
- for (int o = CSS_PRIMARY_USER_AGENT; o < CSS_PRIMARY_LAST; o++)
- sheet[o] = NULL;
-
- if (userAgentStyle == NULL) {
- userAgentStyle = new CssStyleSheet ();
- userStyle = new CssStyleSheet ();
- userImportantStyle = new CssStyleSheet ();
-
- sheet[CSS_PRIMARY_USER_AGENT] = userAgentStyle;
- sheet[CSS_PRIMARY_USER] = userStyle;
- sheet[CSS_PRIMARY_USER_IMPORTANT] = userImportantStyle;
-
- buildUserAgentStyle ();
- buildUserStyle ();
- }
+ memset (sheet, 0, sizeof(sheet));
+ sheet[CSS_PRIMARY_USER_AGENT] = new CssStyleSheet ();
+ sheet[CSS_PRIMARY_USER] = new CssStyleSheet ();
+ sheet[CSS_PRIMARY_USER_IMPORTANT] = new CssStyleSheet ();
- sheet[CSS_PRIMARY_USER_AGENT] = userAgentStyle;
- sheet[CSS_PRIMARY_USER] = userStyle;
- sheet[CSS_PRIMARY_USER_IMPORTANT] = userImportantStyle;
+ buildUserAgentStyle ();
+ buildUserStyle ();
}
CssContext::~CssContext () {
for (int o = CSS_PRIMARY_USER_AGENT; o < CSS_PRIMARY_LAST; o++)
- if (sheet[o] != userAgentStyle && sheet[o] != userStyle &&
- sheet[o] != userImportantStyle)
- delete sheet[o];
+ delete sheet[o];
}
/**