summaryrefslogtreecommitdiffstats
path: root/webkit/port/bindings/v8/v8_proxy.cpp
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-15 17:33:47 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-15 17:33:47 +0000
commitf6fc4db35b28dc4e96167e2f6e9fed6554de4c31 (patch)
treeef835042ae9b476cdd6c121a5da3cf46304e1eb5 /webkit/port/bindings/v8/v8_proxy.cpp
parent37088fefa67704ad6f18e1e72e2e6292ba48ee1b (diff)
downloadchromium_src-f6fc4db35b28dc4e96167e2f6e9fed6554de4c31.zip
chromium_src-f6fc4db35b28dc4e96167e2f6e9fed6554de4c31.tar.gz
chromium_src-f6fc4db35b28dc4e96167e2f6e9fed6554de4c31.tar.bz2
Fix some gcc'isms in compilation. Break circular dependency between v8_common and v8_proxy by introducing a new header, v8_properties.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port/bindings/v8/v8_proxy.cpp')
-rw-r--r--webkit/port/bindings/v8/v8_proxy.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index be8c7ff..d6015b4 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -37,6 +37,7 @@
#include "v8_events.h"
#include "v8_binding.h"
#include "v8_custom.h"
+#include "v8_collection.h"
#include "v8_nodefilter.h"
#include "V8Bridge.h"
@@ -97,6 +98,7 @@
#include "base/stats_table.h"
#include "webkit/glue/glue_util.h"
+#include "webkit/glue/webkit_glue.h"
namespace WebCore {
@@ -192,12 +194,12 @@ template<class T>
class DOMPeerableWrapperMap : public DOMWrapperMap<T> {
public:
explicit DOMPeerableWrapperMap(v8::WeakReferenceCallback callback) :
- DOMWrapperMap(callback) { }
+ DOMWrapperMap<T>(callback) { }
// Get the JS wrapper object of an object.
v8::Persistent<v8::Object> get(T* obj) {
v8::Object* peer = static_cast<v8::Object*>(obj->peer());
- ASSERT(peer == map_.get(obj));
+ ASSERT(peer == this->map_.get(obj));
return peer ? v8::Persistent<v8::Object>(peer)
: v8::Persistent<v8::Object>();
}
@@ -210,7 +212,7 @@ class DOMPeerableWrapperMap : public DOMWrapperMap<T> {
void forget(T* obj) {
v8::Object* peer = static_cast<v8::Object*>(obj->peer());
- ASSERT(peer == map_.get(obj));
+ ASSERT(peer == this->map_.get(obj));
if (peer)
obj->setPeer(0);
DOMWrapperMap<T>::forget(obj);