[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 673afaa670a5b60c6
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 673afaa670a5b60c60b795653aae62c07755f05b |
|
Date: |
Fri, 29 Oct 2010 22:25:06 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, objecturi has been updated
via 673afaa670a5b60c60b795653aae62c07755f05b (commit)
via e9656783f680eb999feaa368bcf10f5c14c9ff12 (commit)
via 0c79e2efe0351e57371eab443408b5e357967015 (commit)
via 8dccca727e76caefd516adfa04e2f0c98c76fdbd (commit)
via ddac7061e34dc03fea183d770ab75ee5a3b73f9a (commit)
via d0f9450b950a04cc1ff60357e4db1962e3a74599 (commit)
via 4231d76297c8ef53a303f3020475b85f2c048d2d (commit)
via e870dfa6132eeca9c9a31efab19e009637fdaae8 (commit)
via 055954855abcbc4462dd4aeb9fb92ea1cba7d255 (commit)
via 7e3d32952f791ba38a92411b839b9f614efd30dd (commit)
via 976e465d5bd0f94f3c0c781f0c171dd0e976e6e1 (commit)
via a90aec56d6a33fec0dec10d49fa1a27a2fb80556 (commit)
via 33c3dca842aa59e3f56f950c2a3f3ac0920c24e9 (commit)
via 0fb5bc6f1509284f8c8e82cb25e15f5012605045 (commit)
via c79389f278f2d089b0ed4677d1b3acd60abb3b46 (commit)
via 6754556c133faea522ce4761f0b45e33845799b8 (commit)
via 06b73647cb96ec1d0dbca8882ea0ee12693cbf5c (commit)
via 75a0e753737bd07ff7f246830a550e5010d6d2c8 (commit)
via 1e4cf4c7945e3faf44d0667016d0c84cc3184847 (commit)
via de6b362ff631e5939ffc3cbad075f40726c07698 (commit)
via 75f7740ccaae48655d9ef5e1dd40c45441a846a7 (commit)
via b3a8c2578b28ddc9f1a4e6efe933b59e21dc858f (commit)
via 0893d097b4c3e2ebf153189bbcb0fbff5ecf7605 (commit)
via 1270ff493013acd689bcf5b34a0300936ddaab5b (commit)
via 4fa09f7ff0d1a3b1c765d4040027fa15aa964473 (commit)
via 7e5e50b92c9b9b02111b69ba1354ec0ef9ac3c0d (commit)
via 41fde01b3aa0d30fd171efa0111ce1524c78035a (commit)
via 7adee1ba42d923c925b2a2ce9550ce1979099d94 (commit)
via 269dd1fad4e27c7053235147dc1bfa913cb39873 (commit)
via 4957bdc7ac5d26a00322f222e70ff7bec1baa0a6 (commit)
via 9f661ece59ff2e829d3e953d246d6868d40e49c7 (commit)
via 0d701b07e0647e59cac3896357181807c33b0e04 (commit)
via 5dce7a1b7534d9ef52078ef7324783421d810a93 (commit)
via 283bb6a9a81bce30ba505774a758a3c5fe62f6e9 (commit)
via e59320176f4cb68a6a651e60113d847ca27413d1 (commit)
via 0239341724fb9fcef4ce2f7b08a0ab257755fd9e (commit)
via d76cfc4112d492746c2369ab06bfddcb03a48b97 (commit)
via d5804cd036c2d73164763cfeaca9048a13972868 (commit)
via 6f2b591c5444ed5a5b534d45f227ceee1666da0e (commit)
via a9c17ee2103064bc03d16093ff53e535f333acd5 (commit)
via 86a6ea3b0d468ab4f16e971c2a064b49d53a406d (commit)
from 4a1d447d3a71010a5cf138006fceae93570d81df (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=673afaa670a5b60c60b795653aae62c07755f05b
commit 673afaa670a5b60c60b795653aae62c07755f05b
Merge: 4a1d447 e965678
Author: Sandro Santilli <address@hidden>
Date: Sat Oct 30 00:22:44 2010 +0200
Merge branch 'master' into HEAD
Conflicts:
libcore/asobj/Error_as.cpp
libcore/asobj/NetConnection_as.cpp
libcore/movie_root.cpp
diff --cc libcore/asobj/Error_as.cpp
index 9b3c60d,9a3f21c..9832ec2
--- a/libcore/asobj/Error_as.cpp
+++ b/libcore/asobj/Error_as.cpp
@@@ -79,15 -79,13 +79,13 @@@ error_toString(const fn_call& fn
as_value
error_ctor(const fn_call& fn)
{
-
- if (!fn.isInstantiation()) return as_value();
-
as_object* err = fn.this_ptr;
+ if (!err) return as_value();
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
- if (fn.nargs) {
+ if (fn.nargs && !fn.arg(0).is_undefined()) {
- err->set_member(st.find("message"), fn.arg(0));
+ err->set_member(getURI(vm, "message"), fn.arg(0));
}
return as_value();
diff --cc libcore/asobj/flash/external/ExternalInterface_as.cpp
index b462b87,eee1961..290c3a9
--- a/libcore/asobj/flash/external/ExternalInterface_as.cpp
+++ b/libcore/asobj/flash/external/ExternalInterface_as.cpp
@@@ -373,23 -368,19 +366,19 @@@ externalinterface_objectID(const fn_cal
movie_root& mr = getRoot(fn);
MovieClip *mc = mr.getLevel(0);
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
as_value id;
- getObject(mc)->get_member(st.find("id"), &id);
+ getObject(mc)->get_member(getURI(vm, "id"), &id);
as_value name;
- getObject(mc)->get_member(st.find("name"), &name);
+ getObject(mc)->get_member(getURI(vm, "name"), &name);
if (id.is_undefined() && !name.is_undefined()) {
- // log_debug("ObjectdID name is: %s", name.to_string());
return name;
} else if (!id.is_undefined() && name.is_undefined()) {
- // log_debug("ObjectdID id is: %s", id.to_string());
return id;
} else if (id.is_undefined() && name.is_undefined()) {
- // log_debug("no objectID defined!");
return as_value();
}
-----------------------------------------------------------------------
Summary of changes:
NEWS | 1 +
README.dump-gnash | 96 -
gui/dump/README | 109 +-
gui/dump/dump.cpp | 1 -
libbase/log.h | 38 +-
libcore/ExternalInterface.cpp | 102 -
libcore/ExternalInterface.h | 18 -
libcore/asobj/Array_as.cpp | 9 +-
libcore/asobj/Error_as.cpp | 6 +-
libcore/asobj/LoadVars_as.cpp | 2 -
libcore/asobj/NetConnection_as.cpp | 1208 ++--
libcore/asobj/NetConnection_as.h | 36 +-
libcore/asobj/Object.cpp | 5 +-
.../asobj/flash/external/ExternalInterface_as.cpp | 100 +-
.../asobj/flash/external/ExternalInterface_as.h | 11 +-
libcore/movie_root.cpp | 76 +-
libcore/movie_root.h | 4 +-
libcore/vm/ASHandlers.cpp | 3 +-
plugin/mozplugger/README | 12 -
plugin/mozplugger/mozpluggerrc.patch | 3 -
plugin/test/baseuri/README | 11 +
plugin/test/baseuri/sub/test.as | 19 +
plugin/test/baseuri/sub/test.html | 28 +
plugin/test/baseuri/sub/test.xml | 1 +
plugin/test/baseuri/test.as | 19 +
plugin/test/baseuri/test.html | 37 +
plugin/test/baseuri/test.xml | 1 +
plugin/test/baseuri/test_base.html | 40 +
po/cs.po | 7134 ++++++++++----------
po/de.po | 6154 +++++++++---------
po/es.po | 6280 +++++++++---------
po/fi.po | 5929 ++++++++---------
po/fr.po | 6332 +++++++++---------
po/gnash.pot | 5448 ++++++++--------
po/it.po | 5837 ++++++++--------
po/ja.po | 5871 ++++++++--------
testsuite/actionscript.all/ExternalInterface.as | 62 +-
testsuite/actionscript.all/Object.as | 19 +-
testsuite/misc-haxe.all/classes.all/Makefile.am | 21 -
.../classes.all/filesystem/FileMode_as.hx | 64 -
.../classes.all/filesystem/FileStream_as.hx | 247 -
.../classes.all/filesystem/File_as.hx | 287 -
.../classes.all/filesystem/filesystem.am | 38 -
.../classes.all/filters/BevelFilter_as.hx | 134 -
.../classes.all/filters/BitmapFilterQuality_as.hx | 61 -
.../classes.all/filters/BitmapFilterType_as.hx | 64 -
.../classes.all/filters/BitmapFilter_as.hx | 60 -
.../classes.all/filters/BlurFilter_as.hx | 87 -
.../classes.all/filters/ColorMatrixFilter_as.hx | 78 -
.../classes.all/filters/ConvolutionFilter_as.hx | 118 -
.../filters/DisplacementMapFilterMode_as.hx | 60 -
.../filters/DisplacementMapFilter_as.hx | 122 -
.../classes.all/filters/DropShadowFilter_as.hx | 127 -
.../classes.all/filters/GlowFilter_as.hx | 112 -
.../classes.all/filters/GradientBevelFilter_as.hx | 129 -
.../classes.all/filters/GradientGlowFilter_as.hx | 128 -
.../misc-haxe.all/classes.all/filters/filters.am | 76 -
.../classes.all/html/HTMLHistoryItem_as.hx | 88 -
.../misc-haxe.all/classes.all/html/HTMLHost_as.hx | 117 -
.../classes.all/html/HTMLLoader_as.hx | 237 -
.../classes.all/html/HTMLPDFCapability_as.hx | 64 -
.../classes.all/html/HTMLWindowCreateOptions_as.hx | 119 -
testsuite/misc-haxe.all/classes.all/html/html.am | 43 -
.../classes.all/net/NetConnection_as.hx | 17 +-
.../classes.all/sampler/DeleteObjectSample_as.hx | 70 -
.../classes.all/sampler/NewObjectSample_as.hx | 100 -
.../misc-haxe.all/classes.all/sampler/Sample_as.hx | 78 -
.../classes.all/sampler/StackFrame_as.hx | 64 -
.../misc-haxe.all/classes.all/sampler/sampler.am | 39 -
.../classes.all/security/IURIDereferencer_as.hx | 64 -
.../security/RevocationCheckSettings_as.hx | 64 -
.../classes.all/security/SignatureStatus_as.hx | 64 -
.../classes.all/security/SignerTrustSettings_as.hx | 64 -
.../security/XMLSignatureValidator_as.hx | 137 -
.../misc-haxe.all/classes.all/security/security.am | 43 -
testsuite/misc-haxe.all/internal.all/ASnative.as | 285 -
.../internal.all/ExternalInterface.hx | 113 -
.../misc-haxe.all/internal.all/Function_as.hx | 995 ---
testsuite/misc-haxe.all/internal.all/Global.as | 482 --
testsuite/misc-haxe.all/internal.all/HitTest.as | 171 -
.../misc-haxe.all/internal.all/Inheritance.as | 600 --
testsuite/misc-haxe.all/internal.all/Instance.as | 132 -
testsuite/misc-haxe.all/internal.all/LoadVars.as | 383 --
testsuite/misc-haxe.all/internal.all/Microphone.as | 185 -
testsuite/misc-haxe.all/internal.all/Sound.as | 297 -
testsuite/misc-haxe.all/internal.all/flash_as.hx | 27 -
.../misc-haxe.all/internal.all/getvariable.as | 703 --
87 files changed, 25241 insertions(+), 33679 deletions(-)
delete mode 100644 README.dump-gnash
delete mode 100644 plugin/mozplugger/README
delete mode 100644 plugin/mozplugger/mozpluggerrc.patch
create mode 100644 plugin/test/baseuri/README
create mode 100644 plugin/test/baseuri/sub/test.as
create mode 100644 plugin/test/baseuri/sub/test.html
create mode 100644 plugin/test/baseuri/sub/test.xml
create mode 100644 plugin/test/baseuri/test.as
create mode 100644 plugin/test/baseuri/test.html
create mode 100644 plugin/test/baseuri/test.xml
create mode 100644 plugin/test/baseuri/test_base.html
delete mode 100644
testsuite/misc-haxe.all/classes.all/filesystem/FileMode_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filesystem/FileStream_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/filesystem/File_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/filesystem/filesystem.am
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/BevelFilter_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/BitmapFilterQuality_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/BitmapFilterType_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/BitmapFilter_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/filters/BlurFilter_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/ColorMatrixFilter_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/ConvolutionFilter_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/DisplacementMapFilterMode_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/DisplacementMapFilter_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/DropShadowFilter_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/filters/GlowFilter_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/GradientBevelFilter_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/filters/GradientGlowFilter_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/filters/filters.am
delete mode 100644
testsuite/misc-haxe.all/classes.all/html/HTMLHistoryItem_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/html/HTMLHost_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/html/HTMLLoader_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/html/HTMLPDFCapability_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/html/HTMLWindowCreateOptions_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/html/html.am
delete mode 100644
testsuite/misc-haxe.all/classes.all/sampler/DeleteObjectSample_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/sampler/NewObjectSample_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/sampler/Sample_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/sampler/StackFrame_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/sampler/sampler.am
delete mode 100644
testsuite/misc-haxe.all/classes.all/security/IURIDereferencer_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/security/RevocationCheckSettings_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/security/SignatureStatus_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/security/SignerTrustSettings_as.hx
delete mode 100644
testsuite/misc-haxe.all/classes.all/security/XMLSignatureValidator_as.hx
delete mode 100644 testsuite/misc-haxe.all/classes.all/security/security.am
delete mode 100644 testsuite/misc-haxe.all/internal.all/ASnative.as
delete mode 100644 testsuite/misc-haxe.all/internal.all/ExternalInterface.hx
delete mode 100644 testsuite/misc-haxe.all/internal.all/Function_as.hx
delete mode 100644 testsuite/misc-haxe.all/internal.all/Global.as
delete mode 100644 testsuite/misc-haxe.all/internal.all/HitTest.as
delete mode 100644 testsuite/misc-haxe.all/internal.all/Inheritance.as
delete mode 100644 testsuite/misc-haxe.all/internal.all/Instance.as
delete mode 100644 testsuite/misc-haxe.all/internal.all/LoadVars.as
delete mode 100644 testsuite/misc-haxe.all/internal.all/Microphone.as
delete mode 100644 testsuite/misc-haxe.all/internal.all/Sound.as
delete mode 100644 testsuite/misc-haxe.all/internal.all/flash_as.hx
delete mode 100644 testsuite/misc-haxe.all/internal.all/getvariable.as
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, objecturi, updated. 673afaa670a5b60c60b795653aae62c07755f05b,
Sandro Santilli <=