From c6d67998ccfe2f15ad50cb1e6988ef12b3c721e5 Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Mon, 17 Aug 2015 17:01:27 -0700
Subject: [PATCH 1/2] Revert "Temporarily roll back dart dependency to work
 around build errors"

This reverts commit 2042a0f0adbde9a16ccd9ff9a414e70bc7871386.
---
 DEPS                                      |  2 +-
 sky/engine/core/script/dart_controller.cc | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/DEPS b/DEPS
index 5545d837c9a..059d4ff982e 100644
--- a/DEPS
+++ b/DEPS
@@ -20,7 +20,7 @@
 vars = {
   'chromium_git': 'https://chromium.googlesource.com',
   'skia_revision': '29ccdf86ab0a1649fd775c9431891bacb1391e99',
-  'dart_revision': '38b9945cfd7cb2cc587df013d4d31ae028d99f6b',
+  'dart_revision': '0210c5c035c0cb2aa8cf379abbce88ffee1e6f54',
   'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485',
 
   'buildtools_revision': '5215ee866bc3e8eb4a7f124212845abf4029e60b',
diff --git a/sky/engine/core/script/dart_controller.cc b/sky/engine/core/script/dart_controller.cc
index 4195c8b460a..8f9bb0a5334 100644
--- a/sky/engine/core/script/dart_controller.cc
+++ b/sky/engine/core/script/dart_controller.cc
@@ -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

From f5bf47f151a42bf608c5c19d2d73fe826e894d5b Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Mon, 17 Aug 2015 17:08:23 -0700
Subject: [PATCH 2/2] Update Dart dep to include fixes for build breaks on
 Clang

---
 DEPS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 059d4ff982e..d14b8e5283d 100644
--- a/DEPS
+++ b/DEPS
@@ -20,7 +20,7 @@
 vars = {
   'chromium_git': 'https://chromium.googlesource.com',
   'skia_revision': '29ccdf86ab0a1649fd775c9431891bacb1391e99',
-  'dart_revision': '0210c5c035c0cb2aa8cf379abbce88ffee1e6f54',
+  'dart_revision': '95c951ad190f156eb61b99203c2e4948211c44a7',
   'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485',
 
   'buildtools_revision': '5215ee866bc3e8eb4a7f124212845abf4029e60b',