search for: swfdec_as_object_mark

...fdecAsContext *context) { SwfdecPlayer *player = SWFDEC_PLAYER (context); + GList *walk; g_hash_table_foreach (player->registered_classes, swfdec_player_mark_string_object, NULL); swfdec_listener_mark (player->mouse_listener); swfdec_listener_mark (player->key_listener); swfdec_as_object_mark (player->MovieClip); + for (walk = player->roots; walk; walk = walk->next) { + swfdec_as_object_mark (walk->data); + } SWFDEC_AS_CONTEXT_CLASS (swfdec_player_parent_class)->mark (context); } diff-tree e415c0893f4316b99bbec0eb418b9664efee2b99 (from ce031c6d521c4364da0b6a35c...

...e.org> Date: Mon Aug 20 15:45:07 2007 +0200 GC intervals, too diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index b1ad1c7..b303408 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -1094,6 +1094,7 @@ swfdec_player_mark (SwfdecAsContext *con swfdec_as_object_mark (player->MovieClip); swfdec_as_object_mark (player->Video); g_list_foreach (player->roots, (GFunc) swfdec_as_object_mark, NULL); + g_list_foreach (player->intervals, (GFunc) swfdec_as_object_mark, NULL); g_list_foreach (player->load_objects, (GFunc) swfdec_as_object_mark, N...

...hrow_value to exception_value diff --git a/libswfdec/swfdec_as_context.c b/libswfdec/swfdec_as_context.c index 403e03d..663a15c 100644 --- a/libswfdec/swfdec_as_context.c +++ b/libswfdec/swfdec_as_context.c @@ -361,7 +361,7 @@ static void swfdec_as_context_do_mark (SwfdecAsContext *context) { swfdec_as_object_mark (context->global); - swfdec_as_value_mark (&context->throw_value); + swfdec_as_value_mark (&context->exception_value); swfdec_as_object_mark (context->Function); swfdec_as_object_mark (context->Function_prototype); swfdec_as_object_mark (context->Object); @@ -68...

...alling functions without a this object diff --git a/libswfdec/swfdec_as_frame.c b/libswfdec/swfdec_as_frame.c index 23b3c41..75e0534 100644 --- a/libswfdec/swfdec_as_frame.c +++ b/libswfdec/swfdec_as_frame.c @@ -68,7 +68,8 @@ swfdec_as_frame_mark (SwfdecAsObject *ob if (frame->script) { swfdec_as_object_mark (frame->var_object); } - swfdec_as_object_mark (frame->thisp); + if (frame->thisp) + swfdec_as_object_mark (frame->thisp); if (frame->target) swfdec_as_object_mark (frame->target); if (frame->function) @@ -76,7 +77,6 @@ swfdec_as_frame_mark (SwfdecAsObject *o...

...SwfdecAsFunction * watch; /* watcher or %NULL */ + SwfdecAsValue watch_data; /* user data to watcher */ + guint refcount; /* refcount - misused for recursion detection */ +} SwfdecAsWatch; + G_DEFINE_TYPE (SwfdecAsObject, swfdec_as_object, G_TYPE_OBJECT) static void @@ -141,22 +144,28 @@ swfdec_as_object_mark_property (gpointer if (var->set) swfdec_as_object_mark (SWFDEC_AS_OBJECT (var->set)); } else { - if (var->watch) { - swfdec_as_object_mark (SWFDEC_AS_OBJECT (var->watch)); - if (var->watch_data) { - swfdec_as_value_mark (var->watch_data); - } -...

...16 @@ swfdec_player_mark_string_object (gpointer key, gpointer value, gpointer data) } static void +swfdec_player_mark_rooted_object (gpointer object, gpointer unused) +{ + if (SWFDEC_IS_RESOURCE (object)) { + swfdec_resource_mark (object); + } else if (SWFDEC_IS_AS_OBJECT (object)) { + swfdec_as_object_mark (object); + } +} + +static void swfdec_player_mark (SwfdecAsContext *context) { SwfdecPlayer *player = SWFDEC_PLAYER (context); @@ -1383,7 +1394,7 @@ swfdec_player_mark (SwfdecAsContext *context) swfdec_as_object_mark (player->Video); g_list_foreach (player->roots, (GFunc) swfdec_...

...t a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index 4d93f11..d147bdd 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -180,6 +180,14 @@ SWFDEC_TYPE_GTK_LOADER </SECTION> <SECTION> +<FILE>Internals</FILE> +<TITLE>Internals</TITLE> +swfdec_as_object_mark +swfdec_as_string_mark +swfdec_as_value_mark +</SECTION> + +<SECTION> <FILE>SwfdecAsValue</FILE> <TITLE>SwfdecAsValue</TITLE> SwfdecAsValueType @@ -212,3 +220,34 @@ SWFDEC_AS_VALUE_IS_STRING SWFDEC_AS_VALUE_IS_NULL SWFDEC_AS_VALUE_IS_OBJECT </SECTION>...

...(context->memory >= len); @@ -166,7 +168,7 @@ swfdec_as_string_mark (const char *strin void swfdec_as_value_mark (SwfdecAsValue *value) { - g_return_if_fail (SWFDEC_AS_IS_VALUE (value)); + g_return_if_fail (SWFDEC_IS_AS_VALUE (value)); if (SWFDEC_AS_VALUE_IS_OBJECT (value)) { swfdec_as_object_mark (SWFDEC_AS_VALUE_GET_OBJECT (value)); @@ -187,7 +189,7 @@ swfdec_as_context_mark_roots (gpointer k void swfdec_as_context_gc (SwfdecAsContext *context) { - g_return_if_fail (SWFDEC_AS_IS_CONTEXT (context)); + g_return_if_fail (SWFDEC_IS_AS_CONTEXT (context)); SWFDEC_INFO ("invoking t...

...L; } + while (frame->blocks->len > 0) + swfdec_as_frame_pop_block (frame); + g_array_free (frame->blocks, TRUE); G_OBJECT_CLASS (swfdec_as_frame_parent_class)->dispose (object); } @@ -228,8 +294,7 @@ swfdec_as_frame_mark (SwfdecAsObject *ob if (frame->next) swfdec_as_object_mark (SWFDEC_AS_OBJECT (frame->next)); - if (frame->scope) - swfdec_as_object_mark (SWFDEC_AS_OBJECT (frame->scope)); + g_slist_foreach (frame->scope_chain, (GFunc) swfdec_as_object_mark, NULL); if (frame->thisp) swfdec_as_object_mark (frame->thisp); if (frame->super...

..._player.c b/libswfdec/swfdec_player.c index aa7de2f..554d22b 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -791,6 +791,7 @@ swfdec_player_mark (SwfdecAsContext *con swfdec_listener_mark (player->mouse_listener); swfdec_listener_mark (player->key_listener); swfdec_as_object_mark (player->MovieClip); + swfdec_as_object_mark (player->Video); for (walk = player->roots; walk; walk = walk->next) { swfdec_as_object_mark (walk->data); } @@ -1070,6 +1071,7 @@ extern void swfdec_movie_color_init_cont extern void swfdec_net_connection_init_context (Swfdec...

...c/swfdec_sound_object.c b/libswfdec/swfdec_sound_object.c index 85e870e..98d00a0 100644 --- a/libswfdec/swfdec_sound_object.c +++ b/libswfdec/swfdec_sound_object.c @@ -43,7 +43,8 @@ swfdec_sound_object_mark (SwfdecAsObject *object) { SwfdecSoundObject *sound = SWFDEC_SOUND_OBJECT (object); - swfdec_as_object_mark (SWFDEC_AS_OBJECT (sound->target)); + if (sound->target != NULL) + swfdec_as_object_mark (SWFDEC_AS_OBJECT (sound->target)); SWFDEC_AS_OBJECT_CLASS (swfdec_sound_object_parent_class)->mark (object); }

...rget; } swfdec_as_object_set_variable (obj, name, ret); } diff --git a/libswfdec/swfdec_as_frame.c b/libswfdec/swfdec_as_frame.c index 1664161..e503c7c 100644 --- a/libswfdec/swfdec_as_frame.c +++ b/libswfdec/swfdec_as_frame.c @@ -66,13 +66,10 @@ swfdec_as_frame_mark (SwfdecAsObject *ob swfdec_as_object_mark (SWFDEC_AS_OBJECT (frame->next)); if (frame->scope) swfdec_as_object_mark (SWFDEC_AS_OBJECT (frame->scope)); - if (frame->script) { - swfdec_as_object_mark (frame->var_object); - } if (frame->thisp) swfdec_as_object_mark (frame->thisp); - if (frame->tar...

...Apr 12 10:51:22 2007 +0200 implement SetTarget and SetTarget2 diff --git a/libswfdec/swfdec_as_frame.c b/libswfdec/swfdec_as_frame.c index da19217..36db616 100644 --- a/libswfdec/swfdec_as_frame.c +++ b/libswfdec/swfdec_as_frame.c @@ -57,6 +57,8 @@ swfdec_as_frame_mark (SwfdecAsObject *ob swfdec_as_object_mark (SWFDEC_AS_OBJECT (frame->next)); swfdec_as_object_mark (frame->scope); swfdec_as_object_mark (frame->var_object); + if (frame->target) + swfdec_as_object_mark (frame->target); for (i = 0; i < frame->n_registers; i++) { swfdec_as_value_mark (&frame->reg...

...before calling context_run */ }; struct _SwfdecAsContextClass { diff --git a/libswfdec/swfdec_as_frame.c b/libswfdec/swfdec_as_frame.c index ee6c8ca..9f9381f 100644 --- a/libswfdec/swfdec_as_frame.c +++ b/libswfdec/swfdec_as_frame.c @@ -59,9 +59,15 @@ swfdec_as_frame_mark (SwfdecAsObject *ob swfdec_as_object_mark (frame->var_object); if (frame->target) swfdec_as_object_mark (frame->target); + if (frame->function) + swfdec_as_object_mark (SWFDEC_AS_OBJECT (frame->function)); for (i = 0; i < frame->n_registers; i++) { swfdec_as_value_mark (&frame->registers[i]);...

...AsObject *target, const char *url, if (!swfdec_load_object_load (load_object, url, request, data)) return NULL; - swfdec_player_root_object (SWFDEC_PLAYER (target->context), - G_OBJECT (load_object)); + swfdec_player_root (SWFDEC_PLAYER (target->context), load_object, (GFunc) swfdec_as_object_mark); return SWFDEC_AS_OBJECT (load_object); } diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 215d604..f60b7e8 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -878,9 +878,8 @@ swfdec_player_dispose (GObject *object) g_object_unref (priv-&gt...

...sed to set the text) diff --git a/libswfdec/swfdec_text_field_movie.c b/libswfdec/swfdec_text_field_movie.c index b56466d..15b945f 100644 --- a/libswfdec/swfdec_text_field_movie.c +++ b/libswfdec/swfdec_text_field_movie.c @@ -893,6 +893,8 @@ swfdec_text_field_movie_mark (SwfdecAsObject *object) swfdec_as_object_mark (SWFDEC_AS_OBJECT (text->format_new)); if (text->style_sheet != NULL) swfdec_as_object_mark (SWFDEC_AS_OBJECT (text->style_sheet)); + if (text->style_sheet_input != NULL) + swfdec_as_string_mark (text->style_sheet_input); if (text->restrict_ != NULL) swfdec_as_...

...se */ + gsize memory; /* total memory currently in use */ + gsize memory_since_gc;/* memory allocated since last GC run */ GHashTable * strings; /* string=>memory mapping the context manages */ GHashTable * objects; /* all objects the context manages */ @@ -108,6 +112,7 @@ void swfdec_as_object_mark (SwfdecAsOb void swfdec_as_value_mark (SwfdecAsValue * value); void swfdec_as_string_mark (const char * string); void swfdec_as_context_gc (SwfdecAsContext * context); +void swfdec_as_context_maybe_gc (SwfdecAsContext * context); void swfdec_as_context_run (SwfdecAsContext * contex...

...ERRUPTED); @@ -1472,13 +1511,14 @@ static void swfdec_player_mark (SwfdecAsContext *context) { SwfdecPlayer *player = SWFDEC_PLAYER (context); + SwfdecPlayerPrivate *priv = player->priv; - g_hash_table_foreach (player->registered_classes, swfdec_player_mark_string_object, NULL); - swfdec_as_object_mark (player->MovieClip); - swfdec_as_object_mark (player->Video); - g_list_foreach (player->roots, (GFunc) swfdec_as_object_mark, NULL); - g_list_foreach (player->intervals, (GFunc) swfdec_as_object_mark, NULL); - g_list_foreach (player->rooted_objects, swfdec_player_mark_rooted_obje...

...fdecAsValue content_type; SwfdecAsValue loaded; }; diff --git a/libswfdec/swfdec_xml_node.c b/libswfdec/swfdec_xml_node.c index 5c74870..b0d35aa 100644 --- a/libswfdec/swfdec_xml_node.c +++ b/libswfdec/swfdec_xml_node.c @@ -53,8 +53,8 @@ swfdec_xml_node_do_mark (SwfdecAsObject *object) swfdec_as_object_mark (SWFDEC_AS_OBJECT (node->children)); if (node->attributes != NULL) swfdec_as_object_mark (SWFDEC_AS_OBJECT (node->attributes)); - if (node->childNodes != NULL) - swfdec_as_object_mark (SWFDEC_AS_OBJECT (node->childNodes)); + if (node->child_nodes != NULL) + swfdec_...

...00 keep a reference to the super object in the SwfdecAsFrame diff --git a/libswfdec/swfdec_as_frame.c b/libswfdec/swfdec_as_frame.c index 4dc861c..1caf849 100644 --- a/libswfdec/swfdec_as_frame.c +++ b/libswfdec/swfdec_as_frame.c @@ -69,6 +69,8 @@ swfdec_as_frame_mark (SwfdecAsObject *ob swfdec_as_object_mark (SWFDEC_AS_OBJECT (frame->scope)); if (frame->thisp) swfdec_as_object_mark (frame->thisp); + if (frame->super) + swfdec_as_object_mark (frame->super); swfdec_as_object_mark (frame->target); swfdec_as_object_mark (frame->original_target); if (frame->funct...