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

WebCore/bindings/v8/V8DOMWrapper.cpp

 /*
  * Copyright (C) 2009 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:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 241 matching lines @@
         // We add an extra internal field to all Document wrappers for
         // storing a per document DOMImplementation wrapper.
         //
         // Additionally, we add two extra internal fields for
         // HTMLDocuments to implement temporary shadowing of
         // document.all. One field holds an object that is used as a
         // marker. The other field holds the marker object if
         // 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;
     }
 #if ENABLE(SVG)
     case V8ClassIndex::SVGDOCUMENT:  // fall through
 #endif
     case V8ClassIndex::DOCUMENT: {
         // 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;
     }
     case V8ClassIndex::HTMLAPPLETELEMENT:  // fall through
     case V8ClassIndex::HTMLEMBEDELEMENT:  // fall through
     case V8ClassIndex::HTMLOBJECTELEMENT:
         // HTMLAppletElement, HTMLEmbedElement and HTMLObjectElement are
         // inherited from HTMLPlugInElement, and they share the same property
         // handling code.
         descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(HTMLPlugInElement), USE_NAMED_PROPERTY_SETTER(HTMLPlugInElement));
@@ skipping 1138 matching lines @@
     if (V8IsolatedWorld* world = V8IsolatedWorld::getEntered()) {
        context = world->context();
        if (frame != V8Proxy::retrieveFrame(context))
           return v8::Handle<v8::Context>();
     }
 
     return context;
 }
 
 }  // namespace WebCore