[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 8984836636333ec16
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 8984836636333ec162fe2130da11abc401d8de02 |
|
Date: |
Wed, 20 Oct 2010 19:46: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 8984836636333ec162fe2130da11abc401d8de02 (commit)
via 731befc1cd9a4dbf4066aa980ae7dadaafbd5059 (commit)
via d6e20925f19502e93e822fa4d875f0574a8345bb (commit)
via 736a59d56beb7cf42f2eaf80e5d37131e6b5aea0 (commit)
via bb1358dec3b2a7d82f9705fecb19740e4af7e5ee (commit)
via 8dfe5b76c7722cc4b94f78f7e2a9e4e0579aaaf2 (commit)
via 6676d6936b4a5b1464bfbafce752e7d73ddf8f62 (commit)
via cd96c57e9e2b53d1e762c9424f1ca1eec888f4f6 (commit)
via bd37eca7d9f77c46340e71095af180f9f2ac2c3a (commit)
via 62c6d2dbb05924edfb62eb809d2ab96d7b75ba88 (commit)
via 02e9e19bc5662e62414b01168b14243b2aed9f32 (commit)
via cdc287186de052597ea223cef4b8477798b24607 (commit)
via 63b086ce3b33b10ca8e6f4b6e8e6f01029080959 (commit)
via 1405791f1c7f4c32832d700dbc364e88ebeac4e1 (commit)
via 9f8f920a349ad8456bc4a1d8fc63870af7040738 (commit)
via f5d36eee68934029014dba850b232afe01e992de (commit)
via 57c4193691d2313ef6214542c976a2b4dd73fb2b (commit)
via 3c71fcd107248099c678f15873aac1cde7c48b78 (commit)
via 64852234c5b8562a4b977e9beb064626075ac224 (commit)
via cdffac9302e64a71fa29ab62ec1c25599b2607a6 (commit)
via e4bb683bb45efbba64477845a52308922ee7cc82 (commit)
via 6bead66eb814a01e41062264e5f5c03e8b8e795e (commit)
via eb2c9108ed1b8a7ede2e4cd9ccf916398e0c0978 (commit)
via b4a97cdc4096f0aea334234216608b552b635a32 (commit)
via cf87ba129b515193dc4700612906c5e64a8582d7 (commit)
via 2f7d2a0b1204c167fe7065f68e982649e52a5599 (commit)
via 753908de4cbd99d789c5ea109160b3e4d9becd18 (commit)
via 8bb73f65e8d85f6d640f74e256d646c66fbd6a13 (commit)
via 85763463715dd58264edf97ce2c1cdc5c62eb3f7 (commit)
via 51de3a02379b49911aa7df2015b0f3ae18739e46 (commit)
via 20764275919d2ec05aeb3a876339e6c752e06c91 (commit)
via f325040bdf84a25e82d0db27145ba84d142d9983 (commit)
via 2d485daa27b96f113ddb77caaa2f761d50c22e8c (commit)
via d778ca9331ad8cebca89a0f890384a2a77c6929f (commit)
via a33143d4958af44096e906f19d8a835a7b78e4cd (commit)
via b56671c0f583a804cbd1ce167d49cbec6788a972 (commit)
via 7c83f92bd211ab5bdaa9195806093ab6abc465f2 (commit)
via fb05b4ea936e738c625556bd275a42394aec217c (commit)
via a3762a940db807c813b20420043e9a9eabd56079 (commit)
via 199617ed58e061d02bb476cdfb53eeab13dec88a (commit)
via 549879c038d13537de9897c4b1ad3fcc0d4fbe4e (commit)
via 69a9449030dc1707f78629c59e718a3876b739eb (commit)
via 177595fd9cfa15572abdbefdf5e7618889292a44 (commit)
from 7f6adaeabbfb5108ff4cc6336b80552baa3f9c9f (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=8984836636333ec162fe2130da11abc401d8de02
commit 8984836636333ec162fe2130da11abc401d8de02
Merge: 7f6adae 731befc
Author: Sandro Santilli <address@hidden>
Date: Wed Oct 20 21:45:54 2010 +0200
Merge branch 'master' into objecturi
Conflicts:
libcore/vm/ASHandlers.cpp
diff --cc libcore/vm/ASHandlers.cpp
index 77d7b46,6b19df6..61ba641
--- a/libcore/vm/ASHandlers.cpp
+++ b/libcore/vm/ASHandlers.cpp
@@@ -2734,17 -2592,16 +2592,15 @@@ ActionGetMember(ActionExec& thread
target, static_cast<void*>(obj));
);
- string_table& st = getStringTable(env);
- const string_table::key k = st.find(member_name.to_string());
+ const ObjectURI& k = getURI(getVM(env), member_name.to_string());
if (!obj->get_member(k, &env.top(1))) {
-
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("Reference to undefined member %s of object %s",
- member_name,
- target);
+ log_aserror("Reference to undefined member %s of object %s",
+ member_name, target);
);
env.top(1).set_undefined();
- }
+ }
IF_VERBOSE_ACTION (
log_action(_("-- get_member %s.%s=%s"),
@@@ -2896,10 -2749,10 +2747,9 @@@ ActionCallMethod(ActionExec& thread
if (noMeth) {
method_obj = obj;
}
- else
- {
+ else {
- string_table& st = getStringTable(env);
- method_key = st.find(method_string);
+ methURI = getURI(getVM(env), method_string);
// The method value
as_value method_value;
@@@ -2962,9 -2803,8 +2800,8 @@@
// TODO: check if this is correct!!
super = 0;
}
- else
- {
- super = obj->get_super(methURI);
+ else {
- super = obj->get_super(method_key);
++ super = obj->get_super(methodURI);
}
fn_call call(this_ptr, env, args);
-----------------------------------------------------------------------
Summary of changes:
gui/dump.cpp | 73 +--
gui/gui.cpp | 6 +-
gui/gui.h | 17 +-
libbase/GnashImageGif.cpp | 200 +++--
libbase/GnashImageGif.h | 10 +-
libbase/GnashImageJpeg.cpp | 12 +-
libcore/BevelFilter.h | 77 --
libcore/BitmapFilter.h | 43 -
libcore/BlurFilter.h | 52 --
libcore/ColorMatrixFilter.h | 50 --
libcore/ConvolutionFilter.h | 82 --
libcore/DropShadowFilter.h | 67 --
libcore/Filters.h | 359 ++++++++
libcore/GlowFilter.h | 63 --
libcore/GradientBevelFilter.h | 78 --
libcore/GradientGlowFilter.h | 78 --
libcore/Makefile.am | 14 +-
libcore/asobj/MovieClip_as.cpp | 11 +
libcore/asobj/flash/filters/BevelFilter_as.cpp | 3 +-
libcore/asobj/flash/filters/BevelFilter_as.h | 6 +-
.../asobj/flash/filters/BitmapFilterQuality_as.cpp | 57 --
.../asobj/flash/filters/BitmapFilterQuality_as.h | 43 -
.../asobj/flash/filters/BitmapFilterType_as.cpp | 58 --
libcore/asobj/flash/filters/BitmapFilterType_as.h | 43 -
libcore/asobj/flash/filters/BitmapFilter_as.cpp | 3 +-
libcore/asobj/flash/filters/BitmapFilter_as.h | 8 +-
libcore/asobj/flash/filters/BlurFilter_as.cpp | 3 +-
libcore/asobj/flash/filters/BlurFilter_as.h | 1 -
.../asobj/flash/filters/ColorMatrixFilter_as.cpp | 3 +-
libcore/asobj/flash/filters/ColorMatrixFilter_as.h | 5 +-
.../asobj/flash/filters/ConvolutionFilter_as.cpp | 5 +-
libcore/asobj/flash/filters/ConvolutionFilter_as.h | 5 +-
.../flash/filters/DisplacementMapFilterMode_as.cpp | 60 --
.../flash/filters/DisplacementMapFilterMode_as.h | 43 -
.../flash/filters/DisplacementMapFilter_as.cpp | 2 +
.../asobj/flash/filters/DisplacementMapFilter_as.h | 10 +-
.../asobj/flash/filters/DropShadowFilter_as.cpp | 5 +-
libcore/asobj/flash/filters/DropShadowFilter_as.h | 5 +-
libcore/asobj/flash/filters/GlowFilter_as.cpp | 3 +-
libcore/asobj/flash/filters/GlowFilter_as.h | 5 +-
.../asobj/flash/filters/GradientBevelFilter_as.cpp | 3 +-
.../asobj/flash/filters/GradientBevelFilter_as.h | 5 +-
.../asobj/flash/filters/GradientGlowFilter_as.cpp | 5 +-
.../asobj/flash/filters/GradientGlowFilter_as.h | 5 +-
libcore/asobj/flash/filters/filters.am | 93 +--
libcore/parser/SWFParser.cpp | 3 +-
libcore/parser/filter_factory.cpp | 12 +-
libcore/parser/filter_factory.h | 9 +-
libcore/swf/DefaultTagLoaders.cpp | 150 ++--
libcore/swf/DefineBitsTag.cpp | 665 +++++++++++++++
.../swf/{CSMTextSettingsTag.h => DefineBitsTag.h} | 31 +-
libcore/swf/DefineFontAlignZonesTag.cpp | 2 +-
libcore/swf/PlaceObject2Tag.cpp | 3 +-
libcore/swf/tag_loaders.cpp | 899 +++-----------------
libcore/swf/tag_loaders.h | 64 +--
libcore/vm/ASHandlers.cpp | 573 ++++---------
libcore/vm/Makefile.am | 1 -
libmedia/gst/AudioDecoderGst.cpp | 1 +
libmedia/gst/MediaParserGst.cpp | 5 +-
libsound/sound_handler.cpp | 33 +-
plugin/Makefile.am | 2 +-
plugin/aos4/Makefile.am | 2 +-
testsuite/actionscript.all/MovieClip.as | 95 ++-
63 files changed, 1786 insertions(+), 2543 deletions(-)
delete mode 100644 libcore/BevelFilter.h
delete mode 100644 libcore/BitmapFilter.h
delete mode 100644 libcore/BlurFilter.h
delete mode 100644 libcore/ColorMatrixFilter.h
delete mode 100644 libcore/ConvolutionFilter.h
delete mode 100644 libcore/DropShadowFilter.h
create mode 100644 libcore/Filters.h
delete mode 100644 libcore/GlowFilter.h
delete mode 100644 libcore/GradientBevelFilter.h
delete mode 100644 libcore/GradientGlowFilter.h
delete mode 100644 libcore/asobj/flash/filters/BitmapFilterQuality_as.cpp
delete mode 100644 libcore/asobj/flash/filters/BitmapFilterQuality_as.h
delete mode 100644 libcore/asobj/flash/filters/BitmapFilterType_as.cpp
delete mode 100644 libcore/asobj/flash/filters/BitmapFilterType_as.h
delete mode 100644 libcore/asobj/flash/filters/DisplacementMapFilterMode_as.cpp
delete mode 100644 libcore/asobj/flash/filters/DisplacementMapFilterMode_as.h
create mode 100644 libcore/swf/DefineBitsTag.cpp
copy libcore/swf/{CSMTextSettingsTag.h => DefineBitsTag.h} (70%)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, objecturi, updated. 8984836636333ec162fe2130da11abc401d8de02,
Sandro Santilli <=