[Swfdec-commits] 3 commits - swfdec/swfdec_resource.c test/trace

Pekka Lampila medar at kemper.freedesktop.org
Tue Feb 26 05:16:55 PST 2008


 swfdec/swfdec_resource.c                           |    6 ++++++
 test/trace/Makefile.am                             |   14 ++++++++++++++
 test/trace/crash-0.6.0-moviecliploader-7.swf       |binary
 test/trace/crash-0.6.0-moviecliploader-7.swf.trace |    4 ++++
 test/trace/crash-0.6.0-moviecliploader-8.swf       |binary
 test/trace/crash-0.6.0-moviecliploader-8.swf.trace |    4 ++++
 test/trace/crash-0.6.0-moviecliploader.as          |   16 ++++++++++++++++
 test/trace/root-onload-5.swf                       |binary
 test/trace/root-onload-5.swf.trace                 |    1 +
 test/trace/root-onload-6.swf                       |binary
 test/trace/root-onload-6.swf.trace                 |    2 ++
 test/trace/root-onload-7.swf                       |binary
 test/trace/root-onload-7.swf.trace                 |    2 ++
 test/trace/root-onload-8.swf                       |binary
 test/trace/root-onload-8.swf.trace                 |    2 ++
 test/trace/root-onload.as                          |   13 +++++++++++++
 16 files changed, 64 insertions(+)

New commits:
commit 5fe313803aa287e25ce953b617c417761f70762d
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Tue Feb 26 14:50:01 2008 +0200

    Add a test to see whether onLoad method is called for _root

diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index 01b686b..c4f6981 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -2417,6 +2417,15 @@ EXTRA_DIST = \
 	rewind-remove-7.swf.trace \
 	rewind-remove-8.swf \
 	rewind-remove-8.swf.trace \
+	root-onload.as \
+	root-onload-5.swf \
+	root-onload-5.swf.trace \
+	root-onload-6.swf \
+	root-onload-6.swf.trace \
+	root-onload-7.swf \
+	root-onload-7.swf.trace \
+	root-onload-8.swf \
+	root-onload-8.swf.trace \
 	rotation-5.swf \
 	rotation-5.swf.trace \
 	rotation2.as \
diff --git a/test/trace/root-onload-5.swf b/test/trace/root-onload-5.swf
new file mode 100644
index 0000000..c5da5f5
Binary files /dev/null and b/test/trace/root-onload-5.swf differ
diff --git a/test/trace/root-onload-5.swf.trace b/test/trace/root-onload-5.swf.trace
new file mode 100644
index 0000000..3b62dc1
--- /dev/null
+++ b/test/trace/root-onload-5.swf.trace
@@ -0,0 +1 @@
+Start
diff --git a/test/trace/root-onload-6.swf b/test/trace/root-onload-6.swf
new file mode 100644
index 0000000..e7b3c49
Binary files /dev/null and b/test/trace/root-onload-6.swf differ
diff --git a/test/trace/root-onload-6.swf.trace b/test/trace/root-onload-6.swf.trace
new file mode 100644
index 0000000..b805180
--- /dev/null
+++ b/test/trace/root-onload-6.swf.trace
@@ -0,0 +1,2 @@
+Start
+onLoad
diff --git a/test/trace/root-onload-7.swf b/test/trace/root-onload-7.swf
new file mode 100644
index 0000000..83ccd0b
Binary files /dev/null and b/test/trace/root-onload-7.swf differ
diff --git a/test/trace/root-onload-7.swf.trace b/test/trace/root-onload-7.swf.trace
new file mode 100644
index 0000000..b805180
--- /dev/null
+++ b/test/trace/root-onload-7.swf.trace
@@ -0,0 +1,2 @@
+Start
+onLoad
diff --git a/test/trace/root-onload-8.swf b/test/trace/root-onload-8.swf
new file mode 100644
index 0000000..836cf0b
Binary files /dev/null and b/test/trace/root-onload-8.swf differ
diff --git a/test/trace/root-onload-8.swf.trace b/test/trace/root-onload-8.swf.trace
new file mode 100644
index 0000000..b805180
--- /dev/null
+++ b/test/trace/root-onload-8.swf.trace
@@ -0,0 +1,2 @@
+Start
+onLoad
diff --git a/test/trace/root-onload.as b/test/trace/root-onload.as
new file mode 100644
index 0000000..fd5fbf9
--- /dev/null
+++ b/test/trace/root-onload.as
@@ -0,0 +1,13 @@
+// makeswf -v 7 -r 1 -o test-7.swf test.as
+
+trace ("Start");
+
+_root.onLoad = function () {
+  trace ("onLoad");
+};
+
+function quit () {
+  loadMovie ("FSCommand:quit", "");
+}
+
+setInterval (quit, 1000);
commit 400c208e8a5f02e1641f2838eb07c564ad6eae0d
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Tue Feb 26 14:48:26 2008 +0200

    Add a load event when resource has finished loading

diff --git a/swfdec/swfdec_resource.c b/swfdec/swfdec_resource.c
index ed64f7d..9746893 100644
--- a/swfdec/swfdec_resource.c
+++ b/swfdec/swfdec_resource.c
@@ -342,10 +342,16 @@ swfdec_resource_stream_target_close (SwfdecStreamTarget *target, SwfdecStream *s
     if (dec->data_type != SWFDEC_LOADER_DATA_UNKNOWN)
       swfdec_loader_set_data_type (SWFDEC_LOADER (stream), dec->data_type);
   }
+
   SWFDEC_AS_VALUE_SET_INT (&val, 0); /* FIXME */
   swfdec_resource_emit_signal (resource, SWFDEC_AS_STR_onLoadComplete, FALSE, &val, 1);
   resource->state = SWFDEC_RESOURCE_COMPLETE;
   swfdec_resource_abort_if_not_initialized (resource);
+
+  if (resource->movie != NULL) {
+    swfdec_player_add_action (SWFDEC_PLAYER (SWFDEC_AS_OBJECT (resource)->context),
+	  SWFDEC_MOVIE (resource->movie), SWFDEC_EVENT_LOAD, 0);
+  }
 }
 
 static void
commit 58e9f192f713f4cb5c3e6f720a79bfd3cf8aaab3
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Tue Feb 26 14:44:10 2008 +0200

    Add a test for assert in MovieClipLoader

diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index 980a893..01b686b 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -713,6 +713,11 @@ EXTRA_DIST = \
 	crash-0.5.90-empty-action.swf \
 	crash-0.5.90-empty-action.swf.trace \
 	crash-0.5.90-empty-action.xml \
+	crash-0.6.0-moviecliploader.as \
+	crash-0.6.0-moviecliploader-7.swf \
+	crash-0.6.0-moviecliploader-7.swf.trace \
+	crash-0.6.0-moviecliploader-8.swf \
+	crash-0.6.0-moviecliploader-8.swf.trace \
 	currentframe.swf \
 	currentframe.swf.trace \
 	dangling-compare.as \
diff --git a/test/trace/crash-0.6.0-moviecliploader-7.swf b/test/trace/crash-0.6.0-moviecliploader-7.swf
new file mode 100644
index 0000000..6439c1c
Binary files /dev/null and b/test/trace/crash-0.6.0-moviecliploader-7.swf differ
diff --git a/test/trace/crash-0.6.0-moviecliploader-7.swf.trace b/test/trace/crash-0.6.0-moviecliploader-7.swf.trace
new file mode 100644
index 0000000..9b2ccc2
--- /dev/null
+++ b/test/trace/crash-0.6.0-moviecliploader-7.swf.trace
@@ -0,0 +1,4 @@
+Start
+*** Security Sandbox Violation ***
+Connection to file:///home/medar/Projects/Flash/swfdec/test/pending/getvariable-exhaustive-8.swf halted - not permitted from file:///home/medar/Projects/Flash/swfdec/test/pending/crash-0.6.0-moviecliploader-7.swf
+Done
diff --git a/test/trace/crash-0.6.0-moviecliploader-8.swf b/test/trace/crash-0.6.0-moviecliploader-8.swf
new file mode 100644
index 0000000..aed18d2
Binary files /dev/null and b/test/trace/crash-0.6.0-moviecliploader-8.swf differ
diff --git a/test/trace/crash-0.6.0-moviecliploader-8.swf.trace b/test/trace/crash-0.6.0-moviecliploader-8.swf.trace
new file mode 100644
index 0000000..e87c7b5
--- /dev/null
+++ b/test/trace/crash-0.6.0-moviecliploader-8.swf.trace
@@ -0,0 +1,4 @@
+Start
+*** Security Sandbox Violation ***
+Connection to file:///home/medar/Projects/Flash/swfdec/test/pending/getvariable-exhaustive-8.swf halted - not permitted from file:///home/medar/Projects/Flash/swfdec/test/pending/crash-0.6.0-moviecliploader-8.swf
+Done
diff --git a/test/trace/crash-0.6.0-moviecliploader.as b/test/trace/crash-0.6.0-moviecliploader.as
new file mode 100644
index 0000000..5b62d8f
--- /dev/null
+++ b/test/trace/crash-0.6.0-moviecliploader.as
@@ -0,0 +1,16 @@
+// makeswf -n -v 7 -r 1 -o crash-0.6.0-moviecliploader.swf crash-0.6.0-moviecliploader.as
+
+// NOTE: Has to be compiled with -n
+
+trace ("Start");
+
+this.createEmptyMovieClip ("a", 0);
+var l = new MovieClipLoader ();
+l.loadClip ("getvariable-exhaustive-8.swf", a);
+
+function quit () {
+  trace ("Done");
+  loadMovie ("FSCommand:quit", "");
+}
+
+setInterval (quit, 2000);


More information about the Swfdec-commits mailing list