Fix for http://code.google.com/p/chromium/issues/detail?id=5409....

webkit/port/bindings/v8/np_v8object.cpp

 /*
  * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007 Google, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 20 matching lines @@
 #include <string>
 #include <sstream>
 #include <v8.h>
 #include "np_v8object.h"
 #include "ChromiumBridge.h"
 #include "Frame.h"
 #include "bindings/npruntime.h"
 #include "npruntime_priv.h"
 #include "PlatformString.h"
 #include "ScriptController.h"
+#include "v8_custom.h"
 #include "v8_helpers.h"
 #include "v8_np_utils.h"
 #include "v8_proxy.h"
 #include "DOMWindow.h"
 
 using WebCore::V8ClassIndex;
+using WebCore::V8Custom;
 using WebCore::V8Proxy;
 
 namespace {
 
 // TODO(mbelshe): comments on why use malloc and free.
 static NPObject* AllocV8NPObject(NPP, NPClass*) {
   return static_cast<NPObject*>(malloc(sizeof(V8NPObject)));
 }
 
 static void FreeV8NPObject(NPObject* npobj) {
@@ skipping 36 matching lines @@
 }  // namespace
 
 //
 // NPAPI's npruntime functions
 //
 NPClass* NPScriptObjectClass = &V8NPObjectClass;
 
 NPObject* NPN_CreateScriptObject(NPP npp, v8::Handle<v8::Object> object,
                                  WebCore::DOMWindow* root) {
   // Check to see if this object is already wrapped.
-  if (object->InternalFieldCount() == 3 &&
-      object->GetInternalField(1)->IsNumber() &&
-      object->GetInternalField(1)->Uint32Value() == V8ClassIndex::NPOBJECT) {
+  if (object->InternalFieldCount() == V8Custom::kNPObjectInternalFieldCount &&
+      object->GetInternalField(V8Custom::kDOMWrapperTypeIndex)->IsNumber() &&
+      object->GetInternalField(V8Custom::kDOMWrapperTypeIndex)->Uint32Value() ==
+          V8ClassIndex::NPOBJECT) {
     NPObject* rv = V8Proxy::ToNativeObject<NPObject>(V8ClassIndex::NPOBJECT,
                                                      object);
     NPN_RetainObject(rv);
     return rv;
   }
 
   V8NPObject* obj =
       reinterpret_cast<V8NPObject*>(NPN_CreateObject(npp, &V8NPObjectClass));
   obj->v8_object = v8::Persistent<v8::Object>::New(object);
 #ifndef NDEBUG
@@ skipping 365 matching lines @@
     return true;
   }
 
   if (NP_CLASS_STRUCT_VERSION_HAS_ENUM(npobj->_class) &&
       npobj->_class->enumerate) {
      return npobj->_class->enumerate(npobj, identifier, count);
   }
 
   return false;
 }