Merge Webkit 47001 - 20090810 Vitaly Repeshko <vitalyr@quad.spb.corp.google...

WebCore/bindings/v8/V8DOMWrapper.cpp

Index: WebCore/bindings/v8/V8DOMWrapper.cpp
===================================================================
--- WebCore/bindings/v8/V8DOMWrapper.cpp	(revision 24197)
+++ WebCore/bindings/v8/V8DOMWrapper.cpp	(working copy)
@@ -259,7 +259,7 @@
         // document.all is not shadowed and some other value if
         // document.all is shadowed.
         v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kDefaultWrapperInternalFieldCount);
+        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kNodeMinimumInternalFieldCount);
         instanceTemplate->SetInternalFieldCount(V8Custom::kHTMLDocumentInternalFieldCount);
         break;
     }
@@ -270,7 +270,7 @@
         // We add an extra internal field to all Document wrappers for
         // storing a per document DOMImplementation wrapper.
         v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kDefaultWrapperInternalFieldCount);
+        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kNodeMinimumInternalFieldCount);
         instanceTemplate->SetInternalFieldCount( V8Custom::kDocumentMinimumInternalFieldCount);
         break;
     }