Dart snapshot runs & and few other misc things.

TBR=alanknight@google.com,jacobr@google.com

Review URL: https://codereview.chromium.org/1653163002 .

git-svn-id: https://src.chromium.org/blink/branches/dart/2454_1@202761 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/Source/bindings/core/dart/DartInjectedScript.cpp b/Source/bindings/core/dart/DartInjectedScript.cpp
index 4ebaba7..68e2416 100644
--- a/Source/bindings/core/dart/DartInjectedScript.cpp
+++ b/Source/bindings/core/dart/DartInjectedScript.cpp
@@ -843,7 +843,7 @@
                 .setLineNumber(0);
 
             *result = FunctionDetails::create()
-                .setIsGenerator(true)
+                .setIsGenerator(false)
                 .setFunctionName("DartClosure")
                 .release();
             (*result)->setLocation(locationJson);
diff --git a/Source/bindings/core/dart/DartUtilities.cpp b/Source/bindings/core/dart/DartUtilities.cpp
index 935303b..3c9d86e 100644
--- a/Source/bindings/core/dart/DartUtilities.cpp
+++ b/Source/bindings/core/dart/DartUtilities.cpp
@@ -1045,12 +1045,14 @@
         }
 
         if (Dart_IsByteBuffer(element)) {
+/* TODO(terry): Comment out to build 45 Roll - fix/review.
             element = Dart_GetDataFromByteBuffer(element);
             RefPtr<ArrayBuffer> arrayBuffer = DartUtilities::dartToExternalizedArrayBuffer(element, exception);
             ASSERT(!exception);
             ASSERT(arrayBuffer);
             arrayBuffers.append(arrayBuffer);
             continue;
+*/
         }
 
         exception = Dart_NewStringFromCString("TransferArray argument must contain only Transferables");
diff --git a/Source/bindings/core/dart/dart-extras.gypi b/Source/bindings/core/dart/dart-extras.gypi
index 282dbba..277b8f3 100644
--- a/Source/bindings/core/dart/dart-extras.gypi
+++ b/Source/bindings/core/dart/dart-extras.gypi
@@ -92,7 +92,7 @@
           'variables': {
             'output_path': '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/dart',
             'pure_libs': [
-              '<(global_dart_output_dir)/_blink_dartium.dart',
+              '<(dart_lib_dir)/_blink/dartium/_blink_dartium.dart',
               '<(dart_dir)/runtime/bin/vmserviceio_dartium.dart',
               '<(dart_lib_dir)/html/html_common/html_common.dart',
               '<(dart_lib_dir)/js/dartium/js_dartium.dart',
diff --git a/Source/core/core.gyp b/Source/core/core.gyp
index 7b20891..c21fb87 100644
--- a/Source/core/core.gyp
+++ b/Source/core/core.gyp
@@ -34,6 +34,8 @@
     '../build/features.gypi',
     '../build/scripts/scripts.gypi',
     '../bindings/core/core.gypi',  # core can depend on bindings/core, but not on bindings
+    '../modules/modules.gypi',                   # FIXMEDART: dart-extras.gypi has a reference
+    '../bindings/core/dart/dart-extras.gypi',    # FIXMEDART: dart_snapshot defined
     'core.gypi',
   ],
 
@@ -177,7 +179,7 @@
         'inspector_protocol_sources',
         'inspector_instrumentation_sources',
         '../bindings/core/v8/generated.gyp:bindings_core_v8_generated',
-#        '../bindings/core/dart/generated.gyp:dart_snapshot',
+        'dart_snapshot',                         # FIXMEDART: generate dart_snapshot
         # FIXME: don't depend on bindings_modules http://crbug.com/358074
         '../bindings/modules/generated.gyp:modules_event_generated',
         '../bindings/modules/v8/generated.gyp:bindings_modules_v8_generated',
@@ -249,7 +251,7 @@
         '../bindings/core/v8/generated.gyp:bindings_core_v8_generated',
         # FIXME: don't depend on bindings_modules http://crbug.com/358074
         '../bindings/modules/v8/generated.gyp:bindings_modules_v8_generated',
-#        '../bindings/core/dart/generated.gyp:dart_snapshot',
+        'dart_snapshot',                          # FIXMEDART: generate dart_snapshot
         '../wtf/wtf.gyp:wtf',
         '../config.gyp:config',
         '../platform/blink_platform.gyp:blink_platform',