[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 712c9b3303a878289
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 712c9b3303a8782899590d584c7cb5d487d03b0d |
|
Date: |
Sat, 09 Oct 2010 09:54:03 +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 712c9b3303a8782899590d584c7cb5d487d03b0d (commit)
via 5f75fb1d45bf46cb3209819d2b17a6dd18a147b1 (commit)
via bbb94d9f85363cf158acf358efbc86a502503b23 (commit)
via 2a2077e07868200fd69576cbe7cb83a276249fd5 (commit)
via f1f9cafb8f75f870db88b7ff86916ea936f8ee71 (commit)
via a32caea4677646b1f58b53498f600cf2495e59cf (commit)
via e2446f18e3e9d822af37dd977a242ac2baf19bc8 (commit)
via 82a68c84d9f7a5a4194502ffd6dd853949ca06ff (commit)
via 539ff491119f54c68507fad42868841bcf643d63 (commit)
via 38f56030bd1155c043ff96a5f7f8702710b3a560 (commit)
via f88a731f1c4788344ebd04c6f7da154112c9c71e (commit)
via b5161cb32e3b45c33b96004a3b00411338344a2f (commit)
via 1d9727abfd82f0d62533bb0071848478200924f1 (commit)
via 415921adbcaae6a4c5b52b57036f91d035347128 (commit)
via 21f912f53c9e490ba8de5d3ade5addb45d7cc8a7 (commit)
via f9bdf1e9b567ddfd4801d9d619d85e16370e0a9e (commit)
from fa09e6c4630bd112230e8a95400c12c518570d1a (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=712c9b3303a8782899590d584c7cb5d487d03b0d
commit 712c9b3303a8782899590d584c7cb5d487d03b0d
Author: Benjamin Wolsey <address@hidden>
Date: Sat Oct 9 11:32:51 2010 +0200
Make VM const.
diff --git a/libcore/vm/VM.h b/libcore/vm/VM.h
index db04a4f..59dcaeb 100644
--- a/libcore/vm/VM.h
+++ b/libcore/vm/VM.h
@@ -310,7 +310,7 @@ private:
// that the lowercase equivalent of `str' is `str' again
//
inline ObjectURI
-getURI(VM& vm, const std::string& str, bool lowerCaseHint=false)
+getURI(const VM& vm, const std::string& str, bool lowerCaseHint=false)
{
lowerCaseHint=lowerCaseHint; // TODO pass hint to ObjectURI ctor
// Possible optimization here is to directly compute
@@ -319,7 +319,7 @@ getURI(VM& vm, const std::string& str, bool
lowerCaseHint=false)
}
inline ObjectURI
-getURI(VM&, NSV::NamedStrings s)
+getURI(const VM&, NSV::NamedStrings s)
{
// Possible optimization here is to directly
// compute noCase values if VM version is < 7
http://git.savannah.gnu.org/cgit//commit/?id=5f75fb1d45bf46cb3209819d2b17a6dd18a147b1
commit 5f75fb1d45bf46cb3209819d2b17a6dd18a147b1
Merge: fa09e6c bbb94d9
Author: Benjamin Wolsey <address@hidden>
Date: Sat Oct 9 11:20:59 2010 +0200
Fix conflicts from master
diff --cc libcore/asobj/SharedObject_as.cpp
index aa75166,2521c9e..fd5a395
--- a/libcore/asobj/SharedObject_as.cpp
+++ b/libcore/asobj/SharedObject_as.cpp
@@@ -37,9 -42,8 +42,8 @@@
#include "NativeFunction.h"
#include "VM.h"
#include "Property.h"
-#include "string_table.h"
+#include "VM.h"
#include "rc.h" // for use of rcfile
- #include "URLAccessManager.h"
#include "URL.h"
#include "NetConnection_as.h"
#include "Object.h"
diff --cc libcore/vm/VM.h
index d6b007f,3af3697..db04a4f
--- a/libcore/vm/VM.h
+++ b/libcore/vm/VM.h
@@@ -358,36 -300,10 +302,38 @@@ private
/// Library of SharedObjects. Owned by the VM.
std::auto_ptr<SharedObjectLibrary> _shLib;
+ RNG _rng;
+
};
+// @param lowerCaseHint if true the caller guarantees
+// that the lowercase equivalent of `str' is `str' again
+//
+inline ObjectURI
+getURI(VM& vm, const std::string& str, bool lowerCaseHint=false)
+{
+ lowerCaseHint=lowerCaseHint; // TODO pass hint to ObjectURI ctor
+ // Possible optimization here is to directly compute
+ // noCase value if VM version is < 7
+ return ObjectURI((NSV::NamedStrings)vm.getStringTable().find(str));
+}
+
+inline ObjectURI
+getURI(VM&, NSV::NamedStrings s)
+{
+ // Possible optimization here is to directly
+ // compute noCase values if VM version is < 7
+ // (using the known information in NSV)
+ return ObjectURI(s);
+}
+
+inline const std::string&
+toString(VM& vm, const ObjectURI& uri)
+{
+ return uri.toString(vm.getStringTable());
+}
+
+
/// A class to wrap frame access. Stack allocating a frame guard
/// will ensure that all CallFrame pushes have a corresponding
/// CallFrame pop, even in the presence of extraordinary returns.
diff --cc testsuite/libcore.all/PropertyListTest.cpp
index a46d534,8add512..ee40fb0
--- a/testsuite/libcore.all/PropertyListTest.cpp
+++ b/testsuite/libcore.all/PropertyListTest.cpp
@@@ -101,32 -101,34 +101,32 @@@ main(int /*argc*/, char** /*argv*/
if (vm.getSWFVersion() > 6) // SWF 7 or higher is case sensitive.
{
check_equals(props.size(), 0);
- check ( props.setValue(st.find("Var0"), val) );
+ check ( props.setValue(getURI(vm, "Var0"), val) );
check_equals(props.size(), 1);
- check (getVal(props, getURI(vm, "Var0"), ret, obj) );
- check (getVal(props, st.find("Var0"), ret, *obj) );
++ check (getVal(props, getURI(vm, "Var0"), ret, *obj) );
check_strictly_equals ( ret, val );
// search should be case-sensitive
- check (!getVal(props, getURI(vm, "var0"), ret, obj) );
- check (!getVal(props, st.find("var0"), ret, *obj) );
++ check (!getVal(props, getURI(vm, "var0"), ret, *obj) );
// new value overrides existing value
- check ( props.setValue(st.find("Var0"), val2) );
+ check ( props.setValue(getURI(vm, "Var0"), val2) );
check_equals(props.size(), 1);
- check (getVal(props, getURI(vm, "Var0"), ret, obj) );
- check (getVal(props, st.find("Var0"), ret, *obj) );
++ check (getVal(props, getURI(vm, "Var0"), ret, *obj) );
check_strictly_equals ( ret, val2 );
// case-sensitive setting value doesn't overrides existing value
- check ( props.setValue(st.find("var0"), val3) );
+ check ( props.setValue(getURI(vm, "var0"), val3) );
check_equals(props.size(), 2);
- check (!getVal(props, getURI(vm, "vAr0"), ret, obj) );
- check (!getVal(props, st.find("vAr0"), ret, *obj) );
++ check (!getVal(props, getURI(vm, "vAr0"), ret, *obj) );
// Now add some new labels
- check ( props.setValue(st.find("var1"), val) );
+ check ( props.setValue(getURI(vm, "var1"), val) );
check_equals(props.size(), 3);
- check ( props.setValue(st.find("var2"), val) );
+ check ( props.setValue(getURI(vm, "var2"), val) );
check_equals(props.size(), 4);
- check ( props.setValue(st.find("var3"), val) );
+ check ( props.setValue(getURI(vm, "var3"), val) );
check_equals(props.size(), 5);
// Test deletion of properties
@@@ -155,26 -157,26 +155,26 @@@
// Below SWF or is not case sensitive.
check_equals(props.size(), 0);
- check ( props.setValue(st.find("Var0"), val) );
+ check ( props.setValue(getURI(vm, "Var0"), val) );
check_equals(props.size(), 1);
- check (getVal(props, getURI(vm, "Var0"), ret, obj) );
- check (getVal(props, st.find("Var0"), ret, *obj) );
++ check (getVal(props, getURI(vm, "Var0"), ret, *obj) );
check_strictly_equals ( ret, val );
// search should be case-insensitive
- check (getVal(props, getURI(vm, "var0"), ret, obj) );
- check (getVal(props, st.find("var0"), ret, *obj) );
++ check (getVal(props, getURI(vm, "var0"), ret, *obj) );
check_strictly_equals ( ret, val );
// new value overrides existing value
- check ( props.setValue(st.find("Var0"), val2) );
+ check ( props.setValue(getURI(vm, "Var0"), val2) );
check_equals(props.size(), 1);
- check (getVal(props, getURI(vm, "Var0"), ret, obj) );
- check (getVal(props, st.find("Var0"), ret, *obj) );
++ check (getVal(props, getURI(vm, "Var0"), ret, *obj) );
check_strictly_equals ( ret, val2 );
// case-insensitive setting value should override existing value
- check ( props.setValue(st.find("var0"), val3) );
+ check ( props.setValue(getURI(vm, "var0"), val3) );
check_equals(props.size(), 1);
- check (getVal(props, getURI(vm, "vAr0"), ret, obj) );
- check (getVal(props, st.find("vAr0"), ret, *obj) );
++ check (getVal(props, getURI(vm, "vAr0"), ret, *obj) );
check_strictly_equals ( ret, val3 );
// Now add some new labels
diff --cc testsuite/misc-ming.all/DefineTextTest-Runner.cpp
index dbcefb0,54046d3..f34da85
--- a/testsuite/misc-ming.all/DefineTextTest-Runner.cpp
+++ b/testsuite/misc-ming.all/DefineTextTest-Runner.cpp
@@@ -112,10 -112,10 +112,10 @@@ main(int /*argc*/, char** /*argv*/
for (int i=0; i<3; ++i) tester.advance(); // get to the end
- VM& vm = VM::get();
- string_table& st = VM::get().getStringTable();
- 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));
diff --cc testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
index 6c8bad7,df1248e..959dde0
--- a/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
+++ b/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
@@@ -65,8 -65,8 +65,9 @@@ main(int /*argc*/, char** /*argv*/
// When all possible tests are implemented as self-contained, we'll
// add tests that can't be self-contained.
//
- VM& vm = getVM(*getObject(root));
- string_table& st = tester.vm().getStringTable();
- string_table::key k = st.find("startNotified");
++ VM& vm = tester.vm();
++
+ const ObjectURI& k = getURI(vm, "startNotified");
as_value tmp;
while (!getObject(root)->get_member(k, &tmp) )
{
diff --cc testsuite/misc-ming.all/attachMovieTestRunner.cpp
index 36feb18,61386f4..33db5e6
--- a/testsuite/misc-ming.all/attachMovieTestRunner.cpp
+++ b/testsuite/misc-ming.all/attachMovieTestRunner.cpp
@@@ -79,13 -79,13 +79,13 @@@ main(int /*argc*/, char** /*argv*/
// check that the pixel under the mouse is white
check_pixel(100, 30, 2, rgba(255,255,255,255), 2);
- VM& vm = getVM(*getObject(root));
+ VM& vm = tester.vm();
+ const ObjectURI& mousedown = getURI(vm, "mousedown");
+ const ObjectURI& mouseup = getURI(vm, "mouseup");
- string_table& st = vm.getStringTable();
-
- getObject(root)->get_member(st.find("mousedown"), &tmp);
+ getObject(root)->get_member(mousedown, &tmp);
check(tmp.is_undefined());
- getObject(root)->get_member(st.find("mouseup"), &tmp);
+ getObject(root)->get_member(mouseup, &tmp);
check(tmp.is_undefined());
// Note that we are *not* on an active entity !
diff --cc testsuite/misc-ming.all/intervalTestRunner.cpp
index 6386db3,3d42ea9..d296c2a
--- a/testsuite/misc-ming.all/intervalTestRunner.cpp
+++ b/testsuite/misc-ming.all/intervalTestRunner.cpp
@@@ -61,15 -61,11 +61,15 @@@ main(int /*argc*/, char** /*argv*/
// Now timers are set and counters initialized
- VM& vm = VM::get();
+ VM& vm = tester.vm();
- string_table& st = vm.getStringTable();
- getObject(root)->get_member(st.find("this_counter"), &tmp);
+ const ObjectURI& thisCounter = getURI(vm, "this_counter");
+ const ObjectURI& thatCounter = getURI(vm, "that_counter");
+ const ObjectURI& pushedArgs = getURI(vm, "pushed_args");
+ const ObjectURI& testCompleted = getURI(vm, "test_completed");
+
+ getObject(root)->get_member(thisCounter, &tmp);
check_equals(toNumber(tmp, vm), 0);
- getObject(root)->get_member(st.find("that_counter"), &tmp);
+ getObject(root)->get_member(thatCounter, &tmp);
check_equals(toNumber(tmp, vm), 0);
tester.advanceClock(500); // "sleep" 500 milliseconds
diff --cc testsuite/movies.all/gravity_embedded-TestRunner.cpp
index 2d91ea0,d130bd1..548cbe8
--- a/testsuite/movies.all/gravity_embedded-TestRunner.cpp
+++ b/testsuite/movies.all/gravity_embedded-TestRunner.cpp
@@@ -68,11 -68,12 +68,11 @@@ main(int /*argc*/, char** /*argv*/
check(loaded);
check_equals(loaded->parent(), root);
- VM& vm = getVM(*getObject(loaded));
+ VM& vm = tester.vm();
-
- string_table& st = vm.getStringTable();
- string_table::key xscale = st.find("_xscale");
- string_table::key yscale = st.find("_yscale");
- // we need a const_cast as get_member *might* eventually
+ const ObjectURI& xscale = getURI(vm, "_xscale");
+ const ObjectURI& yscale = getURI(vm, "_yscale");
+
+ // we need a const_cast as get_member *might* eventually
// change the DisplayObject (fetching _x shouldn't change it though)
check(getObject(const_cast<DisplayObject*>(loaded))->get_member(xscale,
&tmp));
check(tmp.strictly_equals(50));
-----------------------------------------------------------------------
Summary of changes:
cygnal/cvm.cpp | 3 -
extensions/fileio/fileio.cpp | 2 +-
gui/Player.cpp | 17 +--
gui/gtk/gtk.cpp | 2 +-
gui/gtk/gtk_canvas.cpp | 4 +-
gui/gtk/gtk_canvas.h | 3 +-
gui/gtk/gtk_glue.h | 10 +-
gui/gtk/gtk_glue_agg.cpp | 2 +-
gui/gtk/gtk_glue_agg.h | 2 +-
gui/gtk/gtk_glue_agg_vaapi.cpp | 7 +-
gui/gtk/gtk_glue_agg_vaapi.h | 3 +-
gui/gtk/gtk_glue_agg_xv.cpp | 10 +-
gui/gtk/gtk_glue_agg_xv.h | 4 +-
gui/gui.cpp | 37 ++---
gui/gui.h | 2 +-
gui/pythonmod/gnash-view.cpp | 9 +-
libbase/GC.cpp | 41 ++---
libbase/GC.h | 155 +++++++-------------
libcore/DisplayObject.cpp | 1 +
libcore/FreetypeGlyphsProvider.cpp | 3 +
libcore/MovieClip.cpp | 6 +-
libcore/MovieLoader.cpp | 3 +-
libcore/Relay.cpp | 1 -
libcore/RunResources.h | 12 +--
libcore/StreamProvider.cpp | 22 ++-
libcore/StreamProvider.h | 20 ++-
libcore/URLAccessManager.cpp | 25 +--
libcore/URLAccessManager.h | 2 +-
libcore/as_object.cpp | 2 +
libcore/asobj/LoadableObject.cpp | 7 +-
libcore/asobj/LocalConnection_as.cpp | 25 ++--
libcore/asobj/NetConnection_as.cpp | 17 +-
libcore/asobj/NetStream_as.cpp | 4 +-
libcore/asobj/SharedObject_as.cpp | 20 ++--
libcore/asobj/Sound_as.cpp | 5 +-
libcore/asobj/XMLSocket_as.cpp | 2 -
.../asobj/flash/external/ExternalInterface_as.cpp | 10 +-
libcore/gnash.h | 5 -
libcore/impl.cpp | 35 +-----
libcore/movie_root.cpp | 43 +++---
libcore/movie_root.h | 58 ++++----
libcore/swf/ImportAssetsTag.h | 3 +-
libcore/vm/VM.cpp | 105 +++-----------
libcore/vm/VM.h | 143 ++++++++----------
plugin/win32/plugin.cpp | 1 -
testsuite/MovieTester.cpp | 10 +-
testsuite/MovieTester.h | 5 +
testsuite/libcore.all/AsValueTest.cpp | 6 +-
testsuite/libcore.all/DisplayListTest.cpp | 6 +-
testsuite/libcore.all/PropertyListTest.cpp | 28 ++--
testsuite/misc-ming.all/DefineTextTest-Runner.cpp | 4 +-
.../misc-ming.all/NetStream-SquareTestRunner.cpp | 3 +-
testsuite/misc-ming.all/attachMovieTestRunner.cpp | 2 +-
testsuite/misc-ming.all/intervalTestRunner.cpp | 2 +-
.../movies.all/gravity_embedded-TestRunner.cpp | 2 +-
utilities/processor.cpp | 30 +---
56 files changed, 402 insertions(+), 589 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, objecturi, updated. 712c9b3303a8782899590d584c7cb5d487d03b0d,
Benjamin Wolsey <=