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

Source/bindings/templates/interface.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file has been auto-generated by {{code_generator}}. DO NOT MODIFY!
 
 #ifndef {{v8_class}}_h
 #define {{v8_class}}_h
 
 {% filter conditional(conditional_string) %}
@@ skipping 97 matching lines @@
     {% if is_event_target and not is_node %}
     {# Event listeners on DOM nodes are explicitly supported in the GC controller. #}
     static const int eventListenerCacheIndex = v8DefaultWrapperInternalFieldCount + {{custom_internal_field_counter}};
     {% set custom_internal_field_counter = custom_internal_field_counter + 1 %}
     {% endif %}
     {# persistentHandleIndex must be the last field, if it is present.
        Detailed explanation: https://codereview.chromium.org/139173012
        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 :-/

+    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 %}
-    static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + {{custom_internal_field_counter}};
     {# End custom internal fields #}
     static inline void* toInternalPointer({{cpp_class}}* impl)
     {
         {% if parent_interface %}
         return V8{{parent_interface}}::toInternalPointer(impl);
         {% else %}
         return impl;
         {% endif %}
     }
 
@@ skipping 144 matching lines @@
     v8SetReturnValueFast(callbackInfo, impl.get(), wrappable);
 }
 
 {% if has_event_constructor %}
 bool initialize{{cpp_class}}({{cpp_class}}Init&, const Dictionary&, ExceptionState&, const v8::FunctionCallbackInfo<v8::Value>& info, const String& = "");
 
 {% endif %}
 }
 {% endfilter %}
 #endif // {{v8_class}}_h