summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authorfqian@google.com <fqian@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-23 17:06:12 +0000
committerfqian@google.com <fqian@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-23 17:06:12 +0000
commit7d784ef0be7ec8a23d13318cd5fbb03b25816ceb (patch)
treec758c13a35c2ace58798fea2dfc39b456f2ffc83 /webkit/port
parent41fb90286c6db060cf022c635b76045a18964a1b (diff)
downloadchromium_src-7d784ef0be7ec8a23d13318cd5fbb03b25816ceb.zip
chromium_src-7d784ef0be7ec8a23d13318cd5fbb03b25816ceb.tar.gz
chromium_src-7d784ef0be7ec8a23d13318cd5fbb03b25816ceb.tar.bz2
Fixed mis-used inline keyword in v8_proxy.h file. Linux build is broken because of this. Thanks for pointing it out.
Review URL: http://codereview.chromium.org/4218 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r--webkit/port/bindings/v8/v8_proxy.cpp15
-rw-r--r--webkit/port/bindings/v8/v8_proxy.h21
2 files changed, 15 insertions, 21 deletions
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index 4a782ff..60f0488 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -2005,21 +2005,6 @@ v8::Handle<v8::Value> V8Proxy::CheckNewLegal(const v8::Arguments& args) {
}
-v8::Handle<v8::Value> V8Proxy::WrapCPointer(void* cptr) {
- // Represent void* as int
- int addr = reinterpret_cast<int>(cptr);
- ASSERT((addr & 0x01) == 0); // the address must be aligned.
- return v8::Integer::New(addr >> 1);
-}
-
-
-void* V8Proxy::ExtractCPointerImpl(v8::Handle<v8::Value> obj) {
- ASSERT(obj->IsNumber());
- int addr = obj->Int32Value();
- return reinterpret_cast<void*>(addr << 1);
-}
-
-
void V8Proxy::SetDOMWrapper(v8::Handle<v8::Object> obj, int type, void* cptr) {
ASSERT(obj->InternalFieldCount() >= 2);
obj->SetInternalField(V8Custom::kDOMWrapperObjectIndex, WrapCPointer(cptr));
diff --git a/webkit/port/bindings/v8/v8_proxy.h b/webkit/port/bindings/v8/v8_proxy.h
index 7e52dcd..94f0450 100644
--- a/webkit/port/bindings/v8/v8_proxy.h
+++ b/webkit/port/bindings/v8/v8_proxy.h
@@ -13,6 +13,7 @@
#include "NodeFilter.h"
#include "PlatformString.h" // for WebCore::String
#include <wtf/HashMap.h> // for HashMap
+#include <wtf/Assertions.h>
#include <iterator>
#include <list>
@@ -275,23 +276,26 @@ class V8Proxy {
// Return true if the current security context can access the target frame.
static bool CanAccess(Frame* target);
- // Create a V8 wrapper for a C pointer
- static inline v8::Handle<v8::Value> WrapCPointer(void* cptr);
-
static v8::Handle<v8::Value> CheckNewLegal(const v8::Arguments& args);
+ // Create a V8 wrapper for a C pointer
+ static v8::Handle<v8::Value> WrapCPointer(void* cptr) {
+ // Represent void* as int
+ int addr = reinterpret_cast<int>(cptr);
+ ASSERT((addr & 0x01) == 0); // the address must be aligned.
+ return v8::Integer::New(addr >> 1);
+ }
+
// Take C pointer out of a v8 wrapper
template <class C>
static C* ExtractCPointer(v8::Handle<v8::Value> obj) {
return static_cast<C*>(ExtractCPointerImpl(obj));
}
-
static v8::Handle<v8::Script> CompileScript(v8::Handle<v8::String> code,
const String& fileName,
int baseLine);
-
#ifndef NDEBUG
// Checks if a v8 value can be a DOM wrapper
static bool MaybeDOMWrapper(v8::Handle<v8::Value> value);
@@ -414,7 +418,12 @@ class V8Proxy {
v8::Handle<v8::Value> object);
// Take C pointer out of a v8 wrapper
- static inline void* ExtractCPointerImpl(v8::Handle<v8::Value> obj);
+ static void* ExtractCPointerImpl(v8::Handle<v8::Value> obj) {
+ ASSERT(obj->IsNumber());
+ int addr = obj->Int32Value();
+ return reinterpret_cast<void*>(addr << 1);
+ }
+
static v8::Handle<v8::Value> StyleSheetToV8Object(StyleSheet* sheet);
static v8::Handle<v8::Value> CSSValueToV8Object(CSSValue* value);