Revert "Revert "Basic functionality is working with JS native support and polyfill, still some issu…

tools/dom/src/dart2js_CustomElementSupport.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.dom.html;
 
 _callCreated(receiver) {
   return receiver.created();
 }
 
 _makeCreatedCallbackMethod() {
   return JS('',
       '''((function(invokeCallback) {
              return function() {
                return invokeCallback(this);
              };
           })(#))''',
       convertDartClosureToJS(_callCreated, 1));
 }
 
-void _registerCustomElement(context, document, String tag, Type type) {
+const _typeNameToTag = const {
+  'HTMLAnchorElement': 'a',
+  'HTMLAudioElement': 'audio',
+  'HTMLButtonElement': 'button',
+  'HTMLCanvasElement': 'canvas',
+  'HTMLDivElement': 'div',
+  'HTMLImageElement': 'img',
+  'HTMLInputElement': 'input',
+  'HTMLLIElement': 'li',
+  'HTMLLabelElement': 'label',
+  'HTMLMenuElement': 'menu',
+  'HTMLMeterElement': 'meter',
+  'HTMLOListElement': 'ol',
+  'HTMLOptionElement': 'option',
+  'HTMLOutputElement': 'output',
+  'HTMLParagraphElement': 'p',
+  'HTMLPreElement': 'pre',
+  'HTMLProgressElement': 'progress',
+  'HTMLSelectElement': 'select',
+  'HTMLSpanElement': 'span',
+  'HTMLUListElement': 'ul',
+  'HTMLVideoElement': 'video',
+};
+
+void _registerCustomElement(context, document, String tag, Type type,
+    String extendsTagName) {
   // Function follows the same pattern as the following JavaScript code for
   // registering a custom element.
   //
   //    var proto = Object.create(HTMLElement.prototype, {
   //        createdCallback: {
   //          value: function() {
   //            window.console.log('here');
   //          }
   //        }
   //    });
   //    document.register('x-foo', { prototype: proto });
   //    ...
   //    var e = document.createElement('x-foo');
 
   var interceptorClass = findInterceptorConstructorForType(type);
   if (interceptorClass == null) {
     throw new ArgumentError(type);
   }
 
+  // Workaround for 13190- use an article element to ensure that HTMLElement's
+  // interceptor is resolved correctly.
+  getNativeInterceptor(new Element.tag('article'));

[Jennifer Messerly, 2013/09/09 21:46:57]

should this create an instance of "extendsTagName" if supplied? or does it not
matter?

[blois, 2013/09/09 21:56:58]

This is just a workaround- needs to create an instance of HtmlElement (not a
subclass) early in the process to avoid a FF type check bug.

+
   String baseClassName = findDispatchTagForInterceptorClass(interceptorClass);
   if (baseClassName == null) {
     throw new ArgumentError(type);
   }
   if (baseClassName == 'Element') baseClassName = 'HTMLElement';
 
   var baseConstructor = JS('=Object', '#[#]', context, baseClassName);
 
   var properties = JS('=Object', '{}');
 
   var jsCreatedCallback = _makeCreatedCallbackMethod();
 
   JS('void', '#.createdCallback = #', properties,
       JS('=Object', '{value: #}', jsCreatedCallback));
 
   var baseProto = JS('=Object', '#.prototype', baseConstructor);
   var proto = JS('=Object', 'Object.create(#, #)', baseProto, properties);
 
   var interceptor = JS('=Object', '#.prototype', interceptorClass);
 
   setNativeSubclassDispatchRecord(proto, interceptor);
 
-  JS('void', '#.register(#, #)',
-      document, tag, JS('', '{prototype: #}', proto));
+  var options = JS('=Object', '{prototype: #}', proto);
+
+  if (baseClassName != 'HTMLElement') {
+    if (extendsTagName != null) {
+      JS('=Object', '#.extends = #', options, extendsTagName);
+    } else if (_typeNameToTag.containsKey(baseClassName)) {
+      JS('=Object', '#.extends = #', options, _typeNameToTag[baseClassName]);
+    }
+  }
+
+  JS('void', '#.register(#, #)', document, tag, options);
 }