From 55b5bc485d07a361b2ea8f1f51d57b51b4dcd0aa Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Wed, 19 Nov 2014 12:33:42 -0800 Subject: [PATCH] Sort headers Fix (most) generated includes to have gen/ in their path. This makes it easier to tell where files exist on disk. Unfortunately I had to leave the old include path in engine/BUILD.gn to support all the v8 includes which were too many to deal with in this patch. It's a little nasty to have the raw build directory in our include path, but it produces nicer paths. R=abarth@chromium.org --- engine/BUILD.gn | 3 ++- engine/bindings/core/v8/ScriptDebugServer.h | 2 +- engine/bindings/core/v8/WindowProxy.cpp | 2 +- .../v8/custom/V8CSSStyleDeclarationCustom.cpp | 2 +- .../core/v8/custom/V8CustomEventCustom.cpp | 2 +- .../bindings/core/v8/custom/V8ElementCustom.cpp | 2 +- .../core/v8/custom/V8ErrorEventCustom.cpp | 2 +- engine/bindings/core/v8/custom/V8EventCustom.cpp | 4 ++-- .../core/v8/custom/V8EventTargetCustom.cpp | 2 +- .../templates/CSSPropertyMetadata.cpp.tmpl | 2 +- .../scripts/templates/ElementFactory.cpp.tmpl | 2 +- .../scripts/templates/ElementTypeHelpers.h.tmpl | 2 +- .../templates/ElementWrapperFactory.cpp.tmpl | 2 +- .../scripts/templates/EventFactory.cpp.tmpl | 2 +- .../templates/RuntimeEnabledFeatures.cpp.tmpl | 2 +- .../templates/StylePropertyShorthand.cpp.tmpl | 2 +- engine/core/BUILD.gn | 2 +- engine/core/Init.cpp | 16 ++++++++-------- engine/core/animation/AnimationEffect.h | 2 +- engine/core/animation/DocumentAnimations.h | 2 +- engine/core/animation/ElementAnimation.h | 2 +- engine/core/animation/Keyframe.h | 2 +- engine/core/animation/KeyframeEffectModel.cpp | 2 +- engine/core/animation/StyleInterpolation.h | 2 +- .../animation/animatable/AnimatableUnknown.h | 2 +- .../animation/css/CSSAnimatableValueFactory.cpp | 2 +- .../animation/css/CSSAnimatableValueFactory.h | 2 +- engine/core/animation/css/CSSAnimations.cpp | 2 +- engine/core/animation/css/CSSPropertyEquality.h | 2 +- engine/core/animation/css/CSSTransitionData.h | 2 +- engine/core/app/Application.cpp | 2 +- engine/core/app/Module.cpp | 2 +- engine/core/css/CSSComputedStyleDeclaration.cpp | 8 ++++---- engine/core/css/CSSFontFaceSrcValue.cpp | 2 +- engine/core/css/CSSFontSelector.cpp | 2 +- engine/core/css/CSSGradientValue.cpp | 2 +- engine/core/css/CSSImageSetValue.cpp | 2 +- engine/core/css/CSSImageValue.cpp | 2 +- engine/core/css/CSSMatrix.cpp | 4 ++-- engine/core/css/CSSPrimitiveValue.h | 4 ++-- engine/core/css/CSSPrimitiveValueMappings.h | 2 +- engine/core/css/CSSProperty.cpp | 2 +- engine/core/css/CSSProperty.h | 4 ++-- engine/core/css/CSSPropertyMetadata.h | 2 +- engine/core/css/CSSSegmentedFontFace.cpp | 2 +- engine/core/css/CSSSelector.cpp | 2 +- engine/core/css/CSSStyleDeclaration.h | 2 +- engine/core/css/CSSValuePool.h | 4 ++-- engine/core/css/FontFace.cpp | 4 ++-- engine/core/css/FontFace.h | 2 +- engine/core/css/FontFaceCache.cpp | 2 +- engine/core/css/FontSize.cpp | 2 +- engine/core/css/FontSize.h | 2 +- engine/core/css/MediaList.cpp | 2 +- engine/core/css/MediaQuery.cpp | 2 +- engine/core/css/MediaQueryEvaluator.cpp | 10 +++++----- engine/core/css/MediaQueryEvaluatorTest.cpp | 2 +- engine/core/css/MediaQueryExp.cpp | 2 +- engine/core/css/MediaQueryExp.h | 4 ++-- engine/core/css/MediaQueryMatcherTest.cpp | 2 +- .../core/css/PropertySetCSSStyleDeclaration.cpp | 4 ++-- engine/core/css/RuleSet.cpp | 2 +- engine/core/css/StylePropertySerializer.cpp | 4 ++-- engine/core/css/StylePropertySet.cpp | 4 ++-- engine/core/css/StylePropertySet.h | 2 +- engine/core/css/StylePropertyShorthandCustom.cpp | 2 +- engine/core/css/parser/BisonCSSParser-in.cpp | 6 +++--- engine/core/css/parser/BisonCSSParser.h | 4 ++-- engine/core/css/parser/CSSParserValues.h | 2 +- engine/core/css/parser/CSSPropertyParser.cpp | 6 +++--- engine/core/css/parser/CSSPropertyParser.h | 4 ++-- engine/core/css/parser/CSSTokenizer-in.cpp | 2 +- engine/core/css/parser/MediaQueryParser.cpp | 2 +- engine/core/css/parser/SizesCalcParserTest.cpp | 2 +- engine/core/css/resolver/AnimatedStyleBuilder.h | 2 +- engine/core/css/resolver/CSSToStyleMap.cpp | 2 +- engine/core/css/resolver/CSSToStyleMap.h | 2 +- engine/core/css/resolver/ElementStyleResources.h | 2 +- engine/core/css/resolver/FontBuilder.h | 2 +- engine/core/css/resolver/SharedStyleFinder.cpp | 2 +- engine/core/css/resolver/StyleBuilder.h | 2 +- engine/core/css/resolver/StyleBuilderCustom.cpp | 8 ++++---- engine/core/css/resolver/StyleResolver.cpp | 8 ++++---- engine/core/css/resolver/StyleResolverState.h | 2 +- engine/core/css/resolver/StyleResourceLoader.cpp | 2 +- engine/core/dom/Document.cpp | 4 ++-- engine/core/dom/DocumentInit.cpp | 2 +- engine/core/dom/DocumentStyleSheetCollection.cpp | 2 +- engine/core/dom/Element.cpp | 6 +++--- engine/core/dom/Element.h | 4 ++-- engine/core/dom/Node.cpp | 2 +- engine/core/dom/TreeScope.cpp | 2 +- .../custom/CustomElementRegistrationContext.cpp | 2 +- engine/core/editing/ApplyBlockElementCommand.cpp | 2 +- engine/core/editing/CompositeEditCommand.h | 2 +- engine/core/editing/EditingStyle.cpp | 2 +- engine/core/editing/EditingStyle.h | 4 ++-- engine/core/editing/Editor.cpp | 4 ++-- engine/core/editing/EditorCommand.cpp | 4 ++-- .../editing/InsertParagraphSeparatorCommand.cpp | 2 +- engine/core/editing/MarkupAccumulator.cpp | 2 +- engine/core/editing/ReplaceSelectionCommand.cpp | 4 ++-- engine/core/editing/SplitElementCommand.cpp | 2 +- engine/core/editing/VisibleUnits.cpp | 2 +- engine/core/editing/htmlediting.cpp | 2 +- engine/core/editing/markup.cpp | 6 +++--- engine/core/events/Event.cpp | 4 ++-- engine/core/events/EventPath.cpp | 2 +- engine/core/events/EventTarget.cpp | 2 +- engine/core/events/ThreadLocalEventNames.h | 10 +++++----- engine/core/fetch/ImageResource.cpp | 2 +- engine/core/fetch/Resource.cpp | 2 +- engine/core/fetch/ResourceFetcher.cpp | 4 ++-- engine/core/frame/FrameView.cpp | 2 +- engine/core/frame/FrameView.h | 2 +- engine/core/frame/LocalDOMWindow.cpp | 2 +- engine/core/frame/LocalFrame.cpp | 2 +- engine/core/frame/Settings.cpp | 2 +- engine/core/frame/Settings.h | 2 +- engine/core/frame/UseCounter.h | 2 +- engine/core/html/ClassList.h | 2 +- engine/core/html/HTMLAnchorElement.h | 2 +- engine/core/html/HTMLCanvasElement.cpp | 4 ++-- engine/core/html/HTMLContentElement.cpp | 4 ++-- engine/core/html/HTMLElement.cpp | 2 +- engine/core/html/HTMLElement.h | 2 +- engine/core/html/HTMLIFrameElement.cpp | 2 +- engine/core/html/HTMLIFrameElement.h | 2 +- engine/core/html/HTMLImageElement.cpp | 8 ++++---- engine/core/html/HTMLImportElement.cpp | 2 +- engine/core/html/HTMLStyleElement.cpp | 2 +- engine/core/html/HTMLTitleElement.cpp | 2 +- engine/core/html/ImageData.cpp | 2 +- .../html/canvas/CanvasRenderingContext2D.cpp | 2 +- engine/core/html/canvas/CanvasStyle.cpp | 2 +- .../html/canvas/WebGLRenderingContextBase.cpp | 2 +- engine/core/html/parser/AtomicHTMLToken.h | 2 +- engine/core/html/parser/HTMLConstructionSite.cpp | 2 +- engine/core/html/parser/HTMLDocumentParser.cpp | 2 +- engine/core/html/parser/HTMLParserIdioms.cpp | 2 +- engine/core/html/parser/HTMLSrcsetParser.cpp | 2 +- engine/core/html/parser/HTMLTokenizer.cpp | 2 +- engine/core/html/parser/HTMLTreeBuilder.cpp | 2 +- engine/core/inspector/ContentSearchUtils.h | 2 +- engine/core/inspector/InjectedScript.h | 2 +- engine/core/inspector/InjectedScriptBase.h | 2 +- engine/core/inspector/InspectorBaseAgent.h | 2 +- engine/core/inspector/InspectorDebuggerAgent.h | 2 +- engine/core/inspector/ScriptCallFrame.h | 2 +- engine/core/inspector/ScriptCallStack.h | 2 +- engine/core/inspector/inspector_backend_mojo.cc | 2 +- engine/core/page/EventHandler.cpp | 4 ++-- engine/core/rendering/HitTestResult.cpp | 2 +- engine/core/rendering/InlineFlowBox.cpp | 2 +- engine/core/rendering/InlineTextBox.cpp | 2 +- engine/core/rendering/RenderImage.cpp | 2 +- engine/core/rendering/RenderLayer.cpp | 4 ++-- engine/core/rendering/RenderObject.cpp | 2 +- engine/core/rendering/RenderReplaced.cpp | 2 +- engine/core/rendering/RenderTheme.cpp | 4 ++-- engine/core/rendering/RenderView.cpp | 2 +- .../compositing/CompositedLayerMapping.cpp | 2 +- .../compositing/CompositingReasonFinder.cpp | 2 +- .../compositing/RenderLayerCompositor.cpp | 2 +- engine/core/rendering/style/KeyframeList.h | 2 +- engine/core/rendering/style/RenderStyle.cpp | 2 +- engine/core/rendering/style/RenderStyle.h | 2 +- .../core/rendering/style/StyleWillChangeData.h | 4 ++-- engine/platform/BUILD.gn | 4 ++-- engine/platform/fonts/Font.cpp | 2 +- engine/platform/fonts/FontCache.cpp | 4 ++-- engine/platform/fonts/FontDescription.cpp | 2 +- engine/platform/fonts/FontDescription.h | 2 +- engine/platform/fonts/FontFallbackList.cpp | 2 +- .../platform/fonts/harfbuzz/HarfBuzzShaper.cpp | 2 +- .../fonts/linux/FontPlatformDataLinux.cpp | 2 +- .../fonts/opentype/OpenTypeSanitizer.cpp | 2 +- engine/platform/graphics/gpu/DrawingBuffer.cpp | 2 +- .../platform/graphics/gpu/DrawingBufferTest.cpp | 2 +- engine/web/ChromeClientImpl.cpp | 2 +- engine/web/FrameLoaderClientImpl.cpp | 2 +- engine/web/Sky.cpp | 2 +- engine/web/WebRuntimeFeatures.cpp | 2 +- engine/web/WebViewImpl.cpp | 6 +++--- 184 files changed, 250 insertions(+), 249 deletions(-) diff --git a/engine/BUILD.gn b/engine/BUILD.gn index 33eb367ec10..f782fd6681e 100644 --- a/engine/BUILD.gn +++ b/engine/BUILD.gn @@ -32,7 +32,8 @@ config("inside_blink") { config("config") { include_dirs = [ ".", - "$root_gen_dir/sky", + "$root_build_dir", + "$root_gen_dir/sky", # Deprecated, remove. ] cflags = [] diff --git a/engine/bindings/core/v8/ScriptDebugServer.h b/engine/bindings/core/v8/ScriptDebugServer.h index 9b02a4b5695..d2eaae985e0 100644 --- a/engine/bindings/core/v8/ScriptDebugServer.h +++ b/engine/bindings/core/v8/ScriptDebugServer.h @@ -32,10 +32,10 @@ #define ScriptDebugServer_h #include "bindings/core/v8/ScopedPersistent.h" -#include "core/InspectorBackendDispatcher.h" #include "core/inspector/ScriptBreakpoint.h" #include "core/inspector/ScriptCallStack.h" #include "core/inspector/ScriptDebugListener.h" +#include "gen/sky/core/InspectorBackendDispatcher.h" #include "v8/include/v8-debug.h" #include "v8/include/v8.h" #include "wtf/HashMap.h" diff --git a/engine/bindings/core/v8/WindowProxy.cpp b/engine/bindings/core/v8/WindowProxy.cpp index 49dcf3d269d..a3f504664fc 100644 --- a/engine/bindings/core/v8/WindowProxy.cpp +++ b/engine/bindings/core/v8/WindowProxy.cpp @@ -47,7 +47,7 @@ #include "core/frame/LocalFrame.h" #include "core/loader/FrameLoaderClient.h" #include "platform/heap/Handle.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/ScriptForbiddenScope.h" #include "platform/TraceEvent.h" #include "public/platform/Platform.h" diff --git a/engine/bindings/core/v8/custom/V8CSSStyleDeclarationCustom.cpp b/engine/bindings/core/v8/custom/V8CSSStyleDeclarationCustom.cpp index 4ba8a2b785e..c51491e143e 100644 --- a/engine/bindings/core/v8/custom/V8CSSStyleDeclarationCustom.cpp +++ b/engine/bindings/core/v8/custom/V8CSSStyleDeclarationCustom.cpp @@ -33,7 +33,7 @@ #include "bindings/core/v8/ExceptionState.h" #include "bindings/core/v8/V8Binding.h" -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "core/css/CSSPrimitiveValue.h" #include "core/css/CSSPropertyMetadata.h" #include "core/css/CSSStyleDeclaration.h" diff --git a/engine/bindings/core/v8/custom/V8CustomEventCustom.cpp b/engine/bindings/core/v8/custom/V8CustomEventCustom.cpp index 1c2faea4871..d4a5f4c0373 100644 --- a/engine/bindings/core/v8/custom/V8CustomEventCustom.cpp +++ b/engine/bindings/core/v8/custom/V8CustomEventCustom.cpp @@ -37,7 +37,7 @@ #include "bindings/core/v8/V8DOMWrapper.h" #include "bindings/core/v8/V8Event.h" #include "bindings/core/v8/V8HiddenValue.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/bindings/core/v8/custom/V8ElementCustom.cpp b/engine/bindings/core/v8/custom/V8ElementCustom.cpp index 1d1b7aacb24..91f00f97768 100644 --- a/engine/bindings/core/v8/custom/V8ElementCustom.cpp +++ b/engine/bindings/core/v8/custom/V8ElementCustom.cpp @@ -40,7 +40,7 @@ #include "core/animation/ElementAnimation.h" #include "core/dom/Element.h" #include "core/frame/UseCounter.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/GetPtr.h" namespace blink { diff --git a/engine/bindings/core/v8/custom/V8ErrorEventCustom.cpp b/engine/bindings/core/v8/custom/V8ErrorEventCustom.cpp index c6a5353482c..8268cf82faa 100644 --- a/engine/bindings/core/v8/custom/V8ErrorEventCustom.cpp +++ b/engine/bindings/core/v8/custom/V8ErrorEventCustom.cpp @@ -38,7 +38,7 @@ #include "bindings/core/v8/V8DOMWrapper.h" #include "bindings/core/v8/V8Event.h" #include "bindings/core/v8/V8HiddenValue.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/bindings/core/v8/custom/V8EventCustom.cpp b/engine/bindings/core/v8/custom/V8EventCustom.cpp index a002e45e181..7956d9c481e 100644 --- a/engine/bindings/core/v8/custom/V8EventCustom.cpp +++ b/engine/bindings/core/v8/custom/V8EventCustom.cpp @@ -32,8 +32,8 @@ #include "bindings/core/v8/V8Event.h" #include "bindings/core/v8/V8Binding.h" -#include "core/EventHeaders.h" -#include "core/EventInterfaces.h" +#include "gen/sky/core/EventHeaders.h" +#include "gen/sky/core/EventInterfaces.h" #include "core/events/Event.h" namespace blink { diff --git a/engine/bindings/core/v8/custom/V8EventTargetCustom.cpp b/engine/bindings/core/v8/custom/V8EventTargetCustom.cpp index 6ecc4ed59e6..cdd0d1a9ee5 100644 --- a/engine/bindings/core/v8/custom/V8EventTargetCustom.cpp +++ b/engine/bindings/core/v8/custom/V8EventTargetCustom.cpp @@ -32,7 +32,7 @@ #include "bindings/core/v8/V8EventTarget.h" #include "core/EventTargetHeaders.h" -#include "core/EventTargetInterfaces.h" +#include "gen/sky/core/EventTargetInterfaces.h" namespace blink { diff --git a/engine/build/scripts/templates/CSSPropertyMetadata.cpp.tmpl b/engine/build/scripts/templates/CSSPropertyMetadata.cpp.tmpl index 50c2650c173..1b28c1daffc 100644 --- a/engine/build/scripts/templates/CSSPropertyMetadata.cpp.tmpl +++ b/engine/build/scripts/templates/CSSPropertyMetadata.cpp.tmpl @@ -4,7 +4,7 @@ #include "config.h" #include "core/css/CSSPropertyMetadata.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/BitArray.h" namespace blink { diff --git a/engine/build/scripts/templates/ElementFactory.cpp.tmpl b/engine/build/scripts/templates/ElementFactory.cpp.tmpl index e9b531954c2..a351ec9ce46 100644 --- a/engine/build/scripts/templates/ElementFactory.cpp.tmpl +++ b/engine/build/scripts/templates/ElementFactory.cpp.tmpl @@ -15,7 +15,7 @@ #include "core/dom/custom/CustomElementRegistrationContext.h" #include "core/dom/Document.h" #include "core/frame/Settings.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/HashMap.h" namespace blink { diff --git a/engine/build/scripts/templates/ElementTypeHelpers.h.tmpl b/engine/build/scripts/templates/ElementTypeHelpers.h.tmpl index 124db3446e3..37f4f1603fc 100644 --- a/engine/build/scripts/templates/ElementTypeHelpers.h.tmpl +++ b/engine/build/scripts/templates/ElementTypeHelpers.h.tmpl @@ -6,7 +6,7 @@ #include "core/dom/Element.h" #include "{{namespace}}Names.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { // Type checking. diff --git a/engine/build/scripts/templates/ElementWrapperFactory.cpp.tmpl b/engine/build/scripts/templates/ElementWrapperFactory.cpp.tmpl index 746c64085c0..af27108c428 100644 --- a/engine/build/scripts/templates/ElementWrapperFactory.cpp.tmpl +++ b/engine/build/scripts/templates/ElementWrapperFactory.cpp.tmpl @@ -15,7 +15,7 @@ #include "core/{{namespace|lower}}/{{fallback_js_interface}}.h" #include "core/dom/Document.h" #include "core/frame/Settings.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/StdLibExtras.h" namespace blink { diff --git a/engine/build/scripts/templates/EventFactory.cpp.tmpl b/engine/build/scripts/templates/EventFactory.cpp.tmpl index f1b9c78b617..c10a71df67b 100644 --- a/engine/build/scripts/templates/EventFactory.cpp.tmpl +++ b/engine/build/scripts/templates/EventFactory.cpp.tmpl @@ -5,7 +5,7 @@ #include "core/events/{{namespace}}Factory.h" #include "{{namespace}}{{suffix}}Headers.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl b/engine/build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl index 82592188d06..cc6f0278f87 100644 --- a/engine/build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl +++ b/engine/build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl @@ -2,7 +2,7 @@ {{license()}} #include "config.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/build/scripts/templates/StylePropertyShorthand.cpp.tmpl b/engine/build/scripts/templates/StylePropertyShorthand.cpp.tmpl index 0056ab95eb5..3bef05a1c22 100644 --- a/engine/build/scripts/templates/StylePropertyShorthand.cpp.tmpl +++ b/engine/build/scripts/templates/StylePropertyShorthand.cpp.tmpl @@ -21,7 +21,7 @@ #include "config.h" #include "StylePropertyShorthand.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/HashMap.h" #include "wtf/StdLibExtras.h" diff --git a/engine/core/BUILD.gn b/engine/core/BUILD.gn index e525aceff24..c10809f461b 100644 --- a/engine/core/BUILD.gn +++ b/engine/core/BUILD.gn @@ -132,7 +132,7 @@ source_set("core_generated") { ] include_dirs = [ - "$root_gen_dir/sky", + "$root_build_dir", ] } diff --git a/engine/core/Init.cpp b/engine/core/Init.cpp index 82a7a4753de..2959f86de32 100644 --- a/engine/core/Init.cpp +++ b/engine/core/Init.cpp @@ -31,18 +31,18 @@ #include "config.h" #include "Init.h" -#include "core/EventNames.h" -#include "core/EventTargetNames.h" -#include "core/EventTypeNames.h" -#include "core/FetchInitiatorTypeNames.h" -#include "core/HTMLNames.h" -#include "core/MediaFeatureNames.h" -#include "core/MediaTypeNames.h" +#include "gen/sky/core/EventNames.h" +#include "gen/sky/core/EventTargetNames.h" +#include "gen/sky/core/EventTypeNames.h" +#include "gen/sky/core/FetchInitiatorTypeNames.h" +#include "gen/sky/core/HTMLNames.h" +#include "gen/sky/core/MediaFeatureNames.h" +#include "gen/sky/core/MediaTypeNames.h" #include "core/dom/Document.h" #include "core/events/EventFactory.h" #include "core/html/parser/HTMLParserThread.h" #include "platform/EventTracer.h" -#include "platform/FontFamilyNames.h" +#include "gen/sky/platform/FontFamilyNames.h" #include "platform/Partitions.h" #include "platform/PlatformThreadData.h" #include "wtf/text/StringStatics.h" diff --git a/engine/core/animation/AnimationEffect.h b/engine/core/animation/AnimationEffect.h index bfe4d6a0028..94b80c670ec 100644 --- a/engine/core/animation/AnimationEffect.h +++ b/engine/core/animation/AnimationEffect.h @@ -32,7 +32,7 @@ #define AnimationEffect_h #include "bindings/core/v8/ScriptWrappable.h" -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "platform/heap/Handle.h" #include "wtf/HashMap.h" #include "wtf/PassOwnPtr.h" diff --git a/engine/core/animation/DocumentAnimations.h b/engine/core/animation/DocumentAnimations.h index adf66fbb975..c1979ab14de 100644 --- a/engine/core/animation/DocumentAnimations.h +++ b/engine/core/animation/DocumentAnimations.h @@ -31,7 +31,7 @@ #ifndef DocumentAnimations_h #define DocumentAnimations_h -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" namespace blink { diff --git a/engine/core/animation/ElementAnimation.h b/engine/core/animation/ElementAnimation.h index 4d5091784de..e755f5a791f 100644 --- a/engine/core/animation/ElementAnimation.h +++ b/engine/core/animation/ElementAnimation.h @@ -38,7 +38,7 @@ #include "core/animation/TimingInput.h" #include "core/dom/Document.h" #include "core/dom/Element.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/core/animation/Keyframe.h b/engine/core/animation/Keyframe.h index b54f4a32d81..b58e44a8fc5 100644 --- a/engine/core/animation/Keyframe.h +++ b/engine/core/animation/Keyframe.h @@ -5,10 +5,10 @@ #ifndef Keyframe_h #define Keyframe_h -#include "core/CSSPropertyNames.h" #include "core/animation/AnimationEffect.h" #include "core/animation/AnimationNode.h" #include "core/animation/animatable/AnimatableValue.h" +#include "gen/sky/core/CSSPropertyNames.h" namespace blink { diff --git a/engine/core/animation/KeyframeEffectModel.cpp b/engine/core/animation/KeyframeEffectModel.cpp index 42d67f06ab6..c488278dc5c 100644 --- a/engine/core/animation/KeyframeEffectModel.cpp +++ b/engine/core/animation/KeyframeEffectModel.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "core/animation/KeyframeEffectModel.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/StylePropertyShorthand.h" #include "core/animation/AnimationNode.h" #include "platform/geometry/FloatBox.h" #include "platform/transforms/TransformationMatrix.h" diff --git a/engine/core/animation/StyleInterpolation.h b/engine/core/animation/StyleInterpolation.h index d3c61238bea..91e83d596aa 100644 --- a/engine/core/animation/StyleInterpolation.h +++ b/engine/core/animation/StyleInterpolation.h @@ -5,8 +5,8 @@ #ifndef StyleInterpolation_h #define StyleInterpolation_h -#include "core/CSSPropertyNames.h" #include "core/animation/Interpolation.h" +#include "gen/sky/core/CSSPropertyNames.h" namespace blink { diff --git a/engine/core/animation/animatable/AnimatableUnknown.h b/engine/core/animation/animatable/AnimatableUnknown.h index 5df64ba37e1..66433ef97d1 100644 --- a/engine/core/animation/animatable/AnimatableUnknown.h +++ b/engine/core/animation/animatable/AnimatableUnknown.h @@ -31,9 +31,9 @@ #ifndef AnimatableUnknown_h #define AnimatableUnknown_h -#include "core/CSSValueKeywords.h" #include "core/animation/animatable/AnimatableValue.h" #include "core/css/CSSValuePool.h" +#include "gen/sky/core/CSSValueKeywords.h" namespace blink { diff --git a/engine/core/animation/css/CSSAnimatableValueFactory.cpp b/engine/core/animation/css/CSSAnimatableValueFactory.cpp index 91fa062d322..86c5fdd9e83 100644 --- a/engine/core/animation/css/CSSAnimatableValueFactory.cpp +++ b/engine/core/animation/css/CSSAnimatableValueFactory.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "core/animation/css/CSSAnimatableValueFactory.h" -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "core/animation/animatable/AnimatableClipPathOperation.h" #include "core/animation/animatable/AnimatableColor.h" #include "core/animation/animatable/AnimatableDouble.h" diff --git a/engine/core/animation/css/CSSAnimatableValueFactory.h b/engine/core/animation/css/CSSAnimatableValueFactory.h index 0d03e2f97d5..5112b44c118 100644 --- a/engine/core/animation/css/CSSAnimatableValueFactory.h +++ b/engine/core/animation/css/CSSAnimatableValueFactory.h @@ -31,8 +31,8 @@ #ifndef CSSAnimatableValueFactory_h #define CSSAnimatableValueFactory_h -#include "core/CSSPropertyNames.h" #include "core/animation/animatable/AnimatableValue.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "wtf/PassRefPtr.h" namespace blink { diff --git a/engine/core/animation/css/CSSAnimations.cpp b/engine/core/animation/css/CSSAnimations.cpp index 497c0b7b1b1..7232e0134a0 100644 --- a/engine/core/animation/css/CSSAnimations.cpp +++ b/engine/core/animation/css/CSSAnimations.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "core/animation/css/CSSAnimations.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/StylePropertyShorthand.h" #include "core/animation/ActiveAnimations.h" #include "core/animation/AnimationTimeline.h" #include "core/animation/CompositorAnimations.h" diff --git a/engine/core/animation/css/CSSPropertyEquality.h b/engine/core/animation/css/CSSPropertyEquality.h index 6cf1d214e12..1f7e9c751d7 100644 --- a/engine/core/animation/css/CSSPropertyEquality.h +++ b/engine/core/animation/css/CSSPropertyEquality.h @@ -5,7 +5,7 @@ #ifndef CSSPropertyEquality_h #define CSSPropertyEquality_h -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" namespace blink { diff --git a/engine/core/animation/css/CSSTransitionData.h b/engine/core/animation/css/CSSTransitionData.h index 801e2f77aa4..ae7e55e55da 100644 --- a/engine/core/animation/css/CSSTransitionData.h +++ b/engine/core/animation/css/CSSTransitionData.h @@ -5,8 +5,8 @@ #ifndef CSSTransitionData_h #define CSSTransitionData_h -#include "core/CSSPropertyNames.h" #include "core/animation/css/CSSTimingData.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "wtf/Vector.h" namespace blink { diff --git a/engine/core/app/Application.cpp b/engine/core/app/Application.cpp index 87edb7701c3..ff617b62dcf 100644 --- a/engine/core/app/Application.cpp +++ b/engine/core/app/Application.cpp @@ -5,7 +5,7 @@ #include "config.h" #include "core/app/Application.h" -#include "core/EventTargetNames.h" +#include "gen/sky/core/EventTargetNames.h" namespace blink { diff --git a/engine/core/app/Module.cpp b/engine/core/app/Module.cpp index cafec0edd17..d8c0b0fee8b 100644 --- a/engine/core/app/Module.cpp +++ b/engine/core/app/Module.cpp @@ -6,7 +6,7 @@ #include "core/app/Module.h" #include "core/app/Application.h" -#include "core/EventTargetNames.h" +#include "gen/sky/core/EventTargetNames.h" namespace blink { diff --git a/engine/core/css/CSSComputedStyleDeclaration.cpp b/engine/core/css/CSSComputedStyleDeclaration.cpp index ec1160cb041..af31f0ee62e 100644 --- a/engine/core/css/CSSComputedStyleDeclaration.cpp +++ b/engine/core/css/CSSComputedStyleDeclaration.cpp @@ -25,8 +25,8 @@ #include "core/css/CSSComputedStyleDeclaration.h" #include "bindings/core/v8/ExceptionState.h" -#include "core/CSSPropertyNames.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/StylePropertyShorthand.h" #include "core/animation/DocumentAnimations.h" #include "core/css/BasicShapeFunctions.h" #include "core/css/CSSAspectRatioValue.h" @@ -56,8 +56,8 @@ #include "core/rendering/style/RenderStyle.h" #include "core/rendering/style/ShadowList.h" #include "core/rendering/style/ShapeValue.h" -#include "platform/FontFamilyNames.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/FontFamilyNames.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/FontFeatureSettings.h" #include "wtf/text/StringBuilder.h" diff --git a/engine/core/css/CSSFontFaceSrcValue.cpp b/engine/core/css/CSSFontFaceSrcValue.cpp index 3184c1a5e50..4d16733dd56 100644 --- a/engine/core/css/CSSFontFaceSrcValue.cpp +++ b/engine/core/css/CSSFontFaceSrcValue.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "core/css/CSSFontFaceSrcValue.h" -#include "core/FetchInitiatorTypeNames.h" +#include "gen/sky/core/FetchInitiatorTypeNames.h" #include "core/css/StyleSheetContents.h" #include "core/dom/Document.h" #include "core/dom/Node.h" diff --git a/engine/core/css/CSSFontSelector.cpp b/engine/core/css/CSSFontSelector.cpp index 8a181630b47..a3875cd6464 100644 --- a/engine/core/css/CSSFontSelector.cpp +++ b/engine/core/css/CSSFontSelector.cpp @@ -35,7 +35,7 @@ #include "core/dom/Document.h" #include "core/frame/LocalFrame.h" #include "core/frame/Settings.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/FontCache.h" #include "platform/fonts/SimpleFontData.h" #include "wtf/text/AtomicString.h" diff --git a/engine/core/css/CSSGradientValue.cpp b/engine/core/css/CSSGradientValue.cpp index c1d06f2d074..9d87c970211 100644 --- a/engine/core/css/CSSGradientValue.cpp +++ b/engine/core/css/CSSGradientValue.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "core/css/CSSGradientValue.h" -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "core/css/CSSCalculationValue.h" #include "core/css/CSSToLengthConversionData.h" #include "core/css/Pair.h" diff --git a/engine/core/css/CSSImageSetValue.cpp b/engine/core/css/CSSImageSetValue.cpp index 1d060c345bd..6bc927d0fd4 100644 --- a/engine/core/css/CSSImageSetValue.cpp +++ b/engine/core/css/CSSImageSetValue.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "core/css/CSSImageSetValue.h" -#include "core/FetchInitiatorTypeNames.h" +#include "gen/sky/core/FetchInitiatorTypeNames.h" #include "core/css/CSSImageValue.h" #include "core/css/CSSPrimitiveValue.h" #include "core/dom/Document.h" diff --git a/engine/core/css/CSSImageValue.cpp b/engine/core/css/CSSImageValue.cpp index 374f0324a20..48cbcf471b1 100644 --- a/engine/core/css/CSSImageValue.cpp +++ b/engine/core/css/CSSImageValue.cpp @@ -21,7 +21,7 @@ #include "config.h" #include "core/css/CSSImageValue.h" -#include "core/FetchInitiatorTypeNames.h" +#include "gen/sky/core/FetchInitiatorTypeNames.h" #include "core/css/CSSMarkup.h" #include "core/dom/Document.h" #include "core/fetch/FetchRequest.h" diff --git a/engine/core/css/CSSMatrix.cpp b/engine/core/css/CSSMatrix.cpp index 8949a174654..822d6d2e691 100644 --- a/engine/core/css/CSSMatrix.cpp +++ b/engine/core/css/CSSMatrix.cpp @@ -27,8 +27,8 @@ #include "core/css/CSSMatrix.h" #include "bindings/core/v8/ExceptionState.h" -#include "core/CSSPropertyNames.h" -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "core/css/parser/BisonCSSParser.h" #include "core/css/CSSToLengthConversionData.h" #include "core/css/StylePropertySet.h" diff --git a/engine/core/css/CSSPrimitiveValue.h b/engine/core/css/CSSPrimitiveValue.h index e58bae8320e..cbbec746924 100644 --- a/engine/core/css/CSSPrimitiveValue.h +++ b/engine/core/css/CSSPrimitiveValue.h @@ -22,9 +22,9 @@ #ifndef CSSPrimitiveValue_h #define CSSPrimitiveValue_h -#include "core/CSSPropertyNames.h" -#include "core/CSSValueKeywords.h" #include "core/css/CSSValue.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "platform/graphics/Color.h" #include "wtf/Forward.h" #include "wtf/MathExtras.h" diff --git a/engine/core/css/CSSPrimitiveValueMappings.h b/engine/core/css/CSSPrimitiveValueMappings.h index 1a086ba0d47..187f35193f9 100644 --- a/engine/core/css/CSSPrimitiveValueMappings.h +++ b/engine/core/css/CSSPrimitiveValueMappings.h @@ -30,13 +30,13 @@ #ifndef CSSPrimitiveValueMappings_h #define CSSPrimitiveValueMappings_h -#include "core/CSSValueKeywords.h" #include "core/css/CSSCalculationValue.h" #include "core/css/CSSPrimitiveValue.h" #include "core/css/CSSPrimitiveValueMappings.h" #include "core/css/CSSToLengthConversionData.h" #include "core/rendering/style/LineClampValue.h" #include "core/rendering/style/RenderStyleConstants.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "platform/Length.h" #include "platform/fonts/FontDescription.h" #include "platform/fonts/FontSmoothingMode.h" diff --git a/engine/core/css/CSSProperty.cpp b/engine/core/css/CSSProperty.cpp index bd790e0114b..31637de20ac 100644 --- a/engine/core/css/CSSProperty.cpp +++ b/engine/core/css/CSSProperty.cpp @@ -21,7 +21,7 @@ #include "config.h" #include "core/css/CSSProperty.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/StylePropertyShorthand.h" #include "core/css/CSSValueList.h" #include "core/rendering/style/RenderStyleConstants.h" diff --git a/engine/core/css/CSSProperty.h b/engine/core/css/CSSProperty.h index 93f3e89785a..ff2d53c9aad 100644 --- a/engine/core/css/CSSProperty.h +++ b/engine/core/css/CSSProperty.h @@ -21,10 +21,10 @@ #ifndef CSSProperty_h #define CSSProperty_h -#include "core/CSSPropertyNames.h" #include "core/css/CSSPropertyMetadata.h" #include "core/css/CSSValue.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/text/TextDirection.h" #include "wtf/PassRefPtr.h" #include "wtf/RefPtr.h" diff --git a/engine/core/css/CSSPropertyMetadata.h b/engine/core/css/CSSPropertyMetadata.h index 044c4d8a30d..5a00dcbdcba 100644 --- a/engine/core/css/CSSPropertyMetadata.h +++ b/engine/core/css/CSSPropertyMetadata.h @@ -5,7 +5,7 @@ #ifndef CSSPropertyMetadata_h #define CSSPropertyMetadata_h -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" namespace blink { diff --git a/engine/core/css/CSSSegmentedFontFace.cpp b/engine/core/css/CSSSegmentedFontFace.cpp index 59b957023c5..47d877a6b29 100644 --- a/engine/core/css/CSSSegmentedFontFace.cpp +++ b/engine/core/css/CSSSegmentedFontFace.cpp @@ -28,7 +28,7 @@ #include "core/css/CSSFontFace.h" #include "core/css/CSSFontSelector.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/FontCache.h" #include "platform/fonts/FontDescription.h" #include "platform/fonts/FontFaceCreationParams.h" diff --git a/engine/core/css/CSSSelector.cpp b/engine/core/css/CSSSelector.cpp index 400067d7bf2..33042c634c5 100644 --- a/engine/core/css/CSSSelector.cpp +++ b/engine/core/css/CSSSelector.cpp @@ -28,7 +28,7 @@ #include "core/css/CSSOMUtils.h" #include "core/css/CSSSelectorList.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/Assertions.h" #include "wtf/HashMap.h" #include "wtf/StdLibExtras.h" diff --git a/engine/core/css/CSSStyleDeclaration.h b/engine/core/css/CSSStyleDeclaration.h index afb11ae35f5..49d6902c87c 100644 --- a/engine/core/css/CSSStyleDeclaration.h +++ b/engine/core/css/CSSStyleDeclaration.h @@ -22,7 +22,7 @@ #define CSSStyleDeclaration_h #include "bindings/core/v8/ScriptWrappable.h" -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "wtf/Forward.h" #include "wtf/Noncopyable.h" diff --git a/engine/core/css/CSSValuePool.h b/engine/core/css/CSSValuePool.h index fb0000fc23f..e23f902d0c3 100644 --- a/engine/core/css/CSSValuePool.h +++ b/engine/core/css/CSSValuePool.h @@ -26,11 +26,11 @@ #ifndef CSSValuePool_h #define CSSValuePool_h -#include "core/CSSPropertyNames.h" -#include "core/CSSValueKeywords.h" #include "core/css/CSSInheritedValue.h" #include "core/css/CSSInitialValue.h" #include "core/css/CSSPrimitiveValue.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "wtf/HashMap.h" #include "wtf/RefPtr.h" #include "wtf/text/AtomicStringHash.h" diff --git a/engine/core/css/FontFace.cpp b/engine/core/css/FontFace.cpp index fed494e1ccb..b92c476de21 100644 --- a/engine/core/css/FontFace.cpp +++ b/engine/core/css/FontFace.cpp @@ -34,7 +34,7 @@ #include "bindings/core/v8/Dictionary.h" #include "bindings/core/v8/ExceptionState.h" #include "bindings/core/v8/ScriptState.h" -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "core/css/BinaryDataFontFaceSource.h" #include "core/css/CSSFontFace.h" #include "core/css/CSSFontFaceSrcValue.h" @@ -53,7 +53,7 @@ #include "core/dom/StyleEngine.h" #include "core/frame/LocalFrame.h" #include "core/frame/Settings.h" -#include "platform/FontFamilyNames.h" +#include "gen/sky/platform/FontFamilyNames.h" #include "platform/SharedBuffer.h" #include "wtf/ArrayBufferView.h" diff --git a/engine/core/css/FontFace.h b/engine/core/css/FontFace.h index 5f6cf873f59..2ce4683044e 100644 --- a/engine/core/css/FontFace.h +++ b/engine/core/css/FontFace.h @@ -34,9 +34,9 @@ #include "bindings/core/v8/ScriptPromise.h" #include "bindings/core/v8/ScriptPromiseProperty.h" #include "bindings/core/v8/ScriptWrappable.h" -#include "core/CSSPropertyNames.h" #include "core/css/CSSValue.h" #include "core/dom/DOMException.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "platform/fonts/FontTraits.h" #include "wtf/PassRefPtr.h" #include "wtf/RefCounted.h" diff --git a/engine/core/css/FontFaceCache.cpp b/engine/core/css/FontFaceCache.cpp index 01969418fe0..7185d3dec53 100644 --- a/engine/core/css/FontFaceCache.cpp +++ b/engine/core/css/FontFaceCache.cpp @@ -35,7 +35,7 @@ #include "core/css/StyleRule.h" #include "core/fetch/FontResource.h" #include "core/fetch/ResourceFetcher.h" -#include "platform/FontFamilyNames.h" +#include "gen/sky/platform/FontFamilyNames.h" #include "platform/fonts/FontDescription.h" #include "wtf/text/AtomicString.h" diff --git a/engine/core/css/FontSize.cpp b/engine/core/css/FontSize.cpp index 9bfedd64c7a..1f827802518 100644 --- a/engine/core/css/FontSize.cpp +++ b/engine/core/css/FontSize.cpp @@ -29,7 +29,7 @@ #include "config.h" #include "core/css/FontSize.h" -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "core/dom/Document.h" #include "core/frame/Settings.h" diff --git a/engine/core/css/FontSize.h b/engine/core/css/FontSize.h index 32200c99ee0..bee68e7bf08 100644 --- a/engine/core/css/FontSize.h +++ b/engine/core/css/FontSize.h @@ -22,7 +22,7 @@ #ifndef FontSize_h #define FontSize_h -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "platform/fonts/FixedPitchFontType.h" namespace blink { diff --git a/engine/core/css/MediaList.cpp b/engine/core/css/MediaList.cpp index 460e0c15849..71b487a585c 100644 --- a/engine/core/css/MediaList.cpp +++ b/engine/core/css/MediaList.cpp @@ -21,7 +21,7 @@ #include "core/css/MediaList.h" #include "bindings/core/v8/ExceptionState.h" -#include "core/MediaFeatureNames.h" +#include "gen/sky/core/MediaFeatureNames.h" #include "core/css/parser/BisonCSSParser.h" #include "core/css/CSSStyleSheet.h" #include "core/css/MediaQuery.h" diff --git a/engine/core/css/MediaQuery.cpp b/engine/core/css/MediaQuery.cpp index 1999b34088f..2332d8513ab 100644 --- a/engine/core/css/MediaQuery.cpp +++ b/engine/core/css/MediaQuery.cpp @@ -29,7 +29,7 @@ #include "config.h" #include "core/css/MediaQuery.h" -#include "core/MediaTypeNames.h" +#include "gen/sky/core/MediaTypeNames.h" #include "core/css/MediaQueryExp.h" #include "core/html/parser/HTMLParserIdioms.h" #include "wtf/NonCopyingSort.h" diff --git a/engine/core/css/MediaQueryEvaluator.cpp b/engine/core/css/MediaQueryEvaluator.cpp index bd9b5b1b2bd..f52e5a45ad9 100644 --- a/engine/core/css/MediaQueryEvaluator.cpp +++ b/engine/core/css/MediaQueryEvaluator.cpp @@ -30,10 +30,10 @@ #include "config.h" #include "core/css/MediaQueryEvaluator.h" -#include "core/CSSValueKeywords.h" -#include "core/MediaFeatureNames.h" -#include "core/MediaFeatures.h" -#include "core/MediaTypeNames.h" +#include "gen/sky/core/CSSValueKeywords.h" +#include "gen/sky/core/MediaFeatureNames.h" +#include "gen/sky/core/MediaFeatures.h" +#include "gen/sky/core/MediaTypeNames.h" #include "core/css/CSSAspectRatioValue.h" #include "core/css/CSSHelper.h" #include "core/css/CSSPrimitiveValue.h" @@ -53,7 +53,7 @@ #include "core/rendering/compositing/RenderLayerCompositor.h" #include "core/rendering/style/RenderStyle.h" #include "platform/PlatformScreen.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/geometry/FloatRect.h" #include "wtf/HashMap.h" diff --git a/engine/core/css/MediaQueryEvaluatorTest.cpp b/engine/core/css/MediaQueryEvaluatorTest.cpp index 3702e9d8706..d06d13d014f 100644 --- a/engine/core/css/MediaQueryEvaluatorTest.cpp +++ b/engine/core/css/MediaQueryEvaluatorTest.cpp @@ -5,7 +5,7 @@ #include "config.h" #include "core/css/MediaQueryEvaluator.h" -#include "core/MediaTypeNames.h" +#include "gen/sky/core/MediaTypeNames.h" #include "core/css/MediaList.h" #include "core/css/MediaValuesCached.h" #include "core/frame/FrameView.h" diff --git a/engine/core/css/MediaQueryExp.cpp b/engine/core/css/MediaQueryExp.cpp index d874e172366..dd9b5b9b221 100644 --- a/engine/core/css/MediaQueryExp.cpp +++ b/engine/core/css/MediaQueryExp.cpp @@ -35,7 +35,7 @@ #include "core/css/parser/CSSParserValues.h" #include "core/html/parser/HTMLParserIdioms.h" #include "platform/Decimal.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/text/StringBuffer.h" #include "wtf/text/StringBuilder.h" diff --git a/engine/core/css/MediaQueryExp.h b/engine/core/css/MediaQueryExp.h index f9cb2634bc9..7de0017d7a1 100644 --- a/engine/core/css/MediaQueryExp.h +++ b/engine/core/css/MediaQueryExp.h @@ -29,10 +29,10 @@ #ifndef MediaQueryExp_h #define MediaQueryExp_h -#include "core/CSSValueKeywords.h" -#include "core/MediaFeatureNames.h" #include "core/css/CSSPrimitiveValue.h" #include "core/css/CSSValue.h" +#include "gen/sky/core/CSSValueKeywords.h" +#include "gen/sky/core/MediaFeatureNames.h" #include "wtf/PassOwnPtr.h" #include "wtf/RefPtr.h" diff --git a/engine/core/css/MediaQueryMatcherTest.cpp b/engine/core/css/MediaQueryMatcherTest.cpp index 37638c4f4e3..f2d5990f430 100644 --- a/engine/core/css/MediaQueryMatcherTest.cpp +++ b/engine/core/css/MediaQueryMatcherTest.cpp @@ -5,7 +5,7 @@ #include "config.h" #include "core/css/MediaQueryMatcher.h" -#include "core/MediaTypeNames.h" +#include "gen/sky/core/MediaTypeNames.h" #include "core/css/MediaList.h" #include "core/testing/DummyPageHolder.h" diff --git a/engine/core/css/PropertySetCSSStyleDeclaration.cpp b/engine/core/css/PropertySetCSSStyleDeclaration.cpp index f51a28627c5..130c837d84a 100644 --- a/engine/core/css/PropertySetCSSStyleDeclaration.cpp +++ b/engine/core/css/PropertySetCSSStyleDeclaration.cpp @@ -23,14 +23,14 @@ #include "core/css/PropertySetCSSStyleDeclaration.h" #include "bindings/core/v8/ExceptionState.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/css/parser/BisonCSSParser.h" #include "core/css/CSSStyleSheet.h" #include "core/css/StylePropertySet.h" #include "core/dom/Element.h" #include "core/dom/MutationObserverInterestGroup.h" #include "core/dom/MutationRecord.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/core/css/RuleSet.cpp b/engine/core/css/RuleSet.cpp index 904ae8613d9..8a2cc411328 100644 --- a/engine/core/css/RuleSet.cpp +++ b/engine/core/css/RuleSet.cpp @@ -34,7 +34,7 @@ #include "core/css/CSSSelectorList.h" #include "core/css/SelectorChecker.h" #include "core/css/StyleSheetContents.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/TraceEvent.h" #include "wtf/TerminatedArrayBuilder.h" diff --git a/engine/core/css/StylePropertySerializer.cpp b/engine/core/css/StylePropertySerializer.cpp index c43ab575895..86a97ad3f4b 100644 --- a/engine/core/css/StylePropertySerializer.cpp +++ b/engine/core/css/StylePropertySerializer.cpp @@ -23,8 +23,8 @@ #include "config.h" #include "core/css/StylePropertySerializer.h" -#include "core/CSSValueKeywords.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/CSSValueKeywords.h" +#include "gen/sky/core/StylePropertyShorthand.h" #include "core/css/CSSPropertyMetadata.h" #include "wtf/BitArray.h" #include "wtf/text/StringBuilder.h" diff --git a/engine/core/css/StylePropertySet.cpp b/engine/core/css/StylePropertySet.cpp index c03e2a310a2..ea87098ea2c 100644 --- a/engine/core/css/StylePropertySet.cpp +++ b/engine/core/css/StylePropertySet.cpp @@ -23,14 +23,14 @@ #include "config.h" #include "core/css/StylePropertySet.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/StylePropertyShorthand.h" #include "core/css/CSSPropertyMetadata.h" #include "core/css/CSSValuePool.h" #include "core/css/StylePropertySerializer.h" #include "core/css/StyleSheetContents.h" #include "core/css/parser/BisonCSSParser.h" #include "core/frame/UseCounter.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/text/StringBuilder.h" #ifndef NDEBUG diff --git a/engine/core/css/StylePropertySet.h b/engine/core/css/StylePropertySet.h index 17ae7f36b48..c4712105251 100644 --- a/engine/core/css/StylePropertySet.h +++ b/engine/core/css/StylePropertySet.h @@ -21,11 +21,11 @@ #ifndef StylePropertySet_h #define StylePropertySet_h -#include "core/CSSPropertyNames.h" #include "core/css/CSSPrimitiveValue.h" #include "core/css/CSSProperty.h" #include "core/css/PropertySetCSSStyleDeclaration.h" #include "core/css/parser/CSSParserMode.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "wtf/ListHashSet.h" #include "wtf/Vector.h" #include "wtf/text/WTFString.h" diff --git a/engine/core/css/StylePropertyShorthandCustom.cpp b/engine/core/css/StylePropertyShorthandCustom.cpp index 636bb5e9442..3dc100a57d1 100644 --- a/engine/core/css/StylePropertyShorthandCustom.cpp +++ b/engine/core/css/StylePropertyShorthandCustom.cpp @@ -20,7 +20,7 @@ */ #include "config.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/StylePropertyShorthand.h" namespace blink { diff --git a/engine/core/css/parser/BisonCSSParser-in.cpp b/engine/core/css/parser/BisonCSSParser-in.cpp index d7ca3da96e0..71cab115247 100644 --- a/engine/core/css/parser/BisonCSSParser-in.cpp +++ b/engine/core/css/parser/BisonCSSParser-in.cpp @@ -27,8 +27,8 @@ #include "config.h" #include "core/css/parser/BisonCSSParser.h" -#include "core/CSSValueKeywords.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/CSSValueKeywords.h" +#include "gen/sky/core/StylePropertyShorthand.h" #include "core/css/CSSAspectRatioValue.h" #include "core/css/CSSBasicShapes.h" #include "core/css/CSSBorderImage.h" @@ -75,7 +75,7 @@ #include "core/inspector/ConsoleMessage.h" #include "core/rendering/RenderTheme.h" #include "platform/FloatConversion.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/BitArray.h" #include "wtf/HexNumber.h" #include "wtf/text/StringBuffer.h" diff --git a/engine/core/css/parser/BisonCSSParser.h b/engine/core/css/parser/BisonCSSParser.h index 225a246f8fd..33193a5abf9 100644 --- a/engine/core/css/parser/BisonCSSParser.h +++ b/engine/core/css/parser/BisonCSSParser.h @@ -23,8 +23,6 @@ #ifndef BisonCSSParser_h #define BisonCSSParser_h -#include "core/CSSPropertyNames.h" -#include "core/CSSValueKeywords.h" #include "core/css/CSSCalculationValue.h" #include "core/css/CSSFilterValue.h" #include "core/css/CSSGradientValue.h" @@ -38,6 +36,8 @@ #include "core/css/parser/CSSParserValues.h" #include "core/css/parser/CSSPropertyParser.h" #include "core/css/parser/CSSTokenizer.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "platform/graphics/Color.h" #include "wtf/HashSet.h" #include "wtf/OwnPtr.h" diff --git a/engine/core/css/parser/CSSParserValues.h b/engine/core/css/parser/CSSParserValues.h index f08982dd586..dcccf960fbc 100644 --- a/engine/core/css/parser/CSSParserValues.h +++ b/engine/core/css/parser/CSSParserValues.h @@ -21,10 +21,10 @@ #ifndef CSSParserValues_h #define CSSParserValues_h -#include "core/CSSValueKeywords.h" #include "core/css/CSSPrimitiveValue.h" #include "core/css/CSSSelector.h" #include "core/css/CSSValueList.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "wtf/text/AtomicString.h" #include "wtf/text/WTFString.h" diff --git a/engine/core/css/parser/CSSPropertyParser.cpp b/engine/core/css/parser/CSSPropertyParser.cpp index 86b58ce8559..9fa52db839f 100644 --- a/engine/core/css/parser/CSSPropertyParser.cpp +++ b/engine/core/css/parser/CSSPropertyParser.cpp @@ -28,8 +28,8 @@ #include "core/css/parser/CSSPropertyParser.h" // FIXME: Way too many! -#include "core/CSSValueKeywords.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/CSSValueKeywords.h" +#include "gen/sky/core/StylePropertyShorthand.h" #include "core/css/CSSAspectRatioValue.h" #include "core/css/CSSBasicShapes.h" #include "core/css/CSSBorderImage.h" @@ -66,7 +66,7 @@ #include "core/frame/UseCounter.h" #include "core/html/parser/HTMLParserIdioms.h" #include "platform/FloatConversion.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/BitArray.h" #include "wtf/HexNumber.h" #include "wtf/text/StringBuffer.h" diff --git a/engine/core/css/parser/CSSPropertyParser.h b/engine/core/css/parser/CSSPropertyParser.h index 0580c519f20..1e6ca3a1d0e 100644 --- a/engine/core/css/parser/CSSPropertyParser.h +++ b/engine/core/css/parser/CSSPropertyParser.h @@ -24,8 +24,6 @@ #define CSSPropertyParser_h // FIXME: Way too many. -#include "core/CSSPropertyNames.h" -#include "core/CSSValueKeywords.h" #include "core/css/CSSCalculationValue.h" #include "core/css/CSSFilterValue.h" #include "core/css/CSSGradientValue.h" @@ -34,6 +32,8 @@ #include "core/css/CSSSelector.h" #include "core/css/parser/CSSParserMode.h" #include "core/css/parser/CSSParserValues.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "platform/graphics/Color.h" #include "wtf/OwnPtr.h" #include "wtf/Vector.h" diff --git a/engine/core/css/parser/CSSTokenizer-in.cpp b/engine/core/css/parser/CSSTokenizer-in.cpp index 9bac640a48a..f3371cb3413 100644 --- a/engine/core/css/parser/CSSTokenizer-in.cpp +++ b/engine/core/css/parser/CSSTokenizer-in.cpp @@ -36,7 +36,7 @@ namespace blink { -#include "core/CSSGrammar.h" +#include "gen/sky/core/CSSGrammar.h" enum CharacterType { // Types for the main switch. diff --git a/engine/core/css/parser/MediaQueryParser.cpp b/engine/core/css/parser/MediaQueryParser.cpp index fa5eb45615b..03d042362fc 100644 --- a/engine/core/css/parser/MediaQueryParser.cpp +++ b/engine/core/css/parser/MediaQueryParser.cpp @@ -5,7 +5,7 @@ #include "config.h" #include "core/css/parser/MediaQueryParser.h" -#include "core/MediaTypeNames.h" +#include "gen/sky/core/MediaTypeNames.h" #include "core/css/parser/CSSPropertyParser.h" #include "core/css/parser/MediaQueryTokenizer.h" #include "wtf/Vector.h" diff --git a/engine/core/css/parser/SizesCalcParserTest.cpp b/engine/core/css/parser/SizesCalcParserTest.cpp index a56335e4022..1e169c94b85 100644 --- a/engine/core/css/parser/SizesCalcParserTest.cpp +++ b/engine/core/css/parser/SizesCalcParserTest.cpp @@ -5,7 +5,7 @@ #include "config.h" #include "core/css/parser/SizesCalcParser.h" -#include "core/MediaTypeNames.h" +#include "gen/sky/core/MediaTypeNames.h" #include "core/css/CSSPrimitiveValue.h" #include "core/css/MediaValuesCached.h" #include "core/css/StylePropertySet.h" diff --git a/engine/core/css/resolver/AnimatedStyleBuilder.h b/engine/core/css/resolver/AnimatedStyleBuilder.h index ff3110e022a..56cdd11c692 100644 --- a/engine/core/css/resolver/AnimatedStyleBuilder.h +++ b/engine/core/css/resolver/AnimatedStyleBuilder.h @@ -31,7 +31,7 @@ #ifndef AnimatedStyleBuilder_h #define AnimatedStyleBuilder_h -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" namespace blink { diff --git a/engine/core/css/resolver/CSSToStyleMap.cpp b/engine/core/css/resolver/CSSToStyleMap.cpp index 7ad59086d5b..06afc23ae49 100644 --- a/engine/core/css/resolver/CSSToStyleMap.cpp +++ b/engine/core/css/resolver/CSSToStyleMap.cpp @@ -28,7 +28,7 @@ #include "config.h" #include "core/css/resolver/CSSToStyleMap.h" -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "core/animation/css/CSSAnimationData.h" #include "core/css/CSSBorderImageSliceValue.h" #include "core/css/CSSPrimitiveValue.h" diff --git a/engine/core/css/resolver/CSSToStyleMap.h b/engine/core/css/resolver/CSSToStyleMap.h index 4f7d8e07cc9..1182a646ed1 100644 --- a/engine/core/css/resolver/CSSToStyleMap.h +++ b/engine/core/css/resolver/CSSToStyleMap.h @@ -22,11 +22,11 @@ #ifndef CSSToStyleMap_h #define CSSToStyleMap_h -#include "core/CSSPropertyNames.h" #include "core/animation/Timing.h" #include "core/animation/css/CSSTransitionData.h" #include "core/css/resolver/ElementStyleResources.h" #include "core/rendering/style/RenderStyleConstants.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "platform/animation/TimingFunction.h" #include "wtf/Noncopyable.h" diff --git a/engine/core/css/resolver/ElementStyleResources.h b/engine/core/css/resolver/ElementStyleResources.h index 5e9ed43080b..d7a7bf2788e 100644 --- a/engine/core/css/resolver/ElementStyleResources.h +++ b/engine/core/css/resolver/ElementStyleResources.h @@ -23,7 +23,7 @@ #ifndef ElementStyleResources_h #define ElementStyleResources_h -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "platform/graphics/Color.h" #include "platform/heap/Handle.h" #include "wtf/HashMap.h" diff --git a/engine/core/css/resolver/FontBuilder.h b/engine/core/css/resolver/FontBuilder.h index 2389c971d09..83f85cb90ab 100644 --- a/engine/core/css/resolver/FontBuilder.h +++ b/engine/core/css/resolver/FontBuilder.h @@ -23,7 +23,7 @@ #ifndef FontBuilder_h #define FontBuilder_h -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "platform/fonts/FontDescription.h" #include "platform/heap/Handle.h" diff --git a/engine/core/css/resolver/SharedStyleFinder.cpp b/engine/core/css/resolver/SharedStyleFinder.cpp index a81725802db..cc514bcc082 100644 --- a/engine/core/css/resolver/SharedStyleFinder.cpp +++ b/engine/core/css/resolver/SharedStyleFinder.cpp @@ -29,7 +29,7 @@ #include "config.h" #include "core/css/resolver/SharedStyleFinder.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/css/resolver/StyleResolver.h" #include "core/css/resolver/StyleResolverStats.h" #include "core/dom/ContainerNode.h" diff --git a/engine/core/css/resolver/StyleBuilder.h b/engine/core/css/resolver/StyleBuilder.h index 2d6d9223bca..3d15b35849b 100644 --- a/engine/core/css/resolver/StyleBuilder.h +++ b/engine/core/css/resolver/StyleBuilder.h @@ -31,7 +31,7 @@ #ifndef StyleBuilder_h #define StyleBuilder_h -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "platform/heap/Handle.h" namespace blink { diff --git a/engine/core/css/resolver/StyleBuilderCustom.cpp b/engine/core/css/resolver/StyleBuilderCustom.cpp index 0f961db47b7..d1ed4541bd7 100644 --- a/engine/core/css/resolver/StyleBuilderCustom.cpp +++ b/engine/core/css/resolver/StyleBuilderCustom.cpp @@ -38,10 +38,10 @@ #include "config.h" -#include "core/CSSPropertyNames.h" -#include "core/CSSValueKeywords.h" -#include "core/StyleBuilderFunctions.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/CSSValueKeywords.h" +#include "gen/sky/core/StyleBuilderFunctions.h" +#include "gen/sky/core/StylePropertyShorthand.h" #include "core/css/BasicShapeFunctions.h" #include "core/css/CSSAspectRatioValue.h" #include "core/css/CSSCursorImageValue.h" diff --git a/engine/core/css/resolver/StyleResolver.cpp b/engine/core/css/resolver/StyleResolver.cpp index c4d1e334bdb..d8ca3a5f0cd 100644 --- a/engine/core/css/resolver/StyleResolver.cpp +++ b/engine/core/css/resolver/StyleResolver.cpp @@ -29,9 +29,9 @@ #include "config.h" #include "core/css/resolver/StyleResolver.h" -#include "core/CSSPropertyNames.h" -#include "core/MediaTypeNames.h" -#include "core/StylePropertyShorthand.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/MediaTypeNames.h" +#include "gen/sky/core/StylePropertyShorthand.h" #include "core/animation/ActiveAnimations.h" #include "core/animation/Animation.h" #include "core/animation/AnimationTimeline.h" @@ -71,7 +71,7 @@ #include "core/frame/LocalFrame.h" #include "core/rendering/RenderView.h" #include "core/rendering/style/KeyframeList.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/LeakAnnotations.h" #include "wtf/StdLibExtras.h" diff --git a/engine/core/css/resolver/StyleResolverState.h b/engine/core/css/resolver/StyleResolverState.h index b22bd55e811..9dd8ddec84f 100644 --- a/engine/core/css/resolver/StyleResolverState.h +++ b/engine/core/css/resolver/StyleResolverState.h @@ -22,7 +22,7 @@ #ifndef StyleResolverState_h #define StyleResolverState_h -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "core/css/CSSToLengthConversionData.h" #include "core/css/resolver/CSSToStyleMap.h" diff --git a/engine/core/css/resolver/StyleResourceLoader.cpp b/engine/core/css/resolver/StyleResourceLoader.cpp index fd445ab7b08..f877a8a2e0b 100644 --- a/engine/core/css/resolver/StyleResourceLoader.cpp +++ b/engine/core/css/resolver/StyleResourceLoader.cpp @@ -23,7 +23,7 @@ #include "config.h" #include "core/css/resolver/StyleResourceLoader.h" -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "core/css/CSSCursorImageValue.h" #include "core/css/CSSImageValue.h" #include "core/css/resolver/ElementStyleResources.h" diff --git a/engine/core/dom/Document.cpp b/engine/core/dom/Document.cpp index 72d8c608e82..102adf245c7 100644 --- a/engine/core/dom/Document.cpp +++ b/engine/core/dom/Document.cpp @@ -37,7 +37,7 @@ #include "bindings/core/v8/ScriptController.h" #include "bindings/core/v8/V8DOMWrapper.h" #include "bindings/core/v8/WindowProxy.h" -#include "core/HTMLElementFactory.h" +#include "gen/sky/core/HTMLElementFactory.h" #include "core/animation/AnimationTimeline.h" #include "core/animation/DocumentAnimations.h" #include "core/css/CSSFontSelector.h" @@ -131,7 +131,7 @@ #include "platform/EventDispatchForbiddenScope.h" #include "platform/Language.h" #include "platform/Logging.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/ScriptForbiddenScope.h" #include "platform/TraceEvent.h" #include "platform/network/HTTPParsers.h" diff --git a/engine/core/dom/DocumentInit.cpp b/engine/core/dom/DocumentInit.cpp index 9d45bec0aa4..9e75236e1a3 100644 --- a/engine/core/dom/DocumentInit.cpp +++ b/engine/core/dom/DocumentInit.cpp @@ -32,7 +32,7 @@ #include "core/dom/custom/CustomElementRegistrationContext.h" #include "core/frame/LocalFrame.h" #include "core/html/imports/HTMLImportsController.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/core/dom/DocumentStyleSheetCollection.cpp b/engine/core/dom/DocumentStyleSheetCollection.cpp index 1aa68c6efac..d41b2e04eb6 100644 --- a/engine/core/dom/DocumentStyleSheetCollection.cpp +++ b/engine/core/dom/DocumentStyleSheetCollection.cpp @@ -32,7 +32,7 @@ #include "core/dom/DocumentStyleSheetCollector.h" #include "core/dom/StyleEngine.h" #include "core/dom/StyleSheetCandidate.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/core/dom/Element.cpp b/engine/core/dom/Element.cpp index 2c1591d8852..1321d5a9b07 100644 --- a/engine/core/dom/Element.cpp +++ b/engine/core/dom/Element.cpp @@ -29,8 +29,8 @@ #include "bindings/core/v8/Dictionary.h" #include "bindings/core/v8/ExceptionMessages.h" #include "bindings/core/v8/ExceptionState.h" -#include "core/CSSValueKeywords.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/CSSValueKeywords.h" +#include "gen/sky/core/HTMLNames.h" #include "core/animation/AnimationTimeline.h" #include "core/animation/css/CSSAnimations.h" #include "core/css/CSSImageValue.h" @@ -83,7 +83,7 @@ #include "core/rendering/RenderView.h" #include "core/rendering/compositing/RenderLayerCompositor.h" #include "platform/EventDispatchForbiddenScope.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/UserGestureIndicator.h" #include "platform/scroll/ScrollableArea.h" #include "wtf/BitVector.h" diff --git a/engine/core/dom/Element.h b/engine/core/dom/Element.h index 7eb05de0332..db063c68f44 100644 --- a/engine/core/dom/Element.h +++ b/engine/core/dom/Element.h @@ -25,14 +25,14 @@ #ifndef Element_h #define Element_h -#include "core/HTMLNames.h" -#include "core/CSSPropertyNames.h" #include "core/css/CSSPrimitiveValue.h" #include "core/dom/Attribute.h" #include "core/dom/ContainerNode.h" #include "core/dom/ElementData.h" #include "core/dom/SpaceSplitString.h" #include "core/page/FocusType.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/HTMLNames.h" #include "platform/heap/Handle.h" namespace blink { diff --git a/engine/core/dom/Node.cpp b/engine/core/dom/Node.cpp index 35f7801a2d9..bb1e6901048 100644 --- a/engine/core/dom/Node.cpp +++ b/engine/core/dom/Node.cpp @@ -29,7 +29,7 @@ #include "bindings/core/v8/ExceptionState.h" #include "bindings/core/v8/ScriptCallStackFactory.h" #include "bindings/core/v8/V8DOMWrapper.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/css/resolver/StyleResolver.h" #include "core/dom/Attr.h" #include "core/dom/Attribute.h" diff --git a/engine/core/dom/TreeScope.cpp b/engine/core/dom/TreeScope.cpp index de3f4292abd..4491379798f 100644 --- a/engine/core/dom/TreeScope.cpp +++ b/engine/core/dom/TreeScope.cpp @@ -27,7 +27,7 @@ #include "config.h" #include "core/dom/TreeScope.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/css/resolver/ScopedStyleResolver.h" #include "core/dom/ContainerNode.h" #include "core/dom/Document.h" diff --git a/engine/core/dom/custom/CustomElementRegistrationContext.cpp b/engine/core/dom/custom/CustomElementRegistrationContext.cpp index 8b386257cc3..0a8e732ad4a 100644 --- a/engine/core/dom/custom/CustomElementRegistrationContext.cpp +++ b/engine/core/dom/custom/CustomElementRegistrationContext.cpp @@ -32,7 +32,7 @@ #include "core/dom/custom/CustomElementRegistrationContext.h" #include "bindings/core/v8/ExceptionState.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/dom/Document.h" #include "core/dom/Element.h" #include "core/dom/custom/CustomElement.h" diff --git a/engine/core/editing/ApplyBlockElementCommand.cpp b/engine/core/editing/ApplyBlockElementCommand.cpp index fb7003033b5..229555736a7 100644 --- a/engine/core/editing/ApplyBlockElementCommand.cpp +++ b/engine/core/editing/ApplyBlockElementCommand.cpp @@ -28,7 +28,7 @@ #include "core/editing/ApplyBlockElementCommand.h" #include "bindings/core/v8/ExceptionState.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/dom/NodeRenderStyle.h" #include "core/dom/Text.h" #include "core/editing/VisiblePosition.h" diff --git a/engine/core/editing/CompositeEditCommand.h b/engine/core/editing/CompositeEditCommand.h index fba6dbd606e..faf1b0159fa 100644 --- a/engine/core/editing/CompositeEditCommand.h +++ b/engine/core/editing/CompositeEditCommand.h @@ -26,9 +26,9 @@ #ifndef CompositeEditCommand_h #define CompositeEditCommand_h -#include "core/CSSPropertyNames.h" #include "core/editing/EditCommand.h" #include "core/editing/UndoStep.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "wtf/Vector.h" namespace blink { diff --git a/engine/core/editing/EditingStyle.cpp b/engine/core/editing/EditingStyle.cpp index 1a239bc3797..82a2b9198cf 100644 --- a/engine/core/editing/EditingStyle.cpp +++ b/engine/core/editing/EditingStyle.cpp @@ -28,7 +28,7 @@ #include "core/editing/EditingStyle.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/css/CSSComputedStyleDeclaration.h" #include "core/css/CSSPropertyMetadata.h" #include "core/css/CSSRuleList.h" diff --git a/engine/core/editing/EditingStyle.h b/engine/core/editing/EditingStyle.h index ee12d3a2e65..04e73595f8b 100644 --- a/engine/core/editing/EditingStyle.h +++ b/engine/core/editing/EditingStyle.h @@ -32,9 +32,9 @@ #ifndef EditingStyle_h #define EditingStyle_h -#include "core/CSSPropertyNames.h" -#include "core/CSSValueKeywords.h" #include "core/editing/WritingDirection.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "platform/fonts/FixedPitchFontType.h" #include "platform/heap/Handle.h" #include "wtf/Forward.h" diff --git a/engine/core/editing/Editor.cpp b/engine/core/editing/Editor.cpp index 62051492635..a0a2685c4f4 100644 --- a/engine/core/editing/Editor.cpp +++ b/engine/core/editing/Editor.cpp @@ -28,8 +28,8 @@ #include "core/editing/Editor.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" -#include "core/CSSPropertyNames.h" -#include "core/EventNames.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/EventNames.h" #include "core/css/CSSComputedStyleDeclaration.h" #include "core/css/StylePropertySet.h" #include "core/dom/DocumentFragment.h" diff --git a/engine/core/editing/EditorCommand.cpp b/engine/core/editing/EditorCommand.cpp index 490968af170..f0318920a8e 100644 --- a/engine/core/editing/EditorCommand.cpp +++ b/engine/core/editing/EditorCommand.cpp @@ -30,8 +30,8 @@ #include "bindings/core/v8/ExceptionState.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" -#include "core/CSSPropertyNames.h" -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "core/css/CSSValueList.h" #include "core/css/StylePropertySet.h" #include "core/dom/DocumentFragment.h" diff --git a/engine/core/editing/InsertParagraphSeparatorCommand.cpp b/engine/core/editing/InsertParagraphSeparatorCommand.cpp index 470dc6ae447..faa975f49db 100644 --- a/engine/core/editing/InsertParagraphSeparatorCommand.cpp +++ b/engine/core/editing/InsertParagraphSeparatorCommand.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "core/editing/InsertParagraphSeparatorCommand.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/dom/Document.h" #include "core/dom/NodeTraversal.h" #include "core/dom/Text.h" diff --git a/engine/core/editing/MarkupAccumulator.cpp b/engine/core/editing/MarkupAccumulator.cpp index 66be4f54ae2..9bd4b8d5942 100644 --- a/engine/core/editing/MarkupAccumulator.cpp +++ b/engine/core/editing/MarkupAccumulator.cpp @@ -27,7 +27,7 @@ #include "config.h" #include "core/editing/MarkupAccumulator.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/dom/Document.h" #include "core/dom/DocumentFragment.h" #include "core/dom/Text.h" diff --git a/engine/core/editing/ReplaceSelectionCommand.cpp b/engine/core/editing/ReplaceSelectionCommand.cpp index d94eaf6c8cd..3bc573a7225 100644 --- a/engine/core/editing/ReplaceSelectionCommand.cpp +++ b/engine/core/editing/ReplaceSelectionCommand.cpp @@ -28,8 +28,8 @@ #include "core/editing/ReplaceSelectionCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" -#include "core/CSSPropertyNames.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/css/CSSStyleDeclaration.h" #include "core/css/StylePropertySet.h" #include "core/dom/Document.h" diff --git a/engine/core/editing/SplitElementCommand.cpp b/engine/core/editing/SplitElementCommand.cpp index 931e6233df6..a611fb3ef50 100644 --- a/engine/core/editing/SplitElementCommand.cpp +++ b/engine/core/editing/SplitElementCommand.cpp @@ -28,7 +28,7 @@ #include "bindings/core/v8/ExceptionState.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/dom/Element.h" #include "wtf/Assertions.h" diff --git a/engine/core/editing/VisibleUnits.cpp b/engine/core/editing/VisibleUnits.cpp index f2cce173be8..5cbf8e59873 100644 --- a/engine/core/editing/VisibleUnits.cpp +++ b/engine/core/editing/VisibleUnits.cpp @@ -40,7 +40,7 @@ #include "core/rendering/InlineTextBox.h" #include "core/rendering/RenderBlockFlow.h" #include "core/rendering/RenderObject.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/heap/Handle.h" #include "platform/text/TextBoundaries.h" diff --git a/engine/core/editing/htmlediting.cpp b/engine/core/editing/htmlediting.cpp index 41d7b476728..936e9f59886 100644 --- a/engine/core/editing/htmlediting.cpp +++ b/engine/core/editing/htmlediting.cpp @@ -28,7 +28,7 @@ #include "bindings/core/v8/ExceptionState.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" -#include "core/HTMLElementFactory.h" +#include "gen/sky/core/HTMLElementFactory.h" #include "core/dom/Document.h" #include "core/dom/ElementTraversal.h" #include "core/dom/NodeTraversal.h" diff --git a/engine/core/editing/markup.cpp b/engine/core/editing/markup.cpp index 3f9b2889626..690bd00b960 100644 --- a/engine/core/editing/markup.cpp +++ b/engine/core/editing/markup.cpp @@ -30,9 +30,9 @@ #include "core/editing/markup.h" #include "bindings/core/v8/ExceptionState.h" -#include "core/CSSPropertyNames.h" -#include "core/CSSValueKeywords.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/CSSValueKeywords.h" +#include "gen/sky/core/HTMLNames.h" #include "core/css/CSSPrimitiveValue.h" #include "core/css/CSSValue.h" #include "core/css/StylePropertySet.h" diff --git a/engine/core/events/Event.cpp b/engine/core/events/Event.cpp index 0855500ed83..d3a41016908 100644 --- a/engine/core/events/Event.cpp +++ b/engine/core/events/Event.cpp @@ -23,8 +23,8 @@ #include "config.h" #include "core/events/Event.h" -#include "core/EventHeaders.h" -#include "core/EventInterfaces.h" +#include "gen/sky/core/EventHeaders.h" +#include "gen/sky/core/EventInterfaces.h" #include "core/dom/StaticNodeList.h" #include "core/events/EventTarget.h" #include "core/frame/UseCounter.h" diff --git a/engine/core/events/EventPath.cpp b/engine/core/events/EventPath.cpp index 08717f9abd6..9f25d3e886c 100644 --- a/engine/core/events/EventPath.cpp +++ b/engine/core/events/EventPath.cpp @@ -27,7 +27,7 @@ #include "config.h" #include "core/events/EventPath.h" -#include "core/EventNames.h" +#include "gen/sky/core/EventNames.h" #include "core/dom/Document.h" #include "core/dom/Touch.h" #include "core/dom/TouchList.h" diff --git a/engine/core/events/EventTarget.cpp b/engine/core/events/EventTarget.cpp index 2afccea3b5b..c805d183ac2 100644 --- a/engine/core/events/EventTarget.cpp +++ b/engine/core/events/EventTarget.cpp @@ -41,7 +41,7 @@ #include "core/frame/LocalDOMWindow.h" #include "core/frame/UseCounter.h" #include "platform/EventDispatchForbiddenScope.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/StdLibExtras.h" #include "wtf/Vector.h" diff --git a/engine/core/events/ThreadLocalEventNames.h b/engine/core/events/ThreadLocalEventNames.h index 1a09276fcd4..37c80d734cb 100644 --- a/engine/core/events/ThreadLocalEventNames.h +++ b/engine/core/events/ThreadLocalEventNames.h @@ -22,11 +22,11 @@ #ifndef ThreadLocalEventNames_h #define ThreadLocalEventNames_h -#include "core/EventInterfaces.h" -#include "core/EventNames.h" -#include "core/EventTargetInterfaces.h" -#include "core/EventTargetNames.h" -#include "core/EventTypeNames.h" +#include "gen/sky/core/EventInterfaces.h" +#include "gen/sky/core/EventNames.h" +#include "gen/sky/core/EventTargetInterfaces.h" +#include "gen/sky/core/EventTargetNames.h" +#include "gen/sky/core/EventTypeNames.h" #include "wtf/text/AtomicString.h" namespace blink { diff --git a/engine/core/fetch/ImageResource.cpp b/engine/core/fetch/ImageResource.cpp index 50e00e87ceb..bf9839bac65 100644 --- a/engine/core/fetch/ImageResource.cpp +++ b/engine/core/fetch/ImageResource.cpp @@ -32,7 +32,7 @@ #include "core/frame/FrameView.h" #include "core/rendering/RenderObject.h" #include "platform/Logging.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/SharedBuffer.h" #include "platform/TraceEvent.h" #include "platform/graphics/BitmapImage.h" diff --git a/engine/core/fetch/Resource.cpp b/engine/core/fetch/Resource.cpp index f3abc4c9d0a..ec0ad63934c 100644 --- a/engine/core/fetch/Resource.cpp +++ b/engine/core/fetch/Resource.cpp @@ -24,7 +24,7 @@ #include "config.h" #include "core/fetch/Resource.h" -#include "core/FetchInitiatorTypeNames.h" +#include "gen/sky/core/FetchInitiatorTypeNames.h" #include "core/fetch/MemoryCache.h" #include "core/fetch/ResourceClient.h" #include "core/fetch/ResourceClientWalker.h" diff --git a/engine/core/fetch/ResourceFetcher.cpp b/engine/core/fetch/ResourceFetcher.cpp index d771ed1d310..a3347f00e18 100644 --- a/engine/core/fetch/ResourceFetcher.cpp +++ b/engine/core/fetch/ResourceFetcher.cpp @@ -28,7 +28,7 @@ #include "core/fetch/ResourceFetcher.h" #include "bindings/core/v8/ScriptController.h" -#include "core/FetchInitiatorTypeNames.h" +#include "gen/sky/core/FetchInitiatorTypeNames.h" #include "core/dom/Document.h" #include "core/fetch/FetchContext.h" #include "core/fetch/FontResource.h" @@ -48,7 +48,7 @@ #include "core/loader/UniqueIdentifier.h" #include "core/page/Page.h" #include "platform/Logging.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/SharedBuffer.h" #include "platform/TraceEvent.h" #include "platform/weborigin/SecurityPolicy.h" diff --git a/engine/core/frame/FrameView.cpp b/engine/core/frame/FrameView.cpp index 3608c631274..0519ab9b55c 100644 --- a/engine/core/frame/FrameView.cpp +++ b/engine/core/frame/FrameView.cpp @@ -48,7 +48,7 @@ #include "core/rendering/compositing/CompositedLayerMapping.h" #include "core/rendering/compositing/RenderLayerCompositor.h" #include "core/rendering/style/RenderStyle.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/ScriptForbiddenScope.h" #include "platform/TraceEvent.h" #include "platform/fonts/FontCache.h" diff --git a/engine/core/frame/FrameView.h b/engine/core/frame/FrameView.h index c619f967c8a..8e3caf81138 100644 --- a/engine/core/frame/FrameView.h +++ b/engine/core/frame/FrameView.h @@ -26,8 +26,8 @@ #define FrameView_h #include "core/rendering/PaintPhase.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/HostWindow.h" -#include "platform/RuntimeEnabledFeatures.h" #include "platform/Widget.h" #include "platform/geometry/LayoutRect.h" #include "platform/graphics/Color.h" diff --git a/engine/core/frame/LocalDOMWindow.cpp b/engine/core/frame/LocalDOMWindow.cpp index c025225b805..bcdc937c36e 100644 --- a/engine/core/frame/LocalDOMWindow.cpp +++ b/engine/core/frame/LocalDOMWindow.cpp @@ -77,7 +77,7 @@ #include "core/rendering/style/RenderStyle.h" #include "platform/EventDispatchForbiddenScope.h" #include "platform/PlatformScreen.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/UserGestureIndicator.h" #include "platform/geometry/FloatRect.h" #include "platform/weborigin/KURL.h" diff --git a/engine/core/frame/LocalFrame.cpp b/engine/core/frame/LocalFrame.cpp index a008c554b6c..a9b7c6465f8 100644 --- a/engine/core/frame/LocalFrame.cpp +++ b/engine/core/frame/LocalFrame.cpp @@ -56,7 +56,7 @@ #include "core/rendering/RenderLayer.h" #include "core/rendering/RenderView.h" #include "core/rendering/compositing/RenderLayerCompositor.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/graphics/GraphicsContext.h" #include "platform/graphics/ImageBuffer.h" #include "platform/text/TextStream.h" diff --git a/engine/core/frame/Settings.cpp b/engine/core/frame/Settings.cpp index 7a6cedbc415..b1f9ee7bc4a 100644 --- a/engine/core/frame/Settings.cpp +++ b/engine/core/frame/Settings.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "core/frame/Settings.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/scroll/Scrollbar.h" namespace blink { diff --git a/engine/core/frame/Settings.h b/engine/core/frame/Settings.h index 3f5f66a4247..8b3ab89ed0a 100644 --- a/engine/core/frame/Settings.h +++ b/engine/core/frame/Settings.h @@ -28,9 +28,9 @@ #define Settings_h #include "bindings/core/v8/V8CacheOptions.h" -#include "core/SettingsMacros.h" #include "core/css/PointerProperties.h" #include "core/frame/SettingsDelegate.h" +#include "gen/sky/core/SettingsMacros.h" #include "platform/Timer.h" #include "platform/fonts/GenericFontFamilySettings.h" #include "platform/geometry/IntSize.h" diff --git a/engine/core/frame/UseCounter.h b/engine/core/frame/UseCounter.h index f1279b5084e..471c1524ffe 100644 --- a/engine/core/frame/UseCounter.h +++ b/engine/core/frame/UseCounter.h @@ -26,7 +26,7 @@ #ifndef UseCounter_h #define UseCounter_h -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "wtf/BitVector.h" #include "wtf/Noncopyable.h" #include "wtf/OwnPtr.h" diff --git a/engine/core/html/ClassList.h b/engine/core/html/ClassList.h index d5384f8653a..476765549d6 100644 --- a/engine/core/html/ClassList.h +++ b/engine/core/html/ClassList.h @@ -25,10 +25,10 @@ #ifndef ClassList_h #define ClassList_h -#include "core/HTMLNames.h" #include "core/dom/DOMTokenList.h" #include "core/dom/Element.h" #include "core/dom/SpaceSplitString.h" +#include "gen/sky/core/HTMLNames.h" #include "wtf/OwnPtr.h" #include "wtf/PassOwnPtr.h" diff --git a/engine/core/html/HTMLAnchorElement.h b/engine/core/html/HTMLAnchorElement.h index 50847959438..8f2641bf1dd 100644 --- a/engine/core/html/HTMLAnchorElement.h +++ b/engine/core/html/HTMLAnchorElement.h @@ -24,10 +24,10 @@ #ifndef HTMLAnchorElement_h #define HTMLAnchorElement_h -#include "core/HTMLNames.h" #include "core/dom/DOMURLUtils.h" #include "core/dom/Document.h" #include "core/html/HTMLElement.h" +#include "gen/sky/core/HTMLNames.h" namespace blink { diff --git a/engine/core/html/HTMLCanvasElement.cpp b/engine/core/html/HTMLCanvasElement.cpp index a51d3e6b298..d7571c08f4d 100644 --- a/engine/core/html/HTMLCanvasElement.cpp +++ b/engine/core/html/HTMLCanvasElement.cpp @@ -45,7 +45,7 @@ #include "core/html/canvas/WebGLContextEvent.h" #include "core/html/canvas/WebGLRenderingContext.h" #include "core/html/ImageData.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/rendering/RenderHTMLCanvas.h" #include "core/rendering/RenderLayer.h" #include "platform/graphics/Canvas2DImageBufferSurface.h" @@ -54,7 +54,7 @@ #include "platform/graphics/ImageBuffer.h" #include "platform/graphics/UnacceleratedImageBufferSurface.h" #include "platform/MIMETypeRegistry.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/transforms/AffineTransform.h" #include "public/platform/Platform.h" #include "v8/include/v8.h" diff --git a/engine/core/html/HTMLContentElement.cpp b/engine/core/html/HTMLContentElement.cpp index 70839f20318..796b2300f29 100644 --- a/engine/core/html/HTMLContentElement.cpp +++ b/engine/core/html/HTMLContentElement.cpp @@ -27,13 +27,13 @@ #include "config.h" #include "core/html/HTMLContentElement.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/css/SelectorChecker.h" #include "core/css/parser/BisonCSSParser.h" #include "core/dom/QualifiedName.h" #include "core/dom/shadow/ElementShadow.h" #include "core/dom/shadow/ShadowRoot.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/core/html/HTMLElement.cpp b/engine/core/html/HTMLElement.cpp index 64d29e0e175..c07e3e728e7 100644 --- a/engine/core/html/HTMLElement.cpp +++ b/engine/core/html/HTMLElement.cpp @@ -26,7 +26,7 @@ #include "core/html/HTMLElement.h" #include "bindings/core/v8/ExceptionState.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/V8HTMLElementWrapperFactory.h" // FIXME: should be bindings/core/v8 #include "core/dom/Document.h" #include "core/dom/ElementTraversal.h" diff --git a/engine/core/html/HTMLElement.h b/engine/core/html/HTMLElement.h index e5158289590..8e9b0b0683b 100644 --- a/engine/core/html/HTMLElement.h +++ b/engine/core/html/HTMLElement.h @@ -101,6 +101,6 @@ private: } // namespace blink -#include "core/HTMLElementTypeHelpers.h" +#include "gen/sky/core/HTMLElementTypeHelpers.h" #endif // HTMLElement_h diff --git a/engine/core/html/HTMLIFrameElement.cpp b/engine/core/html/HTMLIFrameElement.cpp index 29b0908cced..904236915c0 100644 --- a/engine/core/html/HTMLIFrameElement.cpp +++ b/engine/core/html/HTMLIFrameElement.cpp @@ -5,7 +5,7 @@ #include "config.h" #include "core/html/HTMLIFrameElement.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/frame/LocalFrame.h" #include "core/html/parser/HTMLParserIdioms.h" #include "core/loader/FrameLoaderClient.h" diff --git a/engine/core/html/HTMLIFrameElement.h b/engine/core/html/HTMLIFrameElement.h index c4ce56e5f06..74f1d1dff94 100644 --- a/engine/core/html/HTMLIFrameElement.h +++ b/engine/core/html/HTMLIFrameElement.h @@ -5,10 +5,10 @@ #ifndef HTMLIFrameElement_h #define HTMLIFrameElement_h -#include "core/HTMLNames.h" #include "core/dom/DOMURLUtils.h" #include "core/dom/Document.h" #include "core/html/HTMLElement.h" +#include "gen/sky/core/HTMLNames.h" #include "mojo/services/public/cpp/view_manager/view_observer.h" #include "wtf/OwnPtr.h" diff --git a/engine/core/html/HTMLImageElement.cpp b/engine/core/html/HTMLImageElement.cpp index 0cb3654b066..4c3a31d67ff 100644 --- a/engine/core/html/HTMLImageElement.cpp +++ b/engine/core/html/HTMLImageElement.cpp @@ -23,9 +23,9 @@ #include "config.h" #include "core/html/HTMLImageElement.h" -#include "core/CSSPropertyNames.h" -#include "core/HTMLNames.h" -#include "core/MediaTypeNames.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/HTMLNames.h" +#include "gen/sky/core/MediaTypeNames.h" #include "core/css/MediaQueryListListener.h" #include "core/css/MediaQueryMatcher.h" #include "core/css/MediaValuesDynamic.h" @@ -41,7 +41,7 @@ #include "core/inspector/ConsoleMessage.h" #include "core/rendering/RenderImage.h" #include "platform/MIMETypeRegistry.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/core/html/HTMLImportElement.cpp b/engine/core/html/HTMLImportElement.cpp index 574f7d9425b..cb4d48d72bd 100644 --- a/engine/core/html/HTMLImportElement.cpp +++ b/engine/core/html/HTMLImportElement.cpp @@ -10,7 +10,7 @@ #include "core/html/imports/HTMLImportsController.h" #include "core/html/imports/HTMLImportChild.h" #include "core/events/Event.h" -#include "core/EventTypeNames.h" +#include "gen/sky/core/EventTypeNames.h" namespace blink { diff --git a/engine/core/html/HTMLStyleElement.cpp b/engine/core/html/HTMLStyleElement.cpp index 8b78645c5de..7a4c86d74b4 100644 --- a/engine/core/html/HTMLStyleElement.cpp +++ b/engine/core/html/HTMLStyleElement.cpp @@ -24,7 +24,7 @@ #include "config.h" #include "core/html/HTMLStyleElement.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/css/MediaList.h" #include "core/dom/Document.h" #include "core/events/Event.h" diff --git a/engine/core/html/HTMLTitleElement.cpp b/engine/core/html/HTMLTitleElement.cpp index 30bf32f2331..2a886145946 100644 --- a/engine/core/html/HTMLTitleElement.cpp +++ b/engine/core/html/HTMLTitleElement.cpp @@ -24,7 +24,7 @@ #include "core/html/HTMLTitleElement.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/dom/ChildListMutationScope.h" #include "core/dom/Document.h" #include "core/dom/Text.h" diff --git a/engine/core/html/ImageData.cpp b/engine/core/html/ImageData.cpp index 5f38803fc46..f2e2dddef4d 100644 --- a/engine/core/html/ImageData.cpp +++ b/engine/core/html/ImageData.cpp @@ -32,7 +32,7 @@ #include "bindings/core/v8/ExceptionState.h" #include "bindings/core/v8/custom/V8Uint8ClampedArrayCustom.h" #include "core/dom/ExceptionCode.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/core/html/canvas/CanvasRenderingContext2D.cpp b/engine/core/html/canvas/CanvasRenderingContext2D.cpp index 49572422b1d..95669a351c9 100644 --- a/engine/core/html/canvas/CanvasRenderingContext2D.cpp +++ b/engine/core/html/canvas/CanvasRenderingContext2D.cpp @@ -36,7 +36,7 @@ #include "bindings/core/v8/ExceptionMessages.h" #include "bindings/core/v8/ExceptionState.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "core/css/CSSFontSelector.h" #include "core/css/parser/BisonCSSParser.h" #include "core/css/StylePropertySet.h" diff --git a/engine/core/html/canvas/CanvasStyle.cpp b/engine/core/html/canvas/CanvasStyle.cpp index 788a2345e8e..edf3ad1fa8a 100644 --- a/engine/core/html/canvas/CanvasStyle.cpp +++ b/engine/core/html/canvas/CanvasStyle.cpp @@ -29,7 +29,7 @@ #include "config.h" #include "core/html/canvas/CanvasStyle.h" -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "core/css/parser/BisonCSSParser.h" #include "core/css/StylePropertySet.h" #include "core/html/HTMLCanvasElement.h" diff --git a/engine/core/html/canvas/WebGLRenderingContextBase.cpp b/engine/core/html/canvas/WebGLRenderingContextBase.cpp index cae6902e8fc..e884e3cc0a1 100644 --- a/engine/core/html/canvas/WebGLRenderingContextBase.cpp +++ b/engine/core/html/canvas/WebGLRenderingContextBase.cpp @@ -74,7 +74,7 @@ #include "core/rendering/RenderBox.h" #include "platform/CheckedInt.h" #include "platform/NotImplemented.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/geometry/IntSize.h" #include "platform/graphics/GraphicsContext.h" #include "platform/graphics/UnacceleratedImageBufferSurface.h" diff --git a/engine/core/html/parser/AtomicHTMLToken.h b/engine/core/html/parser/AtomicHTMLToken.h index 0ba618499d2..88a716dda49 100644 --- a/engine/core/html/parser/AtomicHTMLToken.h +++ b/engine/core/html/parser/AtomicHTMLToken.h @@ -26,10 +26,10 @@ #ifndef AtomicHTMLToken_h #define AtomicHTMLToken_h -#include "core/HTMLElementLookupTrie.h" #include "core/dom/Attribute.h" #include "core/html/parser/CompactHTMLToken.h" #include "core/html/parser/HTMLToken.h" +#include "gen/sky/core/HTMLElementLookupTrie.h" #include "wtf/RefCounted.h" #include "wtf/RefPtr.h" diff --git a/engine/core/html/parser/HTMLConstructionSite.cpp b/engine/core/html/parser/HTMLConstructionSite.cpp index f2b9aec9f3e..43309550ae4 100644 --- a/engine/core/html/parser/HTMLConstructionSite.cpp +++ b/engine/core/html/parser/HTMLConstructionSite.cpp @@ -27,7 +27,7 @@ #include "config.h" #include "core/html/parser/HTMLConstructionSite.h" -#include "core/HTMLElementFactory.h" +#include "gen/sky/core/HTMLElementFactory.h" #include "core/dom/DocumentFragment.h" #include "core/dom/Element.h" #include "core/dom/Text.h" diff --git a/engine/core/html/parser/HTMLDocumentParser.cpp b/engine/core/html/parser/HTMLDocumentParser.cpp index 869ab63144d..b142d0ff587 100644 --- a/engine/core/html/parser/HTMLDocumentParser.cpp +++ b/engine/core/html/parser/HTMLDocumentParser.cpp @@ -27,7 +27,7 @@ #include "core/html/parser/HTMLDocumentParser.h" #include "base/bind.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/css/MediaValuesCached.h" #include "core/dom/Element.h" #include "core/frame/LocalFrame.h" diff --git a/engine/core/html/parser/HTMLParserIdioms.cpp b/engine/core/html/parser/HTMLParserIdioms.cpp index e5a1b4a9e53..cf4e912da02 100644 --- a/engine/core/html/parser/HTMLParserIdioms.cpp +++ b/engine/core/html/parser/HTMLParserIdioms.cpp @@ -25,7 +25,7 @@ #include "config.h" #include "core/html/parser/HTMLParserIdioms.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include #include "wtf/MathExtras.h" #include "wtf/text/AtomicString.h" diff --git a/engine/core/html/parser/HTMLSrcsetParser.cpp b/engine/core/html/parser/HTMLSrcsetParser.cpp index 4313390bfc9..eafde611ab0 100644 --- a/engine/core/html/parser/HTMLSrcsetParser.cpp +++ b/engine/core/html/parser/HTMLSrcsetParser.cpp @@ -34,7 +34,7 @@ #include "core/html/parser/HTMLParserIdioms.h" #include "platform/ParsingUtilities.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" namespace blink { diff --git a/engine/core/html/parser/HTMLTokenizer.cpp b/engine/core/html/parser/HTMLTokenizer.cpp index b67d4aa617b..f36ab01d05f 100644 --- a/engine/core/html/parser/HTMLTokenizer.cpp +++ b/engine/core/html/parser/HTMLTokenizer.cpp @@ -28,7 +28,7 @@ #include "config.h" #include "core/html/parser/HTMLTokenizer.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/html/parser/AtomicHTMLToken.h" #include "core/html/parser/HTMLEntityParser.h" #include "core/html/parser/HTMLParserIdioms.h" diff --git a/engine/core/html/parser/HTMLTreeBuilder.cpp b/engine/core/html/parser/HTMLTreeBuilder.cpp index a8f7e3a9457..e6820576a00 100644 --- a/engine/core/html/parser/HTMLTreeBuilder.cpp +++ b/engine/core/html/parser/HTMLTreeBuilder.cpp @@ -28,7 +28,7 @@ #include "core/html/parser/HTMLTreeBuilder.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/dom/DocumentFragment.h" #include "core/html/HTMLDocument.h" #include "core/html/HTMLTemplateElement.h" diff --git a/engine/core/inspector/ContentSearchUtils.h b/engine/core/inspector/ContentSearchUtils.h index da4306d1b26..ef27bfc9159 100644 --- a/engine/core/inspector/ContentSearchUtils.h +++ b/engine/core/inspector/ContentSearchUtils.h @@ -29,7 +29,7 @@ #ifndef ContentSearchUtils_h #define ContentSearchUtils_h -#include "core/InspectorTypeBuilder.h" +#include "gen/sky/core/InspectorTypeBuilder.h" #include "wtf/PassOwnPtr.h" #include "wtf/text/TextPosition.h" #include "wtf/text/WTFString.h" diff --git a/engine/core/inspector/InjectedScript.h b/engine/core/inspector/InjectedScript.h index 33ed21c7aad..687f52728dc 100644 --- a/engine/core/inspector/InjectedScript.h +++ b/engine/core/inspector/InjectedScript.h @@ -32,10 +32,10 @@ #define InjectedScript_h #include "bindings/core/v8/ScriptValue.h" -#include "core/InspectorTypeBuilder.h" #include "core/inspector/InjectedScriptBase.h" #include "core/inspector/InjectedScriptManager.h" #include "core/inspector/ScriptArguments.h" +#include "gen/sky/core/InspectorTypeBuilder.h" #include "wtf/Forward.h" #include "wtf/Vector.h" diff --git a/engine/core/inspector/InjectedScriptBase.h b/engine/core/inspector/InjectedScriptBase.h index 22a755ba30a..b54ab2cec30 100644 --- a/engine/core/inspector/InjectedScriptBase.h +++ b/engine/core/inspector/InjectedScriptBase.h @@ -33,7 +33,7 @@ #include "bindings/core/v8/ScriptState.h" #include "bindings/core/v8/ScriptValue.h" -#include "core/InspectorTypeBuilder.h" +#include "gen/sky/core/InspectorTypeBuilder.h" #include "wtf/Forward.h" namespace blink { diff --git a/engine/core/inspector/InspectorBaseAgent.h b/engine/core/inspector/InspectorBaseAgent.h index 208c10508d6..ed834b69b6e 100644 --- a/engine/core/inspector/InspectorBaseAgent.h +++ b/engine/core/inspector/InspectorBaseAgent.h @@ -31,7 +31,7 @@ #ifndef InspectorBaseAgent_h #define InspectorBaseAgent_h -#include "core/InspectorBackendDispatcher.h" +#include "gen/sky/core/InspectorBackendDispatcher.h" #include "platform/heap/Handle.h" #include "wtf/Forward.h" #include "wtf/Vector.h" diff --git a/engine/core/inspector/InspectorDebuggerAgent.h b/engine/core/inspector/InspectorDebuggerAgent.h index e6679355288..7f2530cf61c 100644 --- a/engine/core/inspector/InspectorDebuggerAgent.h +++ b/engine/core/inspector/InspectorDebuggerAgent.h @@ -31,7 +31,6 @@ #define InspectorDebuggerAgent_h #include "bindings/core/v8/ScriptState.h" -#include "core/InspectorFrontend.h" #include "core/frame/ConsoleTypes.h" #include "core/inspector/AsyncCallStackTracker.h" #include "core/inspector/ConsoleAPITypes.h" @@ -40,6 +39,7 @@ #include "core/inspector/PromiseTracker.h" #include "core/inspector/ScriptBreakpoint.h" #include "core/inspector/ScriptDebugListener.h" +#include "gen/sky/core/InspectorFrontend.h" #include "wtf/Forward.h" #include "wtf/HashMap.h" #include "wtf/PassRefPtr.h" diff --git a/engine/core/inspector/ScriptCallFrame.h b/engine/core/inspector/ScriptCallFrame.h index 0d4d626586b..350c51c7559 100644 --- a/engine/core/inspector/ScriptCallFrame.h +++ b/engine/core/inspector/ScriptCallFrame.h @@ -31,7 +31,7 @@ #ifndef ScriptCallFrame_h #define ScriptCallFrame_h -#include "core/InspectorTypeBuilder.h" +#include "gen/sky/core/InspectorTypeBuilder.h" #include "wtf/Forward.h" #include "wtf/text/WTFString.h" diff --git a/engine/core/inspector/ScriptCallStack.h b/engine/core/inspector/ScriptCallStack.h index d686cbcd8ad..6ba1f55df83 100644 --- a/engine/core/inspector/ScriptCallStack.h +++ b/engine/core/inspector/ScriptCallStack.h @@ -31,8 +31,8 @@ #ifndef ScriptCallStack_h #define ScriptCallStack_h -#include "core/InspectorTypeBuilder.h" #include "core/inspector/ScriptCallFrame.h" +#include "gen/sky/core/InspectorTypeBuilder.h" #include "platform/heap/Handle.h" #include "wtf/Forward.h" #include "wtf/RefCounted.h" diff --git a/engine/core/inspector/inspector_backend_mojo.cc b/engine/core/inspector/inspector_backend_mojo.cc index d0628ec3e59..ca030fcb3c2 100644 --- a/engine/core/inspector/inspector_backend_mojo.cc +++ b/engine/core/inspector/inspector_backend_mojo.cc @@ -13,8 +13,8 @@ #include "core/inspector/InspectorState.h" #include "core/inspector/InstrumentingAgents.h" #include "core/inspector/PageDebuggerAgent.h" -#include "core/InspectorBackendDispatcher.h" #include "core/page/Page.h" +#include "gen/sky/core/InspectorBackendDispatcher.h" #include "mojo/public/cpp/application/connect.h" #include "mojo/public/cpp/application/service_provider_impl.h" #include "mojo/public/interfaces/application/shell.mojom.h" diff --git a/engine/core/page/EventHandler.cpp b/engine/core/page/EventHandler.cpp index 90110c3270e..f00dc28cb30 100644 --- a/engine/core/page/EventHandler.cpp +++ b/engine/core/page/EventHandler.cpp @@ -29,7 +29,7 @@ #include "core/page/EventHandler.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/dom/Document.h" #include "core/dom/DocumentMarkerController.h" #include "core/dom/NodeRenderingTraversal.h" @@ -68,7 +68,7 @@ #include "platform/PlatformKeyboardEvent.h" #include "platform/PlatformTouchEvent.h" #include "platform/PlatformWheelEvent.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/TraceEvent.h" #include "platform/WindowsKeyboardCodes.h" #include "platform/geometry/FloatPoint.h" diff --git a/engine/core/rendering/HitTestResult.cpp b/engine/core/rendering/HitTestResult.cpp index 0f549317ee9..1e1074445e6 100644 --- a/engine/core/rendering/HitTestResult.cpp +++ b/engine/core/rendering/HitTestResult.cpp @@ -22,7 +22,7 @@ #include "config.h" #include "core/rendering/HitTestResult.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/dom/DocumentMarkerController.h" #include "core/dom/NodeRenderingTraversal.h" #include "core/dom/shadow/ShadowRoot.h" diff --git a/engine/core/rendering/InlineFlowBox.cpp b/engine/core/rendering/InlineFlowBox.cpp index 229dc58de08..86b5e1fba63 100644 --- a/engine/core/rendering/InlineFlowBox.cpp +++ b/engine/core/rendering/InlineFlowBox.cpp @@ -20,7 +20,7 @@ #include "config.h" #include "core/rendering/InlineFlowBox.h" -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "core/dom/Document.h" #include "core/rendering/HitTestResult.h" #include "core/rendering/InlineTextBox.h" diff --git a/engine/core/rendering/InlineTextBox.cpp b/engine/core/rendering/InlineTextBox.cpp index 51974effaf5..6e28ce5d417 100644 --- a/engine/core/rendering/InlineTextBox.cpp +++ b/engine/core/rendering/InlineTextBox.cpp @@ -40,7 +40,7 @@ #include "core/rendering/RenderBlock.h" #include "core/rendering/RenderTheme.h" #include "core/rendering/style/ShadowList.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/FontCache.h" #include "platform/fonts/GlyphBuffer.h" #include "platform/fonts/WidthIterator.h" diff --git a/engine/core/rendering/RenderImage.cpp b/engine/core/rendering/RenderImage.cpp index a3a8bb85882..2c15613f1d4 100644 --- a/engine/core/rendering/RenderImage.cpp +++ b/engine/core/rendering/RenderImage.cpp @@ -28,7 +28,7 @@ #include "config.h" #include "core/rendering/RenderImage.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/editing/FrameSelection.h" #include "core/fetch/ImageResource.h" #include "core/fetch/ResourceLoader.h" diff --git a/engine/core/rendering/RenderLayer.cpp b/engine/core/rendering/RenderLayer.cpp index 54b85b5f5da..a51945112a4 100644 --- a/engine/core/rendering/RenderLayer.cpp +++ b/engine/core/rendering/RenderLayer.cpp @@ -44,7 +44,7 @@ #include "config.h" #include "core/rendering/RenderLayer.h" -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "core/dom/Document.h" #include "core/dom/shadow/ShadowRoot.h" #include "core/frame/FrameView.h" @@ -63,7 +63,7 @@ #include "core/rendering/compositing/RenderLayerCompositor.h" #include "platform/LengthFunctions.h" #include "platform/Partitions.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/TraceEvent.h" #include "platform/geometry/FloatPoint3D.h" #include "platform/geometry/FloatRect.h" diff --git a/engine/core/rendering/RenderObject.cpp b/engine/core/rendering/RenderObject.cpp index d5b9b6dedf7..1adfc1ba340 100644 --- a/engine/core/rendering/RenderObject.cpp +++ b/engine/core/rendering/RenderObject.cpp @@ -61,7 +61,7 @@ #include "core/rendering/style/ShadowList.h" #include "platform/JSONValues.h" #include "platform/Partitions.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/TraceEvent.h" #include "platform/TracedValue.h" #include "platform/geometry/TransformState.h" diff --git a/engine/core/rendering/RenderReplaced.cpp b/engine/core/rendering/RenderReplaced.cpp index 59f343f84d2..73cf97aff8a 100644 --- a/engine/core/rendering/RenderReplaced.cpp +++ b/engine/core/rendering/RenderReplaced.cpp @@ -31,7 +31,7 @@ #include "core/rendering/RenderLayer.h" #include "core/rendering/RenderView.h" #include "platform/LengthFunctions.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/graphics/GraphicsContext.h" namespace blink { diff --git a/engine/core/rendering/RenderTheme.cpp b/engine/core/rendering/RenderTheme.cpp index 9f5066c78ca..7241202eeb2 100644 --- a/engine/core/rendering/RenderTheme.cpp +++ b/engine/core/rendering/RenderTheme.cpp @@ -22,7 +22,7 @@ #include "config.h" #include "core/rendering/RenderTheme.h" -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "core/dom/Document.h" #include "core/dom/shadow/ElementShadow.h" #include "core/editing/FrameSelection.h" @@ -35,7 +35,7 @@ #include "core/rendering/RenderView.h" #include "core/rendering/style/RenderStyle.h" #include "platform/FloatConversion.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/FontSelector.h" #include "platform/graphics/GraphicsContextStateSaver.h" #include "platform/text/StringTruncator.h" diff --git a/engine/core/rendering/RenderView.cpp b/engine/core/rendering/RenderView.cpp index 796862d7074..51ea0fbbb84 100644 --- a/engine/core/rendering/RenderView.cpp +++ b/engine/core/rendering/RenderView.cpp @@ -32,7 +32,7 @@ #include "core/rendering/RenderSelectionInfo.h" #include "core/rendering/compositing/CompositedLayerMapping.h" #include "core/rendering/compositing/RenderLayerCompositor.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/TraceEvent.h" #include "platform/geometry/FloatQuad.h" #include "platform/geometry/TransformState.h" diff --git a/engine/core/rendering/compositing/CompositedLayerMapping.cpp b/engine/core/rendering/compositing/CompositedLayerMapping.cpp index 1c974e0cb4b..7545b42f8a8 100644 --- a/engine/core/rendering/compositing/CompositedLayerMapping.cpp +++ b/engine/core/rendering/compositing/CompositedLayerMapping.cpp @@ -43,7 +43,7 @@ #include "core/rendering/compositing/RenderLayerCompositor.h" #include "core/rendering/style/KeyframeList.h" #include "platform/LengthFunctions.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/FontCache.h" #include "platform/geometry/TransformState.h" #include "platform/graphics/GraphicsContext.h" diff --git a/engine/core/rendering/compositing/CompositingReasonFinder.cpp b/engine/core/rendering/compositing/CompositingReasonFinder.cpp index d3d571348c2..4a84aafd892 100644 --- a/engine/core/rendering/compositing/CompositingReasonFinder.cpp +++ b/engine/core/rendering/compositing/CompositingReasonFinder.cpp @@ -5,7 +5,7 @@ #include "config.h" #include "core/rendering/compositing/CompositingReasonFinder.h" -#include "core/CSSPropertyNames.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "core/dom/Document.h" #include "core/frame/FrameView.h" #include "core/frame/Settings.h" diff --git a/engine/core/rendering/compositing/RenderLayerCompositor.cpp b/engine/core/rendering/compositing/RenderLayerCompositor.cpp index f8e87d80201..7617214610f 100644 --- a/engine/core/rendering/compositing/RenderLayerCompositor.cpp +++ b/engine/core/rendering/compositing/RenderLayerCompositor.cpp @@ -44,7 +44,7 @@ #include "core/rendering/compositing/CompositingRequirementsUpdater.h" #include "core/rendering/compositing/GraphicsLayerTreeBuilder.h" #include "core/rendering/compositing/GraphicsLayerUpdater.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/ScriptForbiddenScope.h" #include "platform/TraceEvent.h" #include "platform/graphics/GraphicsLayer.h" diff --git a/engine/core/rendering/style/KeyframeList.h b/engine/core/rendering/style/KeyframeList.h index 90a83c6db31..0e64807c5dc 100644 --- a/engine/core/rendering/style/KeyframeList.h +++ b/engine/core/rendering/style/KeyframeList.h @@ -25,8 +25,8 @@ #ifndef KeyframeList_h #define KeyframeList_h -#include "core/CSSPropertyNames.h" #include "core/rendering/style/StyleInheritedData.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "wtf/HashSet.h" #include "wtf/RefPtr.h" #include "wtf/Vector.h" diff --git a/engine/core/rendering/style/RenderStyle.cpp b/engine/core/rendering/style/RenderStyle.cpp index 34fffeb10e8..c5cd5f5c112 100644 --- a/engine/core/rendering/style/RenderStyle.cpp +++ b/engine/core/rendering/style/RenderStyle.cpp @@ -33,7 +33,7 @@ #include "core/rendering/style/StyleImage.h" #include "core/rendering/style/StyleInheritedData.h" #include "platform/LengthFunctions.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/Font.h" #include "platform/fonts/FontSelector.h" #include "platform/geometry/FloatRoundedRect.h" diff --git a/engine/core/rendering/style/RenderStyle.h b/engine/core/rendering/style/RenderStyle.h index 44e29ac6551..735df58e8cc 100644 --- a/engine/core/rendering/style/RenderStyle.h +++ b/engine/core/rendering/style/RenderStyle.h @@ -25,7 +25,6 @@ #ifndef RenderStyle_h #define RenderStyle_h -#include "core/CSSPropertyNames.h" #include "core/animation/css/CSSAnimationData.h" #include "core/animation/css/CSSTransitionData.h" #include "core/css/CSSLineBoxContainValue.h" @@ -50,6 +49,7 @@ #include "core/rendering/style/StyleTransformData.h" #include "core/rendering/style/StyleVisualData.h" #include "core/rendering/style/StyleWillChangeData.h" +#include "gen/sky/core/CSSPropertyNames.h" #include "platform/Length.h" #include "platform/LengthBox.h" #include "platform/LengthSize.h" diff --git a/engine/core/rendering/style/StyleWillChangeData.h b/engine/core/rendering/style/StyleWillChangeData.h index c54c7655308..606b9801828 100644 --- a/engine/core/rendering/style/StyleWillChangeData.h +++ b/engine/core/rendering/style/StyleWillChangeData.h @@ -5,8 +5,8 @@ #ifndef StyleWillChangeData_h #define StyleWillChangeData_h -#include "core/CSSPropertyNames.h" -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSPropertyNames.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "wtf/PassRefPtr.h" #include "wtf/RefCounted.h" #include "wtf/Vector.h" diff --git a/engine/platform/BUILD.gn b/engine/platform/BUILD.gn index c8c503c0d44..02520080047 100644 --- a/engine/platform/BUILD.gn +++ b/engine/platform/BUILD.gn @@ -640,7 +640,7 @@ component("platform") { ] include_dirs = [ - "$root_gen_dir/sky", + "$root_build_dir", ] deps = [ @@ -776,7 +776,7 @@ test("platform_unittests") { ] include_dirs = [ - "$root_gen_dir/sky", + "$root_build_dir", ] } diff --git a/engine/platform/fonts/Font.cpp b/engine/platform/fonts/Font.cpp index 2f16eed9b8f..d01d25a1449 100644 --- a/engine/platform/fonts/Font.cpp +++ b/engine/platform/fonts/Font.cpp @@ -25,7 +25,7 @@ #include "platform/fonts/Font.h" #include "platform/LayoutUnit.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/Character.h" #include "platform/fonts/FontCache.h" #include "platform/fonts/FontFallbackList.h" diff --git a/engine/platform/fonts/FontCache.cpp b/engine/platform/fonts/FontCache.cpp index bc745f9bde9..fc5acdd2e61 100644 --- a/engine/platform/fonts/FontCache.cpp +++ b/engine/platform/fonts/FontCache.cpp @@ -30,9 +30,9 @@ #include "config.h" #include "platform/fonts/FontCache.h" -#include "platform/FontFamilyNames.h" +#include "gen/sky/platform/FontFamilyNames.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/AlternateFontFamily.h" #include "platform/fonts/FontCacheClient.h" #include "platform/fonts/FontCacheKey.h" diff --git a/engine/platform/fonts/FontDescription.cpp b/engine/platform/fonts/FontDescription.cpp index 1022de52bff..4a808454a2c 100644 --- a/engine/platform/fonts/FontDescription.cpp +++ b/engine/platform/fonts/FontDescription.cpp @@ -30,7 +30,7 @@ #include "config.h" #include "platform/fonts/FontDescription.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/text/AtomicStringHash.h" #include "wtf/text/StringHash.h" diff --git a/engine/platform/fonts/FontDescription.h b/engine/platform/fonts/FontDescription.h index 040d7109851..c74f8cc8869 100644 --- a/engine/platform/fonts/FontDescription.h +++ b/engine/platform/fonts/FontDescription.h @@ -25,7 +25,7 @@ #ifndef FontDescription_h #define FontDescription_h -#include "platform/FontFamilyNames.h" +#include "gen/sky/platform/FontFamilyNames.h" #include "platform/fonts/FixedPitchFontType.h" #include "platform/fonts/FontCacheKey.h" #include "platform/fonts/FontFamily.h" diff --git a/engine/platform/fonts/FontFallbackList.cpp b/engine/platform/fonts/FontFallbackList.cpp index 6943939dcd7..00bb7a55efc 100644 --- a/engine/platform/fonts/FontFallbackList.cpp +++ b/engine/platform/fonts/FontFallbackList.cpp @@ -29,7 +29,7 @@ #include "config.h" #include "platform/fonts/FontFallbackList.h" -#include "platform/FontFamilyNames.h" +#include "gen/sky/platform/FontFamilyNames.h" #include "platform/fonts/FontCache.h" #include "platform/fonts/FontDescription.h" #include "platform/fonts/FontFamily.h" diff --git a/engine/platform/fonts/harfbuzz/HarfBuzzShaper.cpp b/engine/platform/fonts/harfbuzz/HarfBuzzShaper.cpp index a84b151747c..7ebdca5c36f 100644 --- a/engine/platform/fonts/harfbuzz/HarfBuzzShaper.cpp +++ b/engine/platform/fonts/harfbuzz/HarfBuzzShaper.cpp @@ -34,7 +34,7 @@ #include "hb.h" #include "platform/LayoutUnit.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/Character.h" #include "platform/fonts/Font.h" #include "platform/fonts/GlyphBuffer.h" diff --git a/engine/platform/fonts/linux/FontPlatformDataLinux.cpp b/engine/platform/fonts/linux/FontPlatformDataLinux.cpp index 0191a3d0071..6c41ac126c2 100644 --- a/engine/platform/fonts/linux/FontPlatformDataLinux.cpp +++ b/engine/platform/fonts/linux/FontPlatformDataLinux.cpp @@ -33,7 +33,7 @@ #include "SkTypeface.h" #include "platform/LayoutTestSupport.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/fonts/FontPlatformData.h" #include "platform/graphics/GraphicsContext.h" #include "public/platform/linux/WebFontRenderStyle.h" diff --git a/engine/platform/fonts/opentype/OpenTypeSanitizer.cpp b/engine/platform/fonts/opentype/OpenTypeSanitizer.cpp index 1a6724407b9..5e8b4ea3942 100644 --- a/engine/platform/fonts/opentype/OpenTypeSanitizer.cpp +++ b/engine/platform/fonts/opentype/OpenTypeSanitizer.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "platform/fonts/opentype/OpenTypeSanitizer.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/SharedBuffer.h" #include "opentype-sanitiser.h" #include "ots-memory-stream.h" diff --git a/engine/platform/graphics/gpu/DrawingBuffer.cpp b/engine/platform/graphics/gpu/DrawingBuffer.cpp index 5f3cef7ce6c..689108c5a50 100644 --- a/engine/platform/graphics/gpu/DrawingBuffer.cpp +++ b/engine/platform/graphics/gpu/DrawingBuffer.cpp @@ -32,7 +32,7 @@ #include "platform/graphics/gpu/DrawingBuffer.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include #include "platform/TraceEvent.h" #include "platform/graphics/GraphicsLayer.h" diff --git a/engine/platform/graphics/gpu/DrawingBufferTest.cpp b/engine/platform/graphics/gpu/DrawingBufferTest.cpp index 46c2e39f880..acd2cdc5f85 100644 --- a/engine/platform/graphics/gpu/DrawingBufferTest.cpp +++ b/engine/platform/graphics/gpu/DrawingBufferTest.cpp @@ -32,7 +32,7 @@ #include "platform/graphics/gpu/DrawingBuffer.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/graphics/ImageBuffer.h" #include "platform/graphics/UnacceleratedImageBufferSurface.h" #include "platform/graphics/gpu/Extensions3DUtil.h" diff --git a/engine/web/ChromeClientImpl.cpp b/engine/web/ChromeClientImpl.cpp index a2c6dac461e..efe3a4f8308 100644 --- a/engine/web/ChromeClientImpl.cpp +++ b/engine/web/ChromeClientImpl.cpp @@ -46,7 +46,7 @@ #include "platform/Cursor.h" #include "platform/NotImplemented.h" #include "platform/PlatformScreen.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/exported/WrappedResourceRequest.h" #include "platform/geometry/FloatRect.h" #include "platform/geometry/IntRect.h" diff --git a/engine/web/FrameLoaderClientImpl.cpp b/engine/web/FrameLoaderClientImpl.cpp index 1300e28d150..baff0508d2c 100644 --- a/engine/web/FrameLoaderClientImpl.cpp +++ b/engine/web/FrameLoaderClientImpl.cpp @@ -46,7 +46,7 @@ #include "platform/exported/WrappedResourceResponse.h" #include "platform/MIMETypeRegistry.h" #include "platform/network/HTTPParsers.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/UserGestureIndicator.h" #include "public/platform/Platform.h" #include "public/platform/WebMimeRegistry.h" diff --git a/engine/web/Sky.cpp b/engine/web/Sky.cpp index 3affbfc6313..2e6256398f5 100644 --- a/engine/web/Sky.cpp +++ b/engine/web/Sky.cpp @@ -46,7 +46,7 @@ #include "platform/graphics/ImageDecodingStore.h" #include "platform/LayoutTestSupport.h" #include "platform/Logging.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "public/platform/Platform.h" #include "v8/include/v8.h" #include "wtf/Assertions.h" diff --git a/engine/web/WebRuntimeFeatures.cpp b/engine/web/WebRuntimeFeatures.cpp index 3c1afb19a5c..0f5db7561ca 100644 --- a/engine/web/WebRuntimeFeatures.cpp +++ b/engine/web/WebRuntimeFeatures.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "public/web/WebRuntimeFeatures.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "wtf/Assertions.h" namespace blink { diff --git a/engine/web/WebViewImpl.cpp b/engine/web/WebViewImpl.cpp index f81a5071e0a..4e8a90bda5c 100644 --- a/engine/web/WebViewImpl.cpp +++ b/engine/web/WebViewImpl.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "web/WebViewImpl.h" -#include "core/CSSValueKeywords.h" +#include "gen/sky/core/CSSValueKeywords.h" #include "core/dom/Document.h" #include "core/dom/DocumentMarkerController.h" #include "core/dom/NodeRenderingTraversal.h" @@ -50,7 +50,7 @@ #include "core/frame/Settings.h" #include "core/html/HTMLImportElement.h" #include "core/html/ime/InputMethodContext.h" -#include "core/HTMLNames.h" +#include "gen/sky/core/HTMLNames.h" #include "core/inspector/inspector_backend_mojo.h" #include "core/loader/FrameLoader.h" #include "core/loader/UniqueIdentifier.h" @@ -75,7 +75,7 @@ #include "platform/PlatformKeyboardEvent.h" #include "platform/PlatformMouseEvent.h" #include "platform/PlatformWheelEvent.h" -#include "platform/RuntimeEnabledFeatures.h" +#include "gen/sky/platform/RuntimeEnabledFeatures.h" #include "platform/scroll/Scrollbar.h" #include "platform/TraceEvent.h" #include "platform/UserGestureIndicator.h"