Merge DevTools Refactor CL to Blink36

Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp

 /*
  * Copyright (C) 2007-2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 
 #include "V8Database.h"
 #include "V8EventTarget.h"
 #include "V8HTMLAllCollection.h"
 #include "V8HTMLCollection.h"
 #include "V8Node.h"
 #include "V8NodeList.h"
 #include "V8Storage.h"
 #include "bindings/common/ScriptValue.h"
 #include "bindings/dart/DartHandleProxy.h"
-#include "bindings/dart/DartInjectedScriptHostHelper.h"
 #include "bindings/v8/BindingSecurity.h"
 #include "bindings/v8/ScriptDebugServer.h"
 #include "bindings/v8/V8AbstractEventListener.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8ExceptionState.h"
 #include "bindings/v8/V8ScriptRunner.h"
 #include "bindings/v8/custom/V8Float32ArrayCustom.h"
 #include "bindings/v8/custom/V8Float64ArrayCustom.h"
 #include "bindings/v8/custom/V8Int16ArrayCustom.h"
 #include "bindings/v8/custom/V8Int32ArrayCustom.h"
@@ skipping 130 matching lines @@
         return;
     }
     if (V8Float32Array::hasInstance(value, isolate) || V8Float64Array::hasInstance(value, isolate)) {
         v8SetReturnValue(info, v8AtomicString(isolate, "array"));
         return;
     }
     if (V8Uint8ClampedArray::hasInstance(value, isolate)) {
         v8SetReturnValue(info, v8AtomicString(isolate, "array"));
         return;
     }
+    // FIXMEDART: remove this.
     if (DartHandleProxy::isDartProxy(value)) {
         const char* type = DartHandleProxy::getJavaScriptType(value);
         if (type)
             v8SetReturnValue(info, v8AtomicString(isolate, type));
         return;
     }
 }
 
 static bool setFunctionName(v8::Handle<v8::Object>& result, const v8::Handle<v8::Value>& value, v8::Isolate* isolate)
 {
@@ skipping 135 matching lines @@
         isolate->ThrowException(v8::Exception::Error(v8::String::NewFromUtf8(isolate, "One argument expected.")));
         return;
     }
 
     v8::Handle<v8::String> expression = info[0]->ToString();
     if (expression.IsEmpty()) {
         isolate->ThrowException(v8::Exception::Error(v8::String::NewFromUtf8(isolate, "The argument must be a string.")));
         return;
     }
 
-    // FIXME(dartbug.com/13804): refactor DartInjectedScriptHostHelper to instead
-    // subclass InjectedScriptHost.
-    v8::Handle<v8::Value> dartResult = DartInjectedScriptHostHelper::evaluateIfDartContext(info.Holder(), expression);
-    if (!dartResult.IsEmpty()) {
-        v8SetReturnValue(info, dartResult);
-        return;
-    }
-
     ASSERT(!isolate->GetCurrentContext().IsEmpty());
     v8::TryCatch tryCatch;
     v8::Handle<v8::Value> result = V8ScriptRunner::compileAndRunInternalScript(expression, info.GetIsolate());
     if (tryCatch.HasCaught()) {
         v8SetReturnValue(info, tryCatch.ReThrow());
         return;
     }
     v8SetReturnValue(info, result);
 }
 
@@ skipping 96 matching lines @@
     OwnPtr<v8::Handle<v8::Value>[]> argv = adoptArrayPtr(new v8::Handle<v8::Value>[argc]);
     for (size_t i = 0; i < argc; ++i)
         argv[i] = info[i + 2];
 
     v8::Local<v8::Value> result = function->Call(receiver, argc, argv.get());
     debugServer.unmuteWarningsAndDeprecations();
     v8SetReturnValue(info, result);
 }
 
 } // namespace WebCore