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

Qualify #includes in element-related generated source files.

This CL fixes #includes and/or include guards of the following
generated files:
 - html_element_factory.cc
 - html_element_factory.h
 - html_element_lookup_trie.cc
 - html_element_lookup_trie.h
 - html_element_type_helpers.cc
 - html_element_type_helpers.h
 - svg_element_factory.cc
 - svg_element_factory.h
 - svg_element_type_helpers.cc
 - svg_element_type_helpers.h

Bug: 836071
Change-Id: Ie9cd4e4c937262f32e64c574903be4580281f3b1
Reviewed-on: https://chromium-review.googlesource.com/1038924
Commit-Queue: Kent Tamura <tkent@chromium.org>
Reviewed-by: default avatarHitoshi Yoshida <peria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555304}
parent b6efea56
...@@ -120,7 +120,7 @@ class MakeElementFactoryWriter(MakeQualifiedNamesWriter): ...@@ -120,7 +120,7 @@ class MakeElementFactoryWriter(MakeQualifiedNamesWriter):
def _interface_header_dir(self, tag): def _interface_header_dir(self, tag):
if tag['interfaceHeaderDir']: if tag['interfaceHeaderDir']:
return tag['interfaceHeaderDir'] return tag['interfaceHeaderDir']
return 'core/' + self.namespace.lower() return 'third_party/blink/renderer/core/' + self.namespace.lower()
if __name__ == "__main__": if __name__ == "__main__":
......
...@@ -56,7 +56,8 @@ class MakeElementTypeHelpersWriter(json5_generator.Writer): ...@@ -56,7 +56,8 @@ class MakeElementTypeHelpersWriter(json5_generator.Writer):
(basename + '.cc'): self.generate_helper_implementation, (basename + '.cc'): self.generate_helper_implementation,
} }
base_element_header = 'core/%s/%s_element.h' % (self.namespace.lower(), self.namespace.lower()) base_element_header = 'third_party/blink/renderer/core/' \
'{0}/{0}_element.h'.format(self.namespace.lower())
self._template_context = { self._template_context = {
'base_element_header': base_element_header, 'base_element_header': base_element_header,
'input_files': self._input_files, 'input_files': self._input_files,
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
{{source_files_for_generated_file(template_file, input_files)}} {{source_files_for_generated_file(template_file, input_files)}}
#include "core/{{namespace|lower}}_element_factory.h" #include "third_party/blink/renderer/core/{{namespace|lower}}_element_factory.h"
#include "core/{{namespace|lower}}_names.h" #include "third_party/blink/renderer/core/{{namespace|lower}}_names.h"
{% for header in tags|groupby('interface_header') %} {% for header in tags|groupby('interface_header') %}
#include "{{header[0]}}" #include "{{header[0]}}"
{% endfor %} {% endfor %}
{% if fallback_interface %} {% if fallback_interface %}
#include "core/{{namespace|lower}}/{{fallback_interface_header}}" #include "third_party/blink/renderer/core/{{namespace|lower}}/{{fallback_interface_header}}"
{% endif %} {% endif %}
#include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
#include "third_party/blink/renderer/platform/wtf/hash_map.h" #include "third_party/blink/renderer/platform/wtf/hash_map.h"
...@@ -71,4 +71,4 @@ static void create{{namespace}}FunctionMap() { ...@@ -71,4 +71,4 @@ static void create{{namespace}}FunctionMap() {
return nullptr; return nullptr;
} }
} // namespace blink } // namespace blink
...@@ -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 BLINK_CORE_{{namespace|upper}}_ELEMENT_FACTORY_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_{{namespace|upper}}_ELEMENT_FACTORY_H_
#define BLINK_CORE_{{namespace|upper}}_ELEMENT_FACTORY_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_{{namespace|upper}}_ELEMENT_FACTORY_H_
#include "third_party/blink/renderer/core/dom/create_element_flags.h" #include "third_party/blink/renderer/core/dom/create_element_flags.h"
#include "third_party/blink/renderer/platform/wtf/forward.h" #include "third_party/blink/renderer/platform/wtf/forward.h"
...@@ -23,6 +23,6 @@ class {{namespace}}ElementFactory { ...@@ -23,6 +23,6 @@ class {{namespace}}ElementFactory {
const CreateElementFlags flags); const CreateElementFlags flags);
}; };
} // namespace blink } // namespace blink
#endif #endif // THIRD_PARTY_BLINK_RENDERER_CORE_{{namespace|upper}}_ELEMENT_FACTORY_H_
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
{{source_files_for_generated_file(template_file, input_files)}} {{source_files_for_generated_file(template_file, input_files)}}
#include "core/{{namespace|lower}}_element_lookup_trie.h" #include "third_party/blink/renderer/core/{{namespace|lower}}_element_lookup_trie.h"
#include "core/{{namespace|lower}}_names.h" #include "third_party/blink/renderer/core/{{namespace|lower}}_names.h"
namespace blink { namespace blink {
...@@ -21,4 +21,4 @@ const AtomicString& lookup{{namespace}}Tag(const UChar* data, unsigned length) { ...@@ -21,4 +21,4 @@ const AtomicString& lookup{{namespace}}Tag(const UChar* data, unsigned length) {
return g_null_atom; return g_null_atom;
} }
} // namespace blink } // namespace blink
...@@ -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 BLINK_CORE_{{namespace|upper}}_ELEMENT_LOOKUP_TRIE_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_{{namespace|upper}}_ELEMENT_LOOKUP_TRIE_H_
#define BLINK_CORE_{{namespace|upper}}_ELEMENT_LOOKUP_TRIE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_{{namespace|upper}}_ELEMENT_LOOKUP_TRIE_H_
#include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/platform/wtf/text/atomic_string.h" #include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
...@@ -13,6 +13,6 @@ namespace blink { ...@@ -13,6 +13,6 @@ namespace blink {
CORE_EXPORT const AtomicString& lookup{{namespace}}Tag(const UChar* data, unsigned length); CORE_EXPORT const AtomicString& lookup{{namespace}}Tag(const UChar* data, unsigned length);
} // namespace blink } // namespace blink
#endif #endif // THIRD_PARTY_BLINK_RENDERER_CORE_{{namespace|upper}}_ELEMENT_LOOKUP_TRIE_H_
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{{source_files_for_generated_file(template_file, input_files)}} {{source_files_for_generated_file(template_file, input_files)}}
#include "core/{{namespace|lower}}_element_type_helpers.h" #include "third_party/blink/renderer/core/{{namespace|lower}}_element_type_helpers.h"
#include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/dom/document.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
...@@ -49,4 +49,4 @@ HTMLElementType htmlElementTypeForTag(const AtomicString& tagName) { ...@@ -49,4 +49,4 @@ HTMLElementType htmlElementTypeForTag(const AtomicString& tagName) {
return it->value; return it->value;
} }
{% endif %} {% endif %}
} // namespace blink } // namespace blink
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
{{source_files_for_generated_file(template_file, input_files)}} {{source_files_for_generated_file(template_file, input_files)}}
#ifndef BLINK_CORE_{{namespace|upper}}_ELEMENT_TYPE_HELPERS_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_{{namespace|upper}}_ELEMENT_TYPE_HELPERS_H_
#define BLINK_CORE_{{namespace|upper}}_ELEMENT_TYPE_HELPERS_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_{{namespace|upper}}_ELEMENT_TYPE_HELPERS_H_
#include "{{base_element_header}}" #include "{{base_element_header}}"
#include "core/{{namespace|lower}}_names.h" #include "third_party/blink/renderer/core/{{namespace|lower}}_names.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
namespace blink { namespace blink {
...@@ -69,6 +69,6 @@ enum class HTMLElementType { ...@@ -69,6 +69,6 @@ enum class HTMLElementType {
HTMLElementType htmlElementTypeForTag(const AtomicString& tagName); HTMLElementType htmlElementTypeForTag(const AtomicString& tagName);
{% endif %} {% endif %}
} // namespace blink } // namespace blink
#endif #endif // THIRD_PARTY_BLINK_RENDERER_CORE_{{namespace|upper}}_ELEMENT_TYPE_HELPERS_H_
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
}, },
{ {
name: "audio", name: "audio",
interfaceHeaderDir: "core/html/media", interfaceHeaderDir: "third_party/blink/renderer/core/html/media",
}, },
{ {
name: "b", name: "b",
...@@ -78,11 +78,11 @@ ...@@ -78,11 +78,11 @@
}, },
{ {
name: "button", name: "button",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "canvas", name: "canvas",
interfaceHeaderDir: "core/html/canvas", interfaceHeaderDir: "third_party/blink/renderer/core/html/canvas",
}, },
{ {
name: "caption", name: "caption",
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
{ {
name: "datalist", name: "datalist",
interfaceName: "HTMLDataListElement", interfaceName: "HTMLDataListElement",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "dd", name: "dd",
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
{ {
name: "fieldset", name: "fieldset",
interfaceName: "HTMLFieldSetElement", interfaceName: "HTMLFieldSetElement",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "figcaption", name: "figcaption",
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
}, },
{ {
name: "form", name: "form",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
"frame", "frame",
{ {
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
{ {
name: "input", name: "input",
constructorNeedsCreateElementFlags: true, constructorNeedsCreateElementFlags: true,
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "ins", name: "ins",
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
}, },
{ {
name: "label", name: "label",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "layer", name: "layer",
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
}, },
{ {
name: "legend", name: "legend",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "li", name: "li",
...@@ -331,15 +331,15 @@ ...@@ -331,15 +331,15 @@
{ {
name: "optgroup", name: "optgroup",
interfaceName: "HTMLOptGroupElement", interfaceName: "HTMLOptGroupElement",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "option", name: "option",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "output", name: "output",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "shadow", name: "shadow",
...@@ -407,8 +407,8 @@ ...@@ -407,8 +407,8 @@
}, },
{ {
name: "select", name: "select",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "slot", name: "slot",
interfaceName: "HTMLSlotElement", interfaceName: "HTMLSlotElement",
...@@ -457,7 +457,7 @@ ...@@ -457,7 +457,7 @@
{ {
name: "textarea", name: "textarea",
interfaceName: "HTMLTextAreaElement", interfaceName: "HTMLTextAreaElement",
interfaceHeaderDir: "core/html/forms", interfaceHeaderDir: "third_party/blink/renderer/core/html/forms",
}, },
{ {
name: "tfoot", name: "tfoot",
...@@ -482,7 +482,7 @@ ...@@ -482,7 +482,7 @@
}, },
{ {
name: "track", name: "track",
interfaceHeaderDir: "core/html/track", interfaceHeaderDir: "third_party/blink/renderer/core/html/track",
}, },
{ {
name: "tt", name: "tt",
...@@ -502,7 +502,7 @@ ...@@ -502,7 +502,7 @@
}, },
{ {
name: "video", name: "video",
interfaceHeaderDir: "core/html/media", interfaceHeaderDir: "third_party/blink/renderer/core/html/media",
}, },
{ {
name: "wbr", name: "wbr",
......
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