diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 22:59:00 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 22:59:00 +0000 |
| commit | 59a636e65e458f169fccfc529c9a1362b0e7562a (patch) | |
| tree | 3173c0f43ea73cbe34b3e12128bc1832065c2726 | |
| parent | 5f8af2aa221fd2fba282dd51dc0837829cd48967 (diff) | |
| download | chromium_src-59a636e65e458f169fccfc529c9a1362b0e7562a.zip chromium_src-59a636e65e458f169fccfc529c9a1362b0e7562a.tar.gz chromium_src-59a636e65e458f169fccfc529c9a1362b0e7562a.tar.bz2 | |
merge changes to cpp_bound_class from mac_july_2008 branch.
(removes const on CppArgumentList's entries because of call sites like: "cpp_args[i].Set(args[i])")
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@467 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/cpp_bound_class.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/cpp_bound_class.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index 66244b5..56507e9 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -37,9 +37,9 @@ // name in its internal map of methods, and then calls the appropriate // method. -#include "webkit/glue/cpp_bound_class.h" - #include "config.h" + +#include "webkit/glue/cpp_bound_class.h" #include "webkit/glue/webframe.h" // This is required for the KJS build due to an artifact of the diff --git a/webkit/glue/cpp_bound_class.h b/webkit/glue/cpp_bound_class.h index 56b4b8e..de665b4 100644 --- a/webkit/glue/cpp_bound_class.h +++ b/webkit/glue/cpp_bound_class.h @@ -52,7 +52,7 @@ class WebFrame; -typedef std::vector<const CppVariant> CppArgumentList; +typedef std::vector<CppVariant> CppArgumentList; // CppBoundClass lets you map Javascript method calls and property accesses // directly to C++ method calls and CppVariant* variable access. |