Revert "Revert "Dartium changes for custom element lifecycle events.""

Source/bindings/dart/DartUtilities.cpp

 // Copyright 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 12 matching lines @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "config.h"
 #include "bindings/dart/DartUtilities.h"
 
+#include "DartBlob.h"
+#include "DartIDBKeyRange.h"
+#include "DartImageData.h"
 #include "DartMessagePort.h"
 #include "bindings/dart/DartDOMData.h"
 #include "bindings/dart/DartHandleProxy.h"
 #include "bindings/dart/V8Converter.h"
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/SerializedScriptValue.h"
 #include "core/dom/Document.h"
 #include "core/html/canvas/DataView.h"
 #include "core/inspector/ScriptArguments.h"
 #include "core/inspector/ScriptCallStack.h"
@@ skipping 15 matching lines @@
 #include <wtf/Uint8Array.h>
 #include <wtf/Uint8ClampedArray.h>
 #include <wtf/text/AtomicString.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
 const char* DartUtilities::htmlLibraryName = "dart:html";
 const char* DartUtilities::indexedDBLibraryName = "dart:indexed_db";
+const char* DartUtilities::svgLibraryName = "dart:svg";
 
 static void stringFinalizer(void* peer)
 {
     reinterpret_cast<StringImpl*>(peer)->deref();
 }
 
 template <typename T> PassRefPtr<StringImpl> convertAndExternalize(Dart_Handle string, intptr_t length)
 {
     if (!length)
         return StringImpl::empty();
@@ skipping 260 matching lines @@
     return dartToDate(object, exception);
 }
 
 bool DartUtilities::isDateTime(Dart_Handle handle)
 {
     return objectIsType(handle, "dart:core", "DateTime");
 }
 
 bool DartUtilities::isBlob(Dart_Handle handle)
 {
-    return objectIsType(handle, htmlLibraryName, "Blob");
+    return objectIsClass(handle, DartDOMWrapper::dartClass<DartBlob>());
 }
 
 bool DartUtilities::isImageData(Dart_Handle handle)
 {
-    return objectIsType(handle, htmlLibraryName, "ImageData");
+    return objectIsClass(handle, DartDOMWrapper::dartClass<DartImageData>());
 }
 
 bool DartUtilities::isIDBKeyRange(Dart_Handle handle)
 {
-    return objectIsType(handle, indexedDBLibraryName, "KeyRange");
+    return objectIsClass(handle, DartDOMWrapper::dartClass<DartIDBKeyRange>());
+}
+
+bool DartUtilities::objectIsClass(Dart_Handle handle, Dart_Handle cls)

[vsm, 2013/09/25 22:39:10]

I'd call this objectIsType for clarity.

[blois, 2013/09/25 22:50:18]

Done.

+{
+    bool isType = false;
+    Dart_Handle result = Dart_ObjectIsType(handle, cls, &isType);
+    ASSERT(!Dart_IsError(result));
+    if (Dart_IsError(result))
+        return false;
+
+    return isType;
 }
 
 bool DartUtilities::objectIsType(Dart_Handle handle, const char* libraryName, const char* typeName)
 {
     // FIXME: cache the lookup for library & type name.
     Dart_Handle library = libraryForCurrentIsolate(libraryName);
     ASSERT(!Dart_IsError(library));
 
     Dart_Handle cls = Dart_GetClass(library, Dart_NewStringFromCString(typeName));
     ASSERT(!Dart_IsError(cls));
 
     bool isType = false;

[vsm, 2013/09/25 22:39:10]

Can you modify this to call the above function instead?

[blois, 2013/09/25 22:50:18]

Done.

     Dart_Handle result = Dart_ObjectIsType(handle, cls, &isType);
     ASSERT(!Dart_IsError(result));
     if (Dart_IsError(result))
         return false;
 
     return isType;
 }
 
+bool DartUtilities::isTypeSubclassOf(Dart_Handle type, const char* libraryName, const char* typeName)
+{
+    Dart_Handle library = libraryForCurrentIsolate(libraryName);
+    ASSERT(!Dart_IsError(library));
+
+    Dart_Handle other = Dart_GetType(library, Dart_NewStringFromCString(typeName), 0, 0);
+    ASSERT(!Dart_IsError(other));
+
+    Dart_Handle args[2] = { type, other };
+    Dart_Handle result = DartUtilities::invokeUtilsMethod("isTypeSubclassOf", 2, args);
+    ASSERT(!Dart_IsError(result));
+    if (Dart_IsError(result))
+        return false;
+
+    Dart_Handle exception = 0;
+    bool boolResult = dartToBool(result, exception);
+    if (exception)
+        return false;
+    return boolResult;
+}
+
 bool DartUtilities::isTypedData(Dart_Handle handle)
 {
     return Dart_GetTypeOfTypedData(handle) != Dart_TypedData_kInvalid || Dart_GetTypeOfExternalTypedData(handle) != Dart_TypedData_kInvalid;
 }
 
 static Dart_TypedData_Type typedDataTypeFromViewType(ArrayBufferView::ViewType type)
 {
     switch (type) {
     case ArrayBufferView::TypeInt8:
         return Dart_TypedData_kInt8;
@@ skipping 637 matching lines @@
     Dart_Handle library = htmlLibraryForCurrentIsolate();
     ASSERT(!Dart_IsError(library));
 
     Dart_Handle utilsClass = Dart_GetType(library, Dart_NewStringFromCString("_Utils"), 0, 0);
     ASSERT(!Dart_IsError(utilsClass));
 
     return Dart_Invoke(utilsClass, Dart_NewStringFromCString(methodName), argCount, args);
 }
 
 }