diff options
author | lexborisov <lex.borisov@gmail.com> | 2016-10-23 16:09:32 +0300 |
---|---|---|
committer | lexborisov <lex.borisov@gmail.com> | 2016-10-23 16:09:32 +0300 |
commit | ca51a60b2ad8e2b8d0d19e89cfabb5dd5491aa09 (patch) | |
tree | fae35212988a3a082fe369eb499ef0f81cbd3ad2 /source/modest/finder | |
parent | 221b3ae461432b7a0b799df9da60f2c2b3d70ba2 (diff) |
We put in order CSS properties. Fixed memory collision bug
Diffstat (limited to 'source/modest/finder')
-rw-r--r-- | source/modest/finder/thread.c | 7 | ||||
-rw-r--r-- | source/modest/finder/thread.h | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/source/modest/finder/thread.c b/source/modest/finder/thread.c index a40e874..a53e539 100644 --- a/source/modest/finder/thread.c +++ b/source/modest/finder/thread.c @@ -23,8 +23,8 @@ /* private functions */ static void modest_finder_thread_stream(mythread_id_t thread_id, void* arg); static modest_finder_thread_context_t * modest_finder_thread_create_context(modest_finder_thread_t* finder_thread, size_t count); -static void modest_finder_thread_callback_found(modest_finder_t* finder, myhtml_tree_node_t* node, mycss_selectors_list_t* selector_list, - mycss_selectors_entry_t* selector, mycss_selectors_specificity_t* spec, void* ctx); +//static void modest_finder_thread_callback_found(modest_finder_t* finder, myhtml_tree_node_t* node, mycss_selectors_list_t* selector_list, +// mycss_selectors_entry_t* selector, mycss_selectors_specificity_t* spec, void* ctx); /* basic functions */ modest_finder_thread_t * modest_finder_thread_create(void) @@ -126,7 +126,7 @@ void modest_finder_thread_collate_node(modest_t* modest, myhtml_tree_node_t* nod modest_finder_thread_declaration_t* dec = entry->declaration; while(dec) { - modest_style_map_collate_declaration(node, dec); + modest_style_map_collate_declaration(modest, node, dec->entry, &dec->raw_spec); dec = dec->next; } } @@ -377,7 +377,6 @@ void modest_finder_thread_stream(mythread_id_t thread_id, void* arg) while(selector_list) { for(size_t i = 0; i < selector_list->entries_list_length; i++) { - /* split selectors by thread id */ if(count == counnt_done) { mycss_selectors_entries_list_t *entries = &selector_list->entries_list[i]; diff --git a/source/modest/finder/thread.h b/source/modest/finder/thread.h index 3964e26..607c15e 100644 --- a/source/modest/finder/thread.h +++ b/source/modest/finder/thread.h @@ -34,6 +34,10 @@ #include "mycss/declaration/myosi.h" +#ifdef __cplusplus +extern "C" { +#endif + struct modest_finder_thread_declaration { mycss_declaration_entry_t* entry; modest_style_raw_specificity_t raw_spec; @@ -90,4 +94,8 @@ modest_status_t modest_finder_thread_process(modest_t* modest, modest_finder_thr void modest_finder_thread_wait_for_all_done(modest_finder_thread_t* finder_thread); bool modest_finder_thread_spec_is_up(modest_style_raw_specificity_t* spec_f, modest_style_raw_specificity_t* spec_t); +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* thread_h */ |