bindings: Reduce the size of script_state.h

script_state.h is used in 4,500+ compilation units, and this CL reduces
its estimated pre-processed size from 2.13MB to 0.79MB.

* Move |kV8ContextPerContextDataIndex| from v8_per_context_data.h to
  script_state.h.
  Also, it should not be an enum item.

* Generated binding code doesn't include v8_per_context_data.h by
  default. So we need to include it if necessary.

Bug: 242216
Change-Id: Icb219357585ccb55a8932131473fe0a9b3bc1484
Reviewed-on: https://chromium-review.googlesource.com/1125592Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572538}

third_party/blink/renderer/bindings/core/v8/generated_code_helper.cc

@@ -7,6 +7,7 @@
 #include "third_party/blink/renderer/bindings/core/v8/serialization/serialized_script_value.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 
 namespace blink {
 

third_party/blink/renderer/bindings/core/v8/scheduled_action.h

@@ -36,6 +36,7 @@
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "third_party/blink/renderer/platform/wtf/forward.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 #include "v8/include/v8.h"
 
 namespace blink {

third_party/blink/renderer/bindings/core/v8/script_custom_element_definition.cc

@@ -17,6 +17,7 @@
 #include "third_party/blink/renderer/core/html/html_element.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/bindings/v8_binding_macros.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/bindings/v8_private_property.h"
 #include "third_party/blink/renderer/platform/wtf/allocator.h"
 #include "v8/include/v8.h"

third_party/blink/renderer/bindings/core/v8/v8_context_snapshot.cc

@@ -17,6 +17,7 @@
 #include "third_party/blink/renderer/platform/bindings/dom_wrapper_world.h"
 #include "third_party/blink/renderer/platform/bindings/origin_trial_features.h"
 #include "third_party/blink/renderer/platform/bindings/v8_object_constructor.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/bindings/v8_per_isolate_data.h"
 #include "third_party/blink/renderer/platform/bindings/v8_private_property.h"
 #include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h"

third_party/blink/renderer/bindings/core/v8/v8_v0_custom_element_lifecycle_callbacks.h

@@ -41,6 +41,7 @@
 
 namespace blink {
 
+class V0CustomElementBinding;
 class V0CustomElementLifecycleCallbacks;
 class Element;
 class V8PerContextData;

third_party/blink/renderer/bindings/core/v8/window_proxy.h

@@ -43,6 +43,7 @@ namespace blink {
 
 class DOMWindow;
 class Frame;
+struct WrapperTypeInfo;
 
 // WindowProxy implements the split window model of a window for a frame. In the
 // HTML standard, the split window model is composed of the Window interface

third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py

@@ -162,6 +162,7 @@ def origin_trial_features_context(generator_name, feature_info):
         'core/origin_trials/origin_trials.h',
         'platform/bindings/origin_trial_features.h',
         'platform/bindings/script_state.h',
+        'platform/bindings/v8_per_context_data.h',
         # TODO(iclelland): Remove the need to explicitly include this; it is
         # here because the ContextFeatureSettings code needs it.
         'bindings/core/v8/v8_window.h',

third_party/blink/renderer/bindings/scripts/v8_attributes.py

@@ -120,6 +120,10 @@ def attribute_context(interface, attribute, interfaces):
     if is_cached_accessor:
         includes.add('platform/bindings/v8_private_property.h')
 
+    # [LogActivity]
+    if 'LogActivity' in extended_attributes:
+        includes.add('platform/bindings/v8_per_context_data.h')
+
     context = {
         'activity_logging_world_list_for_getter': v8_utilities.activity_logging_world_list(attribute, 'Getter'),  # [ActivityLogging]
         'activity_logging_world_list_for_setter': v8_utilities.activity_logging_world_list(attribute, 'Setter'),  # [ActivityLogging]

third_party/blink/renderer/bindings/scripts/v8_callback_interface.py

@@ -50,6 +50,7 @@ CALLBACK_INTERFACE_CPP_INCLUDES = frozenset([
 ])
 LEGACY_CALLBACK_INTERFACE_H_INCLUDES = frozenset([
     'platform/bindings/dom_wrapper_world.h',
+    'platform/bindings/wrapper_type_info.h',
 ])
 LEGACY_CALLBACK_INTERFACE_CPP_INCLUDES = frozenset([
     'bindings/core/v8/v8_dom_configuration.h',

third_party/blink/renderer/bindings/scripts/v8_interface.py

@@ -342,6 +342,7 @@ def interface_context(interface, interfaces):
                             ' specified on partial interface definitions: '
                             '%s' % interface.name)
         if named_constructor:
+            includes.add('platform/bindings/v8_per_context_data.h')
             includes.add('platform/bindings/v8_private_property.h')
 
         includes.add('platform/bindings/v8_object_constructor.h')
@@ -476,6 +477,8 @@ def interface_context(interface, interfaces):
             sorted(origin_trial_features(interface, context['constants'], context['attributes'], context['methods']) +
                    context_enabled_features(context['attributes'])),
     })
+    if context['optional_features']:
+        includes.add('platform/bindings/v8_per_context_data.h')
 
     # Cross-origin interceptors
     has_cross_origin_named_getter = False

third_party/blink/renderer/bindings/scripts/v8_methods.py

@@ -178,6 +178,10 @@ def method_context(interface, method, is_visible=True):
     else:
         side_effect_type = 'V8DOMConfiguration::kHasSideEffect'
 
+    # [LogActivity]
+    if 'LogActivity' in extended_attributes:
+        includes.add('platform/bindings/v8_per_context_data.h')
+
     argument_contexts = [
         argument_context(interface, method, argument, index, is_visible=is_visible)
         for index, argument in enumerate(arguments)]

third_party/blink/renderer/bindings/tests/results/core/origin_trial_features_for_core.cc

@@ -19,6 +19,7 @@
 #include "third_party/blink/renderer/core/origin_trials/origin_trials.h"
 #include "third_party/blink/renderer/platform/bindings/origin_trial_features.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 
 namespace blink {
 

third_party/blink/renderer/bindings/tests/results/core/v8_test_constants.cc

@@ -20,6 +20,7 @@
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/bindings/v8_object_constructor.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/wtf/get_ptr.h"
 

third_party/blink/renderer/bindings/tests/results/core/v8_test_interface_constructor.cc

@@ -24,6 +24,7 @@
 #include "third_party/blink/renderer/platform/bindings/exception_messages.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/bindings/v8_object_constructor.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/bindings/v8_private_property.h"
 #include "third_party/blink/renderer/platform/wtf/get_ptr.h"
 

third_party/blink/renderer/bindings/tests/results/core/v8_test_interface_event_target.cc

@@ -18,6 +18,7 @@
 #include "third_party/blink/renderer/platform/bindings/exception_messages.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/bindings/v8_object_constructor.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/bindings/v8_private_property.h"
 #include "third_party/blink/renderer/platform/wtf/get_ptr.h"
 

third_party/blink/renderer/bindings/tests/results/core/v8_test_interface_named_constructor.cc

@@ -21,6 +21,7 @@
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/bindings/runtime_call_stats.h"
 #include "third_party/blink/renderer/platform/bindings/v8_object_constructor.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/bindings/v8_private_property.h"
 #include "third_party/blink/renderer/platform/wtf/get_ptr.h"
 

third_party/blink/renderer/bindings/tests/results/core/v8_test_interface_named_constructor_2.cc

@@ -19,6 +19,7 @@
 #include "third_party/blink/renderer/platform/bindings/exception_messages.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/bindings/v8_object_constructor.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/bindings/v8_private_property.h"
 #include "third_party/blink/renderer/platform/wtf/get_ptr.h"
 

third_party/blink/renderer/bindings/tests/results/core/v8_test_legacy_callback_interface.h

@@ -15,6 +15,7 @@
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/platform/bindings/callback_interface_base.h"
 #include "third_party/blink/renderer/platform/bindings/dom_wrapper_world.h"
+#include "third_party/blink/renderer/platform/bindings/wrapper_type_info.h"
 
 namespace blink {
 

third_party/blink/renderer/bindings/tests/results/core/v8_test_object.cc

@@ -74,6 +74,7 @@
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/bindings/v8_dom_activity_logger.h"
 #include "third_party/blink/renderer/platform/bindings/v8_object_constructor.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/bindings/v8_private_property.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/wtf/get_ptr.h"

third_party/blink/renderer/bindings/tests/results/modules/origin_trial_features_for_modules.cc

@@ -19,6 +19,7 @@
 #include "third_party/blink/renderer/core/origin_trials/origin_trials.h"
 #include "third_party/blink/renderer/platform/bindings/origin_trial_features.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 
 namespace blink {
 

third_party/blink/renderer/bindings/tests/results/modules/v8_test_interface_partial.cc

@@ -28,6 +28,7 @@
 #include "third_party/blink/renderer/platform/bindings/runtime_call_stats.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/bindings/v8_object_constructor.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/wtf/get_ptr.h"
 

third_party/blink/renderer/core/frame/report.h

@@ -6,6 +6,7 @@
 #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORT_H_
 
 #include "third_party/blink/renderer/core/frame/report_body.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 
 namespace blink {
 

third_party/blink/renderer/core/testing/v8/web_core_test_support.cc

@@ -36,6 +36,7 @@
 #include "third_party/blink/renderer/core/testing/worker_internals.h"
 #include "third_party/blink/renderer/platform/bindings/dom_wrapper_world.h"
 #include "third_party/blink/renderer/platform/bindings/origin_trial_features.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 
 namespace WebCoreTestSupport {
 

third_party/blink/renderer/platform/bindings/dom_wrapper_world.h

@@ -39,6 +39,7 @@
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/weborigin/security_origin.h"
+#include "third_party/blink/renderer/platform/wtf/hash_set.h"
 #include "third_party/blink/renderer/platform/wtf/ref_counted.h"
 #include "v8/include/v8.h"
 
@@ -46,6 +47,7 @@ namespace blink {
 
 class DOMDataStore;
 class DOMObjectHolderBase;
+class ScriptWrappable;
 
 // This class represent a collection of DOM wrappers for a specific world. This
 // is identified by a world id that is a per-thread global identifier (see

third_party/blink/renderer/platform/bindings/script_state.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 
 #include "third_party/blink/renderer/platform/bindings/v8_binding.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/instance_counters.h"
 
 namespace blink {

third_party/blink/renderer/platform/bindings/script_state.h

@@ -7,8 +7,9 @@
 
 #include <memory>
 
+#include "gin/public/context_holder.h"
+#include "gin/public/gin_embedders.h"
 #include "third_party/blink/renderer/platform/bindings/scoped_persistent.h"
-#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/wtf/ref_counted.h"
 #include "v8/include/v8.h"
@@ -17,6 +18,7 @@ namespace blink {
 
 class DOMWrapperWorld;
 class ScriptValue;
+class V8PerContextData;
 
 // ScriptState is an abstraction class that holds all information about script
 // exectuion (e.g., v8::Isolate, v8::Context, DOMWrapperWorld, ExecutionContext
@@ -163,6 +165,10 @@ class PLATFORM_EXPORT ScriptState : public RefCounted<ScriptState> {
   // disposePerContextData() once you no longer need V8PerContextData.
   // Otherwise, the v8::Context will leak.
   std::unique_ptr<V8PerContextData> per_context_data_;
+
+  static constexpr int kV8ContextPerContextDataIndex = static_cast<int>(
+      gin::kPerContextDataStartIndex +  // NOLINT(readability/enum_casing)
+      gin::kEmbedderBlink);             // NOLINT(readability/enum_casing)
 };
 
 // ScriptStateProtectingContext keeps the context associated with the

third_party/blink/renderer/platform/bindings/v8_dom_activity_logger.cc

@@ -6,6 +6,7 @@
 
 #include <memory>
 #include "third_party/blink/renderer/platform/bindings/v8_binding.h"
+#include "third_party/blink/renderer/platform/bindings/v8_per_context_data.h"
 #include "third_party/blink/renderer/platform/weborigin/kurl.h"
 #include "third_party/blink/renderer/platform/wtf/hash_map.h"
 #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"

third_party/blink/renderer/platform/bindings/v8_per_context_data.h

@@ -53,12 +53,6 @@ namespace blink {
 class V8DOMActivityLogger;
 class V8PerContextData;
 
-enum V8ContextEmbedderDataField {
-  kV8ContextPerContextDataIndex = static_cast<int>(
-      gin::kPerContextDataStartIndex +  // NOLINT(readability/enum_casing)
-      gin::kEmbedderBlink),             // NOLINT(readability/enum_casing)
-};
-
 // Used to hold data that is associated with a single v8::Context object, and
 // has a 1:1 relationship with v8::Context.
 class PLATFORM_EXPORT V8PerContextData final {

third_party/blink/renderer/platform/bindings/v8_per_isolate_data.h

@@ -36,6 +36,7 @@
 #include "third_party/blink/renderer/platform/bindings/scoped_persistent.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable_marking_visitor.h"
+#include "third_party/blink/renderer/platform/bindings/v8_global_value_map.h"
 #include "third_party/blink/renderer/platform/bindings/wrapper_type_info.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "third_party/blink/renderer/platform/platform_export.h"