[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 7f6adaeabbfb5108f
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 7f6adaeabbfb5108ff4cc6336b80552baa3f9c9f |
|
Date: |
Tue, 19 Oct 2010 16:12:31 +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 7f6adaeabbfb5108ff4cc6336b80552baa3f9c9f (commit)
via bfbc2cb5ea8982d6567507cbeb26a1cd97ba0006 (commit)
via 78e1d59ce869df54dbf3af7df3929273a9349499 (commit)
via 62490510be48ca9b1849af1b390531ce92fa88d5 (commit)
via 3222174d3368ccb2b78149586df76da72ef1d254 (commit)
via b0710604c9de59a5181f36a46a9dcc97b1293ec1 (commit)
via 6efc3626f27f198beb3401a74f9bcdd5cc6cca67 (commit)
via b442ee24b2d377e55087e6a599369d2e5d951f8d (commit)
via b6be4a325ba231aec58f4a62ade9742bc5b8d407 (commit)
via 18233e474257ca1b5f597a1305f4466c6cb04a3e (commit)
via e8cb797041f1b17662f0dcf45b627894fb0a0abd (commit)
via 360b8cebaa1edb5052493d2927eb724397c52c52 (commit)
via d69d1f05f74f90486b21587bf88c598cc7c71525 (commit)
via 0eaf1672515f7027166faae4bc60565ec9190515 (commit)
via 5a74b09f2f7fc146acc023ee808ead69634d3467 (commit)
via 89dd731591995e946c847986b4118cc2fdeab7b7 (commit)
via 25004f742b2f0295f4f8486976ec88fa5224bbe4 (commit)
via 9dbb1413bb3b8a43675f9a7906e61d95552082c9 (commit)
via 0d9d14d25ac064ef5392c84b4cb0417b3d231638 (commit)
via 331ee065f749ba84991a709ea0640fa5374bb612 (commit)
via 829f87b470d3faf2375e425d58576c7f6264297b (commit)
via 7c8305916bbfba330be03c87b96c3278b9dd2993 (commit)
via ade3d3bea4991c2bddb19c58ccf04ac5d6dc558c (commit)
via db7acef8780f6bbd300f095da23c23d86d64ae01 (commit)
via c3e8d8748e2d2a9e3438e13e81472b75d560b304 (commit)
via 80a20bb315d9b60a0b1ec0d612e7a18365bc1170 (commit)
via ef777c9994a5a7883fd9309c0f1039a334199fe4 (commit)
via c854e6b13de275065097c6e4f7461b065656c411 (commit)
via d8632fd03833b51b0c8fb3fecd7aeda89095734e (commit)
via 41d1f7beb5131f3e1f75a5622101e3f0b75d64a7 (commit)
via bbf2ca2ba6c09f345e2d1a5eb35875a9b8a727ea (commit)
via ddf7b5a6a645ed66aa77ccae96582281303591a8 (commit)
via 2f08ce39e26fb7e9580aefcf4fcafe38a782b60f (commit)
via 93116439638a743d58b367428a1465e9c3fe792a (commit)
via 84baa2aeec6406e657254fc35c8b0a7f79dd851f (commit)
via e7307b071088134806e1c74a55f7989575a42a47 (commit)
via 0cda1c0e91e32a69cc032461f6d0b5f92c99070b (commit)
via 2c6f9a412abefd5c58b560cf3f4fe946cc38061f (commit)
via 64d39e29d21a75f6b0e7561b7b2dd981308d268b (commit)
via d04492f47b508c0f85dbe3cc2d45a87f65732cfd (commit)
via 6b3d8c4f9d011faa2f8b3292c94987a2285e2e7b (commit)
via d0d861cf12c83ce384a698c0fb52329259126935 (commit)
via f9419620a29fd4ec8f71be4d18329d8e0e8ac6d3 (commit)
via 264d62b99da6803fe0b9236df60a74108f1c4897 (commit)
via 5d70ee3a39d95586a5ea2d1c57b17486aec9f0b4 (commit)
via 855cb491073601d34164ede075859af32ef8fea0 (commit)
via 253bdd94086b556cdd8f2b58f13c09c11f35e3ed (commit)
via 6412a46e60b11424a0ea8a6960c4e3b9826daea6 (commit)
via e7363ed7296736734b120b8f9f40bdc310e2d072 (commit)
via f409f53702411781fe1ad9dbdd6d0e61163a653d (commit)
via 360d6ba0ad265bdaee5ec11b10273628b9d6fd2c (commit)
via 438b9192de9addb3d9d31c2ddc12019c008d0baa (commit)
via abb3bc4a007995b73873f076b1e479b334089b0a (commit)
from dee727e7b7db90f44e923846b7a4b9f9b484470d (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=7f6adaeabbfb5108ff4cc6336b80552baa3f9c9f
commit 7f6adaeabbfb5108ff4cc6336b80552baa3f9c9f
Merge: bfbc2cb 78e1d59
Author: Sandro Santilli <address@hidden>
Date: Tue Oct 19 18:12:24 2010 +0200
Merge branch 'master' into objecturi
diff --cc libcore/movie_root.cpp
index bd331c6,154e9e8..e8def4a
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@@ -2095,10 -2096,10 +2095,10 @@@ movie_root::findCharacterByTarget(cons
std::string part(tgtstr, from, to - from);
// TODO: there is surely a cleaner way to implement path finding.
- ObjectURI uri(st.find(part));
+ const ObjectURI& uri = getURI(_vm, part);
o = o->displayObject() ?
o->displayObject()->pathElement(uri) :
- o->get_path_element(uri);
+ getPathElement(*o, uri);
if (!o) {
#ifdef GNASH_DEBUG_TARGET_RESOLUTION
http://git.savannah.gnu.org/cgit//commit/?id=bfbc2cb5ea8982d6567507cbeb26a1cd97ba0006
commit bfbc2cb5ea8982d6567507cbeb26a1cd97ba0006
Merge: dee727e 3222174
Author: Sandro Santilli <address@hidden>
Date: Tue Oct 19 18:01:40 2010 +0200
Merge branch 'master' into objecturi
Conflicts:
libcore/ExternalInterface.cpp
libcore/asobj/flash/external/ExternalInterface_as.cpp
testsuite/misc-ming.all/DefineTextTest-Runner.cpp
diff --cc libcore/asobj/Array_as.h
index 80af21f,1f1e9be..9e1b097
--- a/libcore/asobj/Array_as.h
+++ b/libcore/asobj/Array_as.h
@@@ -51,10 -51,10 +51,10 @@@ ObjectURI arrayKey(VM& vm, size_t i)
//
/// Strict arrays have no non-hidden non-numeric properties. Only real arrays
/// are strict arrays; any users of this functor should check that first.
- class IsStrictArray : public AbstractPropertyVisitor
+ class IsStrictArray : public PropertyVisitor
{
public:
- IsStrictArray(string_table& st) : _strict(true), _st(st) {}
+ IsStrictArray(VM& st) : _strict(true), _st(st) {}
virtual bool accept(const ObjectURI& uri, const as_value& val);
bool strict() const {
diff --cc testsuite/misc-ming.all/DefineTextTest-Runner.cpp
index f34da85,686c60d..4ab531d
--- a/testsuite/misc-ming.all/DefineTextTest-Runner.cpp
+++ b/testsuite/misc-ming.all/DefineTextTest-Runner.cpp
@@@ -112,13 -112,13 +112,13 @@@ main(int /*argc*/, char** /*argv*/
for (int i=0; i<3; ++i) tester.advance(); // get to the end
- string_table& st = tester.vm().getStringTable();
+ VM& vm = tester.vm();
as_value eot;
- bool endOfTestFound = getObject(root)->get_member(st.find("endoftest"),
&eot);
+ bool endOfTestFound = getObject(root)->get_member(getURI(vm,
"endoftest"), &eot);
- xcheck(endOfTestFound);
- xcheck(eot.is_bool());
- xcheck(eot.to_bool(8));
+ check(endOfTestFound);
+ check(eot.is_bool());
+ check(eot.to_bool(8));
// TODO: use check_pixel for checking bacground colors
}
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
gui/gtk/gtk.cpp | 106 +++----
gui/gtk/gtksup.h | 3 +-
gui/gui.cpp | 29 +-
gui/gui.h | 11 +-
gui/kde/Kde4Gui.cpp | 10 +-
libbase/GC.cpp | 48 ++--
libbase/GC.h | 43 +--
libbase/Socket.cpp | 7 +
libbase/URL.cpp | 2 +
libcore/AMFConverter.cpp | 2 +-
libcore/Button.cpp | 5 +-
libcore/DisplayObject.cpp | 37 ++-
libcore/DisplayObject.h | 14 +-
libcore/DisplayObjectContainer.cpp | 9 +-
libcore/ExternalInterface.cpp | 162 ++---------
libcore/ExternalInterface.h | 57 ++--
libcore/MovieClip.cpp | 311 ++++++++++----------
libcore/MovieClip.h | 3 +-
libcore/PropertyList.cpp | 39 +---
libcore/PropertyList.h | 29 ++-
libcore/StaticText.cpp | 11 +-
libcore/as_environment.cpp | 2 +-
libcore/as_object.cpp | 148 ++++------
libcore/as_object.h | 125 ++++-----
libcore/as_value.cpp | 10 +
libcore/as_value.h | 6 +
libcore/asobj/Array_as.h | 2 +-
libcore/asobj/LoadVars_as.cpp | 20 +-
libcore/asobj/MovieClip_as.cpp | 4 +-
libcore/asobj/SharedObject_as.cpp | 2 +-
libcore/asobj/XMLNode_as.cpp | 41 ++--
libcore/asobj/XML_as.cpp | 6 +-
.../asobj/flash/external/ExternalInterface_as.cpp | 301 +++++++++++--------
libcore/movie_root.cpp | 57 ++---
libcore/movie_root.h | 12 +-
libcore/swf/StreamSoundBlockTag.cpp | 24 +-
libcore/swf/StreamSoundBlockTag.h | 54 ++--
libcore/vm/ASHandlers.cpp | 20 ++-
libsound/EmbedSound.h | 3 +-
libsound/sound_handler.cpp | 1 +
plugin/Makefile.am | 3 +
plugin/{win32 => aos4}/Makefile.am | 30 +--
plugin/{win32 => aos4}/plugin.cpp | 59 ++--
plugin/{win32 => aos4}/plugin.h | 18 +-
plugin/npapi/Makefile.am | 12 +-
testsuite/MovieTester.cpp | 15 +
testsuite/MovieTester.h | 4 +
testsuite/actionscript.all/ExternalInterface.as | 34 ++-
.../misc-ming.all/ButtonEventsTest-Runner.cpp | 9 +
testsuite/misc-ming.all/ButtonEventsTest.c | 9 +-
testsuite/misc-ming.all/DefineTextTest-Runner.cpp | 6 +-
testsuite/swfdec/PASSING | 4 +-
53 files changed, 947 insertions(+), 1033 deletions(-)
copy plugin/{win32 => aos4}/Makefile.am (76%)
copy plugin/{win32 => aos4}/plugin.cpp (93%)
copy plugin/{win32 => aos4}/plugin.h (89%)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, objecturi, updated. 7f6adaeabbfb5108ff4cc6336b80552baa3f9c9f,
Sandro Santilli <=