diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/css.cc | 4 | ||||
-rw-r--r-- | src/cssparser.cc | 5 | ||||
-rw-r--r-- | src/cssparser.hh | 1 | ||||
-rw-r--r-- | src/html.cc | 4 | ||||
-rw-r--r-- | src/styleengine.cc | 5 | ||||
-rw-r--r-- | src/styleengine.hh | 2 |
6 files changed, 8 insertions, 13 deletions
@@ -467,7 +467,7 @@ void CssContext::buildUserAgentStyle () { "th {font-weight: bolder; text-align: center}" "code, tt, pre, samp, kbd {font-family: monospace}"; - a_Css_parse (this, cssBuf, strlen (cssBuf), 0, CSS_ORIGIN_USER_AGENT); + a_Css_parse (this, cssBuf, strlen (cssBuf), CSS_ORIGIN_USER_AGENT); } void CssContext::buildUserStyle () { @@ -475,7 +475,7 @@ void CssContext::buildUserStyle () { char *filename = dStrconcat(dGethomedir(), "/.dillo/style.css", NULL); if ((style = a_Misc_file2dstr(filename))) { - a_Css_parse (this, style->str, style->len, 0, CSS_ORIGIN_USER); + a_Css_parse (this, style->str, style->len, CSS_ORIGIN_USER); dStr_free (style, 1); } dFree (filename); diff --git a/src/cssparser.cc b/src/cssparser.cc index 9f0a457f..09b0c530 100644 --- a/src/cssparser.cc +++ b/src/cssparser.cc @@ -348,7 +348,6 @@ typedef enum { typedef struct { CssContext *context; - int order_count; CssOrigin origin; const char *buf; @@ -1166,7 +1165,7 @@ static void Css_parse_ruleset(CssParser * parser) void a_Css_parse(CssContext * context, const char *buf, - int buflen, int order_count, CssOrigin origin) + int buflen, CssOrigin origin) { CssParser parser; @@ -1174,7 +1173,6 @@ void a_Css_parse(CssContext * context, parser.buf = buf; parser.buflen = buflen; parser.bufptr = 0; - parser.order_count = 0; parser.origin = origin; parser.within_block = false; parser.space_separated = false; @@ -1193,7 +1191,6 @@ CssPropertyList *a_Css_parse_declaration(const char *buf, int buflen) parser.buf = buf; parser.buflen = buflen; parser.bufptr = 0; - parser.order_count = 0; parser.origin = CSS_ORIGIN_AUTHOR; parser.within_block = true; parser.space_separated = false; diff --git a/src/cssparser.hh b/src/cssparser.hh index fa2447eb..f88a780e 100644 --- a/src/cssparser.hh +++ b/src/cssparser.hh @@ -51,7 +51,6 @@ typedef struct { void a_Css_parse (CssContext *context, const char *buf, int buflen, - int order_count, CssOrigin origin); CssPropertyList *a_Css_parse_declaration(const char *buf, int buflen); diff --git a/src/html.cc b/src/html.cc index 93cb769b..dc9fc617 100644 --- a/src/html.cc +++ b/src/html.cc @@ -1667,7 +1667,7 @@ static void Html_tag_close_style(DilloHtml *html, int TagIdx) { if (prefs.parse_embedded_css) html->styleEngine->parse(html->Stash->str, html->Stash->len, - 0, CSS_ORIGIN_AUTHOR); + CSS_ORIGIN_AUTHOR); } /* @@ -2820,7 +2820,7 @@ static void Html_load_stylesheet(DilloHtml *html, DilloUrl *url) if (a_Capi_get_buf(url, &data, &len)) { _MSG("cached URL=%s len=%d", URL_STR(url), len); if (a_Capi_get_flags(url) & CAPI_Completed) - html->styleEngine->parse(data, len, 0, CSS_ORIGIN_AUTHOR); + html->styleEngine->parse(data, len, CSS_ORIGIN_AUTHOR); a_Capi_unref_buf(url); } else { /* Fill a Web structure for the cache query */ diff --git a/src/styleengine.cc b/src/styleengine.cc index dca78510..b48b6e2e 100644 --- a/src/styleengine.cc +++ b/src/styleengine.cc @@ -451,8 +451,7 @@ Style * StyleEngine::wordStyle0 (CssPropertyList *nonCssProperties) { return stack->getRef (stack->size () - 1)->wordStyle; } -void StyleEngine::parse (const char *buf, int buflen, - int order_count, CssOrigin origin) { +void StyleEngine::parse (const char *buf, int buflen, CssOrigin origin) { - a_Css_parse (cssContext, buf, buflen, order_count, origin); + a_Css_parse (cssContext, buf, buflen, origin); } diff --git a/src/styleengine.hh b/src/styleengine.hh index 9669ccf0..75f8fdd1 100644 --- a/src/styleengine.hh +++ b/src/styleengine.hh @@ -45,7 +45,7 @@ class StyleEngine : public Doctree { return NULL; }; - void parse (const char *buf, int buflen, int order_count, CssOrigin origin); + void parse (const char *buf, int buflen, CssOrigin origin); void startElement (int tag); void setId (const char *id); void setClass (const char *klass); |