Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(758)

Unified Diff: sky/engine/core/core.gni

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/app/ModuleLoader.cpp ('k') | sky/engine/core/css/CSSComputedStyleDeclaration.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/core.gni
diff --git a/sky/engine/core/core.gni b/sky/engine/core/core.gni
index b89365517c74d72022e1b9054186760f6a0a48c3..24d23bddb9446eb5def11e0f31ecf224b034f41f 100644
--- a/sky/engine/core/core.gni
+++ b/sky/engine/core/core.gni
@@ -79,8 +79,6 @@ sky_core_files = [
"animation/DocumentAnimation.h",
"animation/DocumentAnimations.cpp",
"animation/DocumentAnimations.h",
- "animation/EffectInput.cpp",
- "animation/EffectInput.h",
"animation/ElementAnimation.h",
"animation/InertAnimation.cpp",
"animation/InertAnimation.h",
@@ -111,8 +109,6 @@ sky_core_files = [
"app/Application.h",
"app/Module.cpp",
"app/Module.h",
- "app/ModuleLoader.cpp",
- "app/ModuleLoader.h",
"css/BasicShapeFunctions.cpp",
"css/BasicShapeFunctions.h",
"css/BinaryDataFontFaceSource.cpp",
@@ -217,7 +213,6 @@ sky_core_files = [
"css/FontFaceCache.h",
"css/FontFaceSet.cpp",
"css/FontFaceSet.h",
- "css/FontFaceSetForEachCallback.h",
"css/FontFaceSetLoadEvent.cpp",
"css/FontFaceSetLoadEvent.h",
"css/FontLoader.cpp",
@@ -702,10 +697,6 @@ sky_core_files = [
"fetch/ResourceOwner.h",
"fetch/ResourcePtr.cpp",
"fetch/ResourcePtr.h",
- "frame/Console.cpp",
- "frame/Console.h",
- "frame/ConsoleBase.cpp",
- "frame/ConsoleBase.h",
"frame/ConsoleTypes.h",
"frame/DOMTimer.cpp",
"frame/DOMTimer.h",
@@ -938,26 +929,18 @@ sky_core_files = [
"inspector/ConsoleAPITypes.h",
"inspector/ConsoleMessage.cpp",
"inspector/ConsoleMessage.h",
- "inspector/ConsoleMessageStorage.cpp",
- "inspector/ConsoleMessageStorage.h",
"inspector/IdentifiersFactory.cpp",
"inspector/IdentifiersFactory.h",
- "inspector/InjectedScriptHost.cpp",
- "inspector/InjectedScriptHost.h",
"inspector/InspectorCounters.cpp",
"inspector/InspectorCounters.h",
"inspector/InspectorNodeIds.cpp",
"inspector/InspectorNodeIds.h",
- "inspector/JavaScriptCallFrame.cpp",
- "inspector/JavaScriptCallFrame.h",
- "inspector/ScriptArguments.cpp",
- "inspector/ScriptArguments.h",
- "inspector/ScriptAsyncCallStack.cpp",
- "inspector/ScriptAsyncCallStack.h",
"inspector/ScriptCallFrame.cpp",
"inspector/ScriptCallFrame.h",
"inspector/ScriptCallStack.cpp",
"inspector/ScriptCallStack.h",
+ "inspector/ScriptAsyncCallStack.cpp",
+ "inspector/ScriptAsyncCallStack.h",
"inspector/ScriptGCEventListener.h",
"loader/DocumentLoadTiming.cpp",
"loader/DocumentLoadTiming.h",
@@ -1172,6 +1155,14 @@ sky_core_files = [
"rendering/TextRunConstructor.h",
"rendering/TrailingFloatsRootInlineBox.h",
"rendering/VerticalPositionCache.h",
+ "script/dart_controller.cc",
+ "script/dart_controller.h",
+ "script/dart_dependency_catcher.cc",
+ "script/dart_dependency_catcher.h",
+ "script/dart_loader.cc",
+ "script/dart_loader.h",
+ "script/dom_dart_state.cc",
+ "script/dom_dart_state.h",
]
core_idl_files = get_path_info([
@@ -1181,25 +1172,15 @@ core_idl_files = get_path_info([
"animation/AnimationPlayer.idl",
"animation/AnimationTimeline.idl",
"animation/Timing.idl",
- "app/AbstractModule.idl",
- "app/Application.idl",
- "app/Module.idl",
"css/CSS.idl",
- "css/CSSFilterValue.idl",
"css/CSSMatrix.idl",
- "css/CSSPrimitiveValue.idl",
"css/CSSStyleDeclaration.idl",
- "css/CSSTransformValue.idl",
- "css/CSSValue.idl",
- "css/CSSValueList.idl",
"css/FontFace.idl",
"css/FontFaceSet.idl",
- "css/FontFaceSetForEachCallback.idl",
- "css/FontFaceSetLoadEvent.idl",
+
+ # "css/FontFaceSetLoadEvent.idl",
"css/MediaQueryList.idl",
"css/MediaQueryListEvent.idl",
- "css/Rect.idl",
- "css/RGBColor.idl",
"dom/Attr.idl",
"dom/CharacterData.idl",
"dom/ClientRect.idl",
@@ -1237,8 +1218,6 @@ core_idl_files = get_path_info([
"events/TransitionEvent.idl",
"events/UIEvent.idl",
"events/WheelEvent.idl",
- "frame/Console.idl",
- "frame/ConsoleBase.idl",
"frame/ImageBitmap.idl",
"frame/Location.idl",
"frame/Screen.idl",
@@ -1276,7 +1255,8 @@ core_idl_files = get_path_info([
"html/canvas/WebGLLoseContext.idl",
"html/canvas/WebGLProgram.idl",
"html/canvas/WebGLRenderbuffer.idl",
- "html/canvas/WebGLRenderingContext.idl",
+
+ # "html/canvas/WebGLRenderingContext.idl",
"html/canvas/WebGLShader.idl",
"html/canvas/WebGLShaderPrecisionFormat.idl",
"html/canvas/WebGLTexture.idl",
@@ -1297,8 +1277,6 @@ core_idl_files = get_path_info([
"html/ImageData.idl",
"html/TextMetrics.idl",
"html/VoidCallback.idl",
- "inspector/JavaScriptCallFrame.idl",
- "inspector/InjectedScriptHost.idl",
],
"abspath")
« no previous file with comments | « sky/engine/core/app/ModuleLoader.cpp ('k') | sky/engine/core/css/CSSComputedStyleDeclaration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698