Don't add extra 8 byte to DOM wrappers in non-oilpan builds

Source/bindings/templates/interface.h

Index: Source/bindings/templates/interface.h
diff --git a/Source/bindings/templates/interface.h b/Source/bindings/templates/interface.h
index 8440e13744e8d45d8d47d73fd035bbaf0c59a14c..d456b515d04c8fcf9672d435a8d26ec234c5afd2 100644
--- a/Source/bindings/templates/interface.h
+++ b/Source/bindings/templates/interface.h
@@ -115,11 +115,21 @@ public:
        FIXME: Remove this internal field, and share one field for either:
        * a persistent handle (if the object is in oilpan) or
        * a C++ pointer to the DOM object (if the object is not in oilpan) #}
-    {% if not gc_type == 'RefCountedObject' %}
+    {% if gc_type == 'GarbageCollectedObject' %}
+    static const int persistentHandleIndex = v8DefaultWrapperInternalFieldCount + {{custom_internal_field_counter}};
+    {% set custom_internal_field_counter = custom_internal_field_counter + 1 %}
+    static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + {{custom_internal_field_counter}};
+    {% elif gc_type == 'WillBeGarbageCollectedObject' %}
+#if ENABLE(OILPAN)
     static const int persistentHandleIndex = v8DefaultWrapperInternalFieldCount + {{custom_internal_field_counter}};
     {% set custom_internal_field_counter = custom_internal_field_counter + 1 %}

[zerny-chromium, 2014/06/03 09:35:23]

It looks like this does not work because of phase differences. The meta-level
code does not care about the #if so it increments the count regardless. That
gives an incorrect offset in the output :-/

-    {% endif %}
     static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + {{custom_internal_field_counter}};
+#else
+    static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + {{custom_internal_field_counter}};
+#endif
+    {% else %}
+    static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + {{custom_internal_field_counter}};
+    {% endif %}
     {# End custom internal fields #}
     static inline void* toInternalPointer({{cpp_class}}* impl)
     {