Commit c53673df authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

Apply snake_case to generated StyleBuilder*.*

This CL has no behavior changes.

Bug: 770603
Change-Id: I3d8a6c2813b360ca5497f9d8bc31e8e6e2c6caf0
Reviewed-on: https://chromium-review.googlesource.com/961166
Commit-Queue: Kent Tamura <tkent@chromium.org>
Reviewed-by: default avatarHitoshi Yoshida <peria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542998}
parent 7cdd4d6c
...@@ -69,10 +69,10 @@ class StyleBuilderWriter(json5_generator.Writer): ...@@ -69,10 +69,10 @@ class StyleBuilderWriter(json5_generator.Writer):
def __init__(self, json5_file_paths): def __init__(self, json5_file_paths):
super(StyleBuilderWriter, self).__init__([]) super(StyleBuilderWriter, self).__init__([])
self._outputs = { self._outputs = {
'StyleBuilderFunctions.h': self.generate_style_builder_functions_h, 'style_builder_functions.h': self.generate_style_builder_functions_h,
'StyleBuilderFunctions.cpp': 'style_builder_functions.cc':
self.generate_style_builder_functions_cpp, self.generate_style_builder_functions_cpp,
'StyleBuilder.cpp': self.generate_style_builder, 'style_builder.cc': self.generate_style_builder,
} }
self._json5_properties = css_properties.CSSProperties(json5_file_paths) self._json5_properties = css_properties.CSSProperties(json5_file_paths)
...@@ -86,7 +86,7 @@ class StyleBuilderWriter(json5_generator.Writer): ...@@ -86,7 +86,7 @@ class StyleBuilderWriter(json5_generator.Writer):
def css_properties(self): def css_properties(self):
return self._json5_properties return self._json5_properties
@template_expander.use_jinja('templates/StyleBuilderFunctions.h.tmpl', @template_expander.use_jinja('templates/style_builder_functions.h.tmpl',
filters=filters) filters=filters)
def generate_style_builder_functions_h(self): def generate_style_builder_functions_h(self):
return { return {
...@@ -94,7 +94,7 @@ class StyleBuilderWriter(json5_generator.Writer): ...@@ -94,7 +94,7 @@ class StyleBuilderWriter(json5_generator.Writer):
'properties': self._properties, 'properties': self._properties,
} }
@template_expander.use_jinja('templates/StyleBuilderFunctions.cpp.tmpl', @template_expander.use_jinja('templates/style_builder_functions.cc.tmpl',
filters=filters) filters=filters)
def generate_style_builder_functions_cpp(self): def generate_style_builder_functions_cpp(self):
return { return {
...@@ -104,7 +104,7 @@ class StyleBuilderWriter(json5_generator.Writer): ...@@ -104,7 +104,7 @@ class StyleBuilderWriter(json5_generator.Writer):
} }
@template_expander.use_jinja( @template_expander.use_jinja(
'templates/StyleBuilder.cpp.tmpl', filters=filters) 'templates/style_builder.cc.tmpl', filters=filters)
def generate_style_builder(self): def generate_style_builder(self):
return { return {
'input_files': self._input_files, 'input_files': self._input_files,
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
#include "core/css/resolver/StyleBuilder.h" #include "core/css/resolver/StyleBuilder.h"
#include "StyleBuilderFunctions.h"
#include "core/css/CSSPropertyValue.h" #include "core/css/CSSPropertyValue.h"
#include "core/css/properties/Longhand.h" #include "core/css/properties/Longhand.h"
#include "core/css/resolver/StyleResolverState.h" #include "core/css/resolver/StyleResolverState.h"
#include "core/style/ComputedStyle.h" #include "core/style/ComputedStyle.h"
#include "core/style_builder_functions.h"
namespace blink { namespace blink {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
{{source_files_for_generated_file(template_file, input_files)}} {{source_files_for_generated_file(template_file, input_files)}}
#include "StyleBuilderFunctions.h" #include "core/style_builder_functions.h"
#include "core/animation/css/CSSAnimationData.h" #include "core/animation/css/CSSAnimationData.h"
#include "core/css/BasicShapeFunctions.h" #include "core/css/BasicShapeFunctions.h"
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
{{source_files_for_generated_file(template_file, input_files)}} {{source_files_for_generated_file(template_file, input_files)}}
#ifndef StyleBuilderFunctions_h #ifndef BLINK_CORE_STYLE_BUILDER_FUNCTIONS_H_
#define StyleBuilderFunctions_h #define BLINK_CORE_STYLE_BUILDER_FUNCTIONS_H_
#include "core/css/resolver/StyleBuilderConverter.h" #include "core/css/resolver/StyleBuilderConverter.h"
...@@ -32,4 +32,4 @@ class StyleBuilderFunctions { ...@@ -32,4 +32,4 @@ class StyleBuilderFunctions {
} // namespace blink } // namespace blink
#endif #endif // BLINK_CORE_STYLE_BUILDER_FUNCTIONS_H_
...@@ -1152,14 +1152,14 @@ css_properties("make_core_generated_style_property_shorthand") { ...@@ -1152,14 +1152,14 @@ css_properties("make_core_generated_style_property_shorthand") {
css_properties("make_core_generated_style_builder") { css_properties("make_core_generated_style_builder") {
script = "../build/scripts/make_style_builder.py" script = "../build/scripts/make_style_builder.py"
other_inputs = [ other_inputs = [
"../build/scripts/templates/StyleBuilder.cpp.tmpl", "../build/scripts/templates/style_builder.cc.tmpl",
"../build/scripts/templates/StyleBuilderFunctions.cpp.tmpl", "../build/scripts/templates/style_builder_functions.cc.tmpl",
"../build/scripts/templates/StyleBuilderFunctions.h.tmpl", "../build/scripts/templates/style_builder_functions.h.tmpl",
] ]
outputs = [ outputs = [
"$blink_core_output_dir/StyleBuilder.cpp", "$blink_core_output_dir/style_builder.cc",
"$blink_core_output_dir/StyleBuilderFunctions.h", "$blink_core_output_dir/style_builder_functions.h",
"$blink_core_output_dir/StyleBuilderFunctions.cpp", "$blink_core_output_dir/style_builder_functions.cc",
] ]
} }
......
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
// succinctly describe how to apply properties. When default handlers are // succinctly describe how to apply properties. When default handlers are
// not sufficient, we should prefer to use converter, and failing that // not sufficient, we should prefer to use converter, and failing that
// define custom property handlers in StyleBuilderCustom.cpp. We only should // define custom property handlers in StyleBuilderCustom.cpp. We only should
// use StyleBuilderFunctions.cpp.tmpl to define handlers when there are // use style_builder_functions.cc.tmpl to define handlers when there are
// multiple properties requiring the same handling, but converter doesn't // multiple properties requiring the same handling, but converter doesn't
// suffice. // suffice.
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include "core/css/resolver/CSSVariableResolver.h" #include "core/css/resolver/CSSVariableResolver.h"
#include "core/StyleBuilderFunctions.h"
#include "core/css/CSSCustomPropertyDeclaration.h" #include "core/css/CSSCustomPropertyDeclaration.h"
#include "core/css/CSSPendingSubstitutionValue.h" #include "core/css/CSSPendingSubstitutionValue.h"
#include "core/css/CSSUnsetValue.h" #include "core/css/CSSUnsetValue.h"
...@@ -24,6 +23,7 @@ ...@@ -24,6 +23,7 @@
#include "core/style/ComputedStyle.h" #include "core/style/ComputedStyle.h"
#include "core/style/StyleInheritedVariables.h" #include "core/style/StyleInheritedVariables.h"
#include "core/style/StyleNonInheritedVariables.h" #include "core/style/StyleNonInheritedVariables.h"
#include "core/style_builder_functions.h"
#include "core/style_property_shorthand.h" #include "core/style_property_shorthand.h"
#include "platform/wtf/Vector.h" #include "platform/wtf/Vector.h"
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include "core/StyleBuilderFunctions.h"
#include "core/animation/css/CSSAnimations.h" #include "core/animation/css/CSSAnimations.h"
#include "core/css/CSSCounterValue.h" #include "core/css/CSSCounterValue.h"
#include "core/css/CSSCursorImageValue.h" #include "core/css/CSSCursorImageValue.h"
...@@ -78,6 +77,7 @@ ...@@ -78,6 +77,7 @@
#include "core/style/StyleGeneratedImage.h" #include "core/style/StyleGeneratedImage.h"
#include "core/style/StyleInheritedVariables.h" #include "core/style/StyleInheritedVariables.h"
#include "core/style/StyleNonInheritedVariables.h" #include "core/style/StyleNonInheritedVariables.h"
#include "core/style_builder_functions.h"
#include "core/style_property_shorthand.h" #include "core/style_property_shorthand.h"
#include "platform/fonts/FontDescription.h" #include "platform/fonts/FontDescription.h"
#include "platform/wtf/MathExtras.h" #include "platform/wtf/MathExtras.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment