DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #667 from chinmaygarde/master

Browse Source 
Fix iOS build breaks due to recent dart roll
This commit is contained in:
Chinmay Garde 2015-08-17 17:12:36 -07:00
commit bee0c4b2aa
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -20,7 +20,7 @@
vars = {
'chromium_git': 'https://chromium.googlesource.com',
'skia_revision': '29ccdf86ab0a1649fd775c9431891bacb1391e99',
'dart_revision': '38b9945cfd7cb2cc587df013d4d31ae028d99f6b',
'dart_revision': '95c951ad190f156eb61b99203c2e4948211c44a7',
'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485',
'buildtools_revision': '5215ee866bc3e8eb4a7f124212845abf4029e60b',

10
sky/engine/core/script/dart_controller.cc
View File

@ -159,8 +159,6 @@ void DartController::InstallView(View* view) {
builtin_sky_->InstallView(view);
}
#if 0
// Re-enable on resolution of https://github.com/domokit/sky_engine/issues/654
static void DartController_DartStreamConsumer(
Dart_StreamConsumer_State state,
const char* stream_name,
@ -179,21 +177,16 @@ static void DartController_DartStreamConsumer(
mojo::common::BlockingCopyFromString(data, *handle);
}
}
#endif
void DartController::StartTracing() {
#if 0
// Re-enable on resolution of https://github.com/domokit/sky_engine/issues/654
DartIsolateScope isolate_scope(dart_state()->isolate());
DartApiScope dart_api_scope;
Dart_TimelineSetRecordedStreams(DART_TIMELINE_STREAM_ALL);
#endif
}
void DartController::StopTracing(
mojo::ScopedDataPipeProducerHandle producer) {
#if 0
// Re-enable on resolution of https://github.com/domokit/sky_engine/issues/654
DartIsolateScope isolate_scope(dart_state()->isolate());
DartApiScope dart_api_scope;
@ -202,7 +195,6 @@ void DartController::StopTracing(
auto callback =
reinterpret_cast<Dart_StreamConsumer>(&DartController_DartStreamConsumer);
Dart_TimelineGetTrace(callback, &producer);
#endif
}
} // namespace blink