diff options
Diffstat (limited to 'WebCore/bindings/v8/NPV8Object.h')
| -rw-r--r-- | WebCore/bindings/v8/NPV8Object.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/NPV8Object.h b/WebCore/bindings/v8/NPV8Object.h index 62b3ba4..911987a 100644 --- a/WebCore/bindings/v8/NPV8Object.h +++ b/WebCore/bindings/v8/NPV8Object.h @@ -30,6 +30,10 @@ #ifndef NPV8Object_h #define NPV8Object_h +<<<<<<< HEAD +======= +#include "V8Index.h" +>>>>>>> webkit.org at r54127 #if PLATFORM(CHROMIUM) // FIXME: Chromium uses a different npruntime.h, which is in // the Chromium source repository under third_party/npapi/bindings. @@ -43,6 +47,8 @@ namespace WebCore { class DOMWindow; + + static const int npObjectInternalFieldCount = v8DefaultWrapperInternalFieldCount + 0; } extern NPClass* npScriptObjectClass; @@ -65,4 +71,6 @@ struct PrivateIdentifier { NPObject* npCreateV8ScriptObject(NPP, v8::Handle<v8::Object>, WebCore::DOMWindow*); +NPObject* v8ObjectToNPObject(v8::Handle<v8::Object>); + #endif // NPV8Object_h |