Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
f0967c24
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f0967c24
编写于
8月 05, 2016
作者:
A
Adam Barth
提交者:
GitHub
8月 05, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove more //base dependencies (#2870)
WTF is now //base clean.
上级
24511c92
变更
23
隐藏空白更改
内联
并排
Showing
23 changed file
with
29 addition
and
60 deletion
+29
-60
flutter/lib/ui/painting/image_decoding.cc
flutter/lib/ui/painting/image_decoding.cc
+1
-4
sky/engine/core/BUILD.gn
sky/engine/core/BUILD.gn
+1
-0
sky/engine/core/rendering/RenderLayer.cpp
sky/engine/core/rendering/RenderLayer.cpp
+0
-1
sky/engine/core/rendering/RenderObject.cpp
sky/engine/core/rendering/RenderObject.cpp
+0
-1
sky/engine/core/rendering/RenderView.cpp
sky/engine/core/rendering/RenderView.cpp
+0
-2
sky/engine/core/script/dart_controller.cc
sky/engine/core/script/dart_controller.cc
+5
-6
sky/engine/core/script/dart_init.cc
sky/engine/core/script/dart_init.cc
+2
-2
sky/engine/core/script/dart_init.h
sky/engine/core/script/dart_init.h
+2
-2
sky/engine/core/script/directory_asset_bundle.cc
sky/engine/core/script/directory_asset_bundle.cc
+0
-2
sky/engine/core/script/directory_asset_bundle.h
sky/engine/core/script/directory_asset_bundle.h
+1
-2
sky/engine/core/text/Paragraph.cpp
sky/engine/core/text/Paragraph.cpp
+0
-1
sky/engine/core/text/ParagraphBuilder.cpp
sky/engine/core/text/ParagraphBuilder.cpp
+1
-2
sky/engine/platform/BUILD.gn
sky/engine/platform/BUILD.gn
+0
-1
sky/engine/platform/SharedBuffer.cpp
sky/engine/platform/SharedBuffer.cpp
+0
-1
sky/engine/platform/TraceEvent.h
sky/engine/platform/TraceEvent.h
+0
-5
sky/engine/platform/fonts/apple/FontCacheMac.cpp
sky/engine/platform/fonts/apple/FontCacheMac.cpp
+2
-2
sky/engine/platform/graphics/GraphicsContext.cpp
sky/engine/platform/graphics/GraphicsContext.cpp
+1
-4
sky/engine/platform/graphics/Image.cpp
sky/engine/platform/graphics/Image.cpp
+0
-1
sky/engine/public/sky/BUILD.gn
sky/engine/public/sky/BUILD.gn
+1
-0
sky/engine/public/sky/sky_view.cc
sky/engine/public/sky/sky_view.cc
+1
-2
sky/engine/wtf/BUILD.gn
sky/engine/wtf/BUILD.gn
+1
-6
sky/engine/wtf/testing/RunAllTests.cpp
sky/engine/wtf/testing/RunAllTests.cpp
+6
-8
sky/shell/tracing_controller.cc
sky/shell/tracing_controller.cc
+4
-5
未找到文件。
flutter/lib/ui/painting/image_decoding.cc
浏览文件 @
f0967c24
...
@@ -4,15 +4,12 @@
...
@@ -4,15 +4,12 @@
#include "flutter/lib/ui/painting/image_decoding.h"
#include "flutter/lib/ui/painting/image_decoding.h"
#include "base/bind.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/trace_event/trace_event.h"
#include "flow/texture_image.h"
#include "flow/texture_image.h"
#include "flutter/lib/ui/painting/image.h"
#include "flutter/lib/ui/painting/image.h"
#include "flutter/tonic/dart_persistent_value.h"
#include "flutter/tonic/dart_persistent_value.h"
#include "flutter/tonic/mojo_converter.h"
#include "flutter/tonic/mojo_converter.h"
#include "glue/movable_wrapper.h"
#include "glue/movable_wrapper.h"
#include "glue/trace_event.h"
#include "lib/tonic/logging/dart_invoke.h"
#include "lib/tonic/logging/dart_invoke.h"
#include "lib/tonic/typed_data/uint8_list.h"
#include "lib/tonic/typed_data/uint8_list.h"
#include "sky/engine/platform/mojo/data_pipe.h"
#include "sky/engine/platform/mojo/data_pipe.h"
...
...
sky/engine/core/BUILD.gn
浏览文件 @
f0967c24
...
@@ -13,6 +13,7 @@ source_set("libraries") {
...
@@ -13,6 +13,7 @@ source_set("libraries") {
"//flow",
"//flow",
"//flutter/lib/ui",
"//flutter/lib/ui",
"//flutter/tonic",
"//flutter/tonic",
"//glue",
"//lib/ftl",
"//lib/ftl",
"//mojo/application",
"//mojo/application",
"//mojo/data_pipe_utils",
"//mojo/data_pipe_utils",
...
...
sky/engine/core/rendering/RenderLayer.cpp
浏览文件 @
f0967c24
...
@@ -52,7 +52,6 @@
...
@@ -52,7 +52,6 @@
#include "sky/engine/core/rendering/RenderView.h"
#include "sky/engine/core/rendering/RenderView.h"
#include "sky/engine/platform/LengthFunctions.h"
#include "sky/engine/platform/LengthFunctions.h"
#include "sky/engine/platform/Partitions.h"
#include "sky/engine/platform/Partitions.h"
#include "sky/engine/platform/TraceEvent.h"
#include "sky/engine/platform/geometry/FloatPoint3D.h"
#include "sky/engine/platform/geometry/FloatPoint3D.h"
#include "sky/engine/platform/geometry/FloatRect.h"
#include "sky/engine/platform/geometry/FloatRect.h"
#include "sky/engine/platform/geometry/TransformState.h"
#include "sky/engine/platform/geometry/TransformState.h"
...
...
sky/engine/core/rendering/RenderObject.cpp
浏览文件 @
f0967c24
...
@@ -39,7 +39,6 @@
...
@@ -39,7 +39,6 @@
#include "sky/engine/core/rendering/RenderView.h"
#include "sky/engine/core/rendering/RenderView.h"
#include "sky/engine/core/rendering/style/ShadowList.h"
#include "sky/engine/core/rendering/style/ShadowList.h"
#include "sky/engine/platform/Partitions.h"
#include "sky/engine/platform/Partitions.h"
#include "sky/engine/platform/TraceEvent.h"
#include "sky/engine/platform/geometry/TransformState.h"
#include "sky/engine/platform/geometry/TransformState.h"
#include "sky/engine/platform/graphics/GraphicsContext.h"
#include "sky/engine/platform/graphics/GraphicsContext.h"
#include "sky/engine/wtf/RefCountedLeakCounter.h"
#include "sky/engine/wtf/RefCountedLeakCounter.h"
...
...
sky/engine/core/rendering/RenderView.cpp
浏览文件 @
f0967c24
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
#include "sky/engine/core/rendering/HitTestResult.h"
#include "sky/engine/core/rendering/HitTestResult.h"
#include "sky/engine/core/rendering/RenderGeometryMap.h"
#include "sky/engine/core/rendering/RenderGeometryMap.h"
#include "sky/engine/core/rendering/RenderLayer.h"
#include "sky/engine/core/rendering/RenderLayer.h"
#include "sky/engine/platform/TraceEvent.h"
#include "sky/engine/platform/geometry/FloatQuad.h"
#include "sky/engine/platform/geometry/FloatQuad.h"
#include "sky/engine/platform/geometry/TransformState.h"
#include "sky/engine/platform/geometry/TransformState.h"
#include "sky/engine/platform/graphics/GraphicsContext.h"
#include "sky/engine/platform/graphics/GraphicsContext.h"
...
@@ -60,7 +59,6 @@ bool RenderView::hitTest(const HitTestRequest& request, HitTestResult& result)
...
@@ -60,7 +59,6 @@ bool RenderView::hitTest(const HitTestRequest& request, HitTestResult& result)
bool
RenderView
::
hitTest
(
const
HitTestRequest
&
request
,
const
HitTestLocation
&
location
,
HitTestResult
&
result
)
bool
RenderView
::
hitTest
(
const
HitTestRequest
&
request
,
const
HitTestLocation
&
location
,
HitTestResult
&
result
)
{
{
TRACE_EVENT0
(
"blink"
,
"RenderView::hitTest"
);
m_hitTestCount
++
;
m_hitTestCount
++
;
// TODO(ojan): Does any of this intersection stuff make sense for Sky?
// TODO(ojan): Does any of this intersection stuff make sense for Sky?
...
...
sky/engine/core/script/dart_controller.cc
浏览文件 @
f0967c24
...
@@ -5,21 +5,20 @@
...
@@ -5,21 +5,20 @@
#include "sky/engine/core/script/dart_controller.h"
#include "sky/engine/core/script/dart_controller.h"
#include "base/bind.h"
#include "base/bind.h"
#include "base/single_thread_task_runner.h"
#include "base/trace_event/trace_event.h"
#include "dart/runtime/include/dart_tools_api.h"
#include "dart/runtime/include/dart_tools_api.h"
#include "lib/tonic/scopes/dart_api_scope.h"
#include "flutter/tonic/dart_class_library.h"
#include "flutter/tonic/dart_class_library.h"
#include "flutter/tonic/dart_dependency_catcher.h"
#include "flutter/tonic/dart_dependency_catcher.h"
#include "lib/tonic/logging/dart_error.h"
#include "lib/tonic/logging/dart_invoke.h"
#include "flutter/tonic/dart_io.h"
#include "flutter/tonic/dart_io.h"
#include "lib/tonic/scopes/dart_isolate_scope.h"
#include "flutter/tonic/dart_library_loader.h"
#include "flutter/tonic/dart_library_loader.h"
#include "flutter/tonic/dart_message_handler.h"
#include "flutter/tonic/dart_message_handler.h"
#include "flutter/tonic/dart_snapshot_loader.h"
#include "flutter/tonic/dart_snapshot_loader.h"
#include "flutter/tonic/dart_state.h"
#include "flutter/tonic/dart_state.h"
#include "flutter/tonic/dart_wrappable.h"
#include "flutter/tonic/dart_wrappable.h"
#include "glue/trace_event.h"
#include "lib/tonic/logging/dart_error.h"
#include "lib/tonic/logging/dart_invoke.h"
#include "lib/tonic/scopes/dart_api_scope.h"
#include "lib/tonic/scopes/dart_isolate_scope.h"
#include "mojo/data_pipe_utils/data_pipe_utils.h"
#include "mojo/data_pipe_utils/data_pipe_utils.h"
#include "mojo/public/cpp/system/data_pipe.h"
#include "mojo/public/cpp/system/data_pipe.h"
#include "sky/engine/bindings/dart_mojo_internal.h"
#include "sky/engine/bindings/dart_mojo_internal.h"
...
...
sky/engine/core/script/dart_init.cc
浏览文件 @
f0967c24
...
@@ -486,7 +486,7 @@ static void EmbedderTimelineStartRecording() {
...
@@ -486,7 +486,7 @@ static void EmbedderTimelineStartRecording() {
if
(
!
callbacks
)
{
if
(
!
callbacks
)
{
return
;
return
;
}
}
callbacks
->
start_tracing_callback
.
Run
();
callbacks
->
start_tracing_callback
();
}
}
static
void
EmbedderTimelineStopRecording
()
{
static
void
EmbedderTimelineStopRecording
()
{
...
@@ -494,7 +494,7 @@ static void EmbedderTimelineStopRecording() {
...
@@ -494,7 +494,7 @@ static void EmbedderTimelineStopRecording() {
if
(
!
callbacks
)
{
if
(
!
callbacks
)
{
return
;
return
;
}
}
callbacks
->
stop_tracing_callback
.
Run
();
callbacks
->
stop_tracing_callback
();
}
}
void
SetServiceIsolateHook
(
ServiceIsolateHook
hook
)
{
void
SetServiceIsolateHook
(
ServiceIsolateHook
hook
)
{
...
...
sky/engine/core/script/dart_init.h
浏览文件 @
f0967c24
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
#ifndef SKY_ENGINE_CORE_SCRIPT_DART_INIT_H_
#ifndef SKY_ENGINE_CORE_SCRIPT_DART_INIT_H_
#define SKY_ENGINE_CORE_SCRIPT_DART_INIT_H_
#define SKY_ENGINE_CORE_SCRIPT_DART_INIT_H_
#include "base/callback.h"
#include "dart/runtime/include/dart_api.h"
#include "dart/runtime/include/dart_api.h"
#include "lib/ftl/functional/closure.h"
#include "sky/engine/wtf/OperatingSystem.h"
#include "sky/engine/wtf/OperatingSystem.h"
#include <string>
#include <string>
...
@@ -39,7 +39,7 @@ extern const char kSnapshotAssetKey[];
...
@@ -39,7 +39,7 @@ extern const char kSnapshotAssetKey[];
bool
IsRunningPrecompiledCode
();
bool
IsRunningPrecompiledCode
();
using
EmbedderTracingCallback
=
base
::
Callback
<
void
(
void
)
>
;
using
EmbedderTracingCallback
=
ftl
::
Closure
;
typedef
void
(
*
ServiceIsolateHook
)(
bool
);
typedef
void
(
*
ServiceIsolateHook
)(
bool
);
typedef
void
(
*
RegisterNativeServiceProtocolExtensionHook
)(
bool
);
typedef
void
(
*
RegisterNativeServiceProtocolExtensionHook
)(
bool
);
...
...
sky/engine/core/script/directory_asset_bundle.cc
浏览文件 @
f0967c24
...
@@ -5,9 +5,7 @@
...
@@ -5,9 +5,7 @@
#include "sky/engine/core/script/directory_asset_bundle.h"
#include "sky/engine/core/script/directory_asset_bundle.h"
#include "base/bind.h"
#include "base/bind.h"
#include "base/location.h"
#include "base/task_runner.h"
#include "base/task_runner.h"
#include "base/message_loop/message_loop.h"
#include "base/threading/worker_pool.h"
#include "base/threading/worker_pool.h"
#include "mojo/data_pipe_utils/data_pipe_utils.h"
#include "mojo/data_pipe_utils/data_pipe_utils.h"
...
...
sky/engine/core/script/directory_asset_bundle.h
浏览文件 @
f0967c24
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
#define SKY_ENGINE_CORE_SCRIPT_DIRECTORY_ASSET_BUNDLE_H_
#define SKY_ENGINE_CORE_SCRIPT_DIRECTORY_ASSET_BUNDLE_H_
#include "base/files/file_path.h"
#include "base/files/file_path.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/environment/async_waiter.h"
#include "mojo/public/cpp/environment/async_waiter.h"
...
@@ -39,4 +38,4 @@ class DirectoryAssetBundleService : public mojo::asset_bundle::AssetBundle {
...
@@ -39,4 +38,4 @@ class DirectoryAssetBundleService : public mojo::asset_bundle::AssetBundle {
}
// namespace blink
}
// namespace blink
#endif // SKY_ENGINE_CORE_SCRIPT_DIRECTORY_ASSET_BUNDLE_H_
#endif // SKY_ENGINE_CORE_SCRIPT_DIRECTORY_ASSET_BUNDLE_H_
\ No newline at end of file
sky/engine/core/text/Paragraph.cpp
浏览文件 @
f0967c24
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
#include "sky/engine/core/text/ParagraphBuilder.h"
#include "sky/engine/core/text/ParagraphBuilder.h"
#include "base/location.h"
#include "flutter/tonic/dart_args.h"
#include "flutter/tonic/dart_args.h"
#include "flutter/tonic/dart_binding_macros.h"
#include "flutter/tonic/dart_binding_macros.h"
#include "flutter/tonic/dart_library_natives.h"
#include "flutter/tonic/dart_library_natives.h"
...
...
sky/engine/core/text/ParagraphBuilder.cpp
浏览文件 @
f0967c24
...
@@ -4,12 +4,11 @@
...
@@ -4,12 +4,11 @@
#include "sky/engine/core/text/ParagraphBuilder.h"
#include "sky/engine/core/text/ParagraphBuilder.h"
#include "base/location.h"
#include "flutter/tonic/dart_args.h"
#include "flutter/tonic/dart_args.h"
#include "flutter/tonic/dart_binding_macros.h"
#include "flutter/tonic/dart_binding_macros.h"
#include "flutter/tonic/dart_library_natives.h"
#include "lib/ftl/tasks/task_runner.h"
#include "lib/ftl/tasks/task_runner.h"
#include "lib/tonic/converter/dart_converter.h"
#include "lib/tonic/converter/dart_converter.h"
#include "flutter/tonic/dart_library_natives.h"
#include "sky/engine/core/rendering/RenderInline.h"
#include "sky/engine/core/rendering/RenderInline.h"
#include "sky/engine/core/rendering/RenderParagraph.h"
#include "sky/engine/core/rendering/RenderParagraph.h"
#include "sky/engine/core/rendering/RenderText.h"
#include "sky/engine/core/rendering/RenderText.h"
...
...
sky/engine/platform/BUILD.gn
浏览文件 @
f0967c24
...
@@ -31,7 +31,6 @@ source_set("platform") {
...
@@ -31,7 +31,6 @@ source_set("platform") {
"PurgeableVector.h",
"PurgeableVector.h",
"SharedBuffer.cpp",
"SharedBuffer.cpp",
"SharedBuffer.h",
"SharedBuffer.h",
"TraceEvent.h",
"animation/AnimationUtilities.h",
"animation/AnimationUtilities.h",
"animation/AnimationValue.h",
"animation/AnimationValue.h",
"animation/KeyframeValueList.cpp",
"animation/KeyframeValueList.cpp",
...
...
sky/engine/platform/SharedBuffer.cpp
浏览文件 @
f0967c24
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
#include "sky/engine/platform/SharedBuffer.h"
#include "sky/engine/platform/SharedBuffer.h"
#include "base/bind.h"
#include "sky/engine/public/platform/Platform.h"
#include "sky/engine/public/platform/Platform.h"
#include "sky/engine/wtf/unicode/UTF8.h"
#include "sky/engine/wtf/unicode/UTF8.h"
#include "sky/engine/wtf/unicode/Unicode.h"
#include "sky/engine/wtf/unicode/Unicode.h"
...
...
sky/engine/platform/TraceEvent.h
已删除
100644 → 0
浏览文件 @
24511c92
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/trace_event/trace_event.h"
sky/engine/platform/fonts/apple/FontCacheMac.cpp
浏览文件 @
f0967c24
...
@@ -28,15 +28,15 @@
...
@@ -28,15 +28,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
*/
#include "lib/ftl/logging.h"
#include "sky/engine/platform/fonts/FontCache.h"
#include "sky/engine/platform/fonts/FontCache.h"
#include "base/logging.h"
namespace
blink
{
namespace
blink
{
void
FontCache
::
getFontForCharacter
(
UChar32
,
void
FontCache
::
getFontForCharacter
(
UChar32
,
const
char
*
,
const
char
*
,
FontCache
::
PlatformFallbackFont
*
)
{
FontCache
::
PlatformFallbackFont
*
)
{
LOG
(
INFO
)
<<
"Font fallbacks unimplemented on Mac."
;
FTL_
LOG
(
INFO
)
<<
"Font fallbacks unimplemented on Mac."
;
}
}
}
// namespace blink
}
// namespace blink
sky/engine/platform/graphics/GraphicsContext.cpp
浏览文件 @
f0967c24
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
#include "sky/engine/platform/graphics/GraphicsContext.h"
#include "sky/engine/platform/graphics/GraphicsContext.h"
#include "sky/engine/platform/TraceEvent.h"
#include "sky/engine/platform/geometry/IntRect.h"
#include "sky/engine/platform/geometry/IntRect.h"
#include "sky/engine/platform/geometry/RoundedRect.h"
#include "sky/engine/platform/geometry/RoundedRect.h"
#include "sky/engine/platform/graphics/Gradient.h"
#include "sky/engine/platform/graphics/Gradient.h"
...
@@ -1473,10 +1472,8 @@ SkPMColor GraphicsContext::antiColors2(int index)
...
@@ -1473,10 +1472,8 @@ SkPMColor GraphicsContext::antiColors2(int index)
void
GraphicsContext
::
didDrawTextInRect
(
const
SkRect
&
textRect
)
void
GraphicsContext
::
didDrawTextInRect
(
const
SkRect
&
textRect
)
{
{
if
(
m_trackTextRegion
)
{
if
(
m_trackTextRegion
)
TRACE_EVENT0
(
"skia"
,
"GraphicsContext::didDrawTextInRect"
);
m_textRegion
.
join
(
textRect
);
m_textRegion
.
join
(
textRect
);
}
}
}
void
GraphicsContext
::
preparePaintForDrawRectToRect
(
void
GraphicsContext
::
preparePaintForDrawRectToRect
(
...
...
sky/engine/platform/graphics/Image.cpp
浏览文件 @
f0967c24
...
@@ -28,7 +28,6 @@
...
@@ -28,7 +28,6 @@
#include "sky/engine/platform/Length.h"
#include "sky/engine/platform/Length.h"
#include "sky/engine/platform/SharedBuffer.h"
#include "sky/engine/platform/SharedBuffer.h"
#include "sky/engine/platform/TraceEvent.h"
#include "sky/engine/platform/geometry/FloatPoint.h"
#include "sky/engine/platform/geometry/FloatPoint.h"
#include "sky/engine/platform/geometry/FloatRect.h"
#include "sky/engine/platform/geometry/FloatRect.h"
#include "sky/engine/platform/geometry/FloatSize.h"
#include "sky/engine/platform/geometry/FloatSize.h"
...
...
sky/engine/public/sky/BUILD.gn
浏览文件 @
f0967c24
...
@@ -7,6 +7,7 @@ source_set("sky") {
...
@@ -7,6 +7,7 @@ source_set("sky") {
"//base",
"//base",
"//flow",
"//flow",
"//flutter/lib/ui",
"//flutter/lib/ui",
"//glue",
"//lib/ftl/",
"//lib/ftl/",
"//mojo/public/cpp/system",
"//mojo/public/cpp/system",
"//mojo/services/network/interfaces",
"//mojo/services/network/interfaces",
...
...
sky/engine/public/sky/sky_view.cc
浏览文件 @
f0967c24
...
@@ -4,9 +4,8 @@
...
@@ -4,9 +4,8 @@
#include "sky/engine/public/sky/sky_view.h"
#include "sky/engine/public/sky/sky_view.h"
#include "base/bind.h"
#include "base/trace_event/trace_event.h"
#include "flutter/lib/ui/compositing/scene.h"
#include "flutter/lib/ui/compositing/scene.h"
#include "glue/trace_event.h"
#include "sky/engine/core/script/dart_controller.h"
#include "sky/engine/core/script/dart_controller.h"
#include "sky/engine/core/script/ui_dart_state.h"
#include "sky/engine/core/script/ui_dart_state.h"
#include "sky/engine/core/window/window.h"
#include "sky/engine/core/window/window.h"
...
...
sky/engine/wtf/BUILD.gn
浏览文件 @
f0967c24
...
@@ -192,7 +192,6 @@ component("wtf") {
...
@@ -192,7 +192,6 @@ component("wtf") {
]
]
deps = [
deps = [
"//base",
"//glue",
"//glue",
"//third_party/icu",
"//third_party/icu",
]
]
...
@@ -240,11 +239,7 @@ test("unittests") {
...
@@ -240,11 +239,7 @@ test("unittests") {
deps = [
deps = [
":test_support",
":test_support",
":wtf",
":wtf",
"//base",
"//third_party/gtest",
"//base/allocator",
"//base/test:test_support",
"//testing/gmock",
"//testing/gtest",
]
]
}
}
...
...
sky/engine/wtf/testing/RunAllTests.cpp
浏览文件 @
f0967c24
...
@@ -28,15 +28,13 @@
...
@@ -28,15 +28,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
*/
#include "gtest/gtest.h"
#include <string.h>
#include "base/test/test_suite.h"
#include "sky/engine/wtf/MainThread.h"
#include "sky/engine/wtf/MainThread.h"
#include "sky/engine/wtf/WTF.h"
#include "sky/engine/wtf/WTF.h"
int
main
(
int
argc
,
char
**
argv
)
int
main
(
int
argc
,
char
**
argv
)
{
{
WTF
::
initialize
();
WTF
::
initialize
();
WTF
::
initializeMainThread
();
WTF
::
initializeMainThread
(
);
testing
::
InitGoogleTest
(
&
argc
,
argv
);
return
base
::
RunUnitTestsUsingBaseTestSuite
(
argc
,
argv
);
return
RUN_ALL_TESTS
(
);
}
}
sky/shell/tracing_controller.cc
浏览文件 @
f0967c24
...
@@ -18,10 +18,8 @@ namespace shell {
...
@@ -18,10 +18,8 @@ namespace shell {
TracingController
::
TracingController
()
TracingController
::
TracingController
()
:
picture_tracing_enabled_
(
false
),
tracing_active_
(
false
)
{
:
picture_tracing_enabled_
(
false
),
tracing_active_
(
false
)
{
auto
start
=
auto
start
=
[
this
]()
{
StartTracing
();
};
base
::
Bind
(
&
TracingController
::
StartTracing
,
base
::
Unretained
(
this
));
auto
stop
=
[
this
]()
{
StopTracing
();
};
auto
stop
=
base
::
Bind
(
&
TracingController
::
StopTracing
,
base
::
Unretained
(
this
));
blink
::
SetEmbedderTracingCallbacks
(
blink
::
SetEmbedderTracingCallbacks
(
WTF
::
MakeUnique
<
blink
::
EmbedderTracingCallbacks
>
(
start
,
stop
));
WTF
::
MakeUnique
<
blink
::
EmbedderTracingCallbacks
>
(
start
,
stop
));
...
@@ -178,7 +176,8 @@ void TracingController::StartTracing() {
...
@@ -178,7 +176,8 @@ void TracingController::StartTracing() {
void
TracingController
::
StartBaseTracing
()
{
void
TracingController
::
StartBaseTracing
()
{
namespace
TE
=
base
::
trace_event
;
namespace
TE
=
base
::
trace_event
;
auto
config
=
TE
::
TraceConfig
(
"*,disabled-by-default-skia"
,
TE
::
RECORD_CONTINUOUSLY
);
auto
config
=
TE
::
TraceConfig
(
"*,disabled-by-default-skia"
,
TE
::
RECORD_CONTINUOUSLY
);
auto
log
=
TE
::
TraceLog
::
GetInstance
();
auto
log
=
TE
::
TraceLog
::
GetInstance
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录