[polymer.dart] fix *Changed observers inheriting

pkg/polymer/lib/src/declaration.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 polymer;
 
 /**
  * **Warning**: this class is experiental and subject to change.
  *
  * The implementation for the `polymer-element` element.
@@ skipping 249 matching lines @@
       for (var attr in attrs.split(attrs.contains(',') ? ',' : ' ')) {
         // remove excess ws
         attr = attr.trim();
 
         // do not override explicit entries
         if (attr != '' && _publish != null && _publish.containsKey(attr)) {
           continue;
         }
 
         var property = new Symbol(attr);
-        var mirror = cls.declarations[property];
-        if (mirror is MethodMirror) {
-          if (!mirror.isGetter || !_hasSetter(cls, mirror)) mirror = null;
-        } else if (mirror is! VariableMirror) {
-          mirror = null;
-        }
+        var mirror = _getProperty(cls, property);
         if (mirror == null) {
           window.console.warn('property for attribute $attr of polymer-element '
               'name=$name not found.');
           continue;
         }
         if (_publish == null) _publish = {};
         _publish[property] = mirror;
       }
     }
 
@@ skipping 146 matching lines @@
   }
 
   /**
    * fetch a list of all observable properties names in our inheritance chain
    * above Polymer.
    */
   // TODO(sjmiles): perf: reflection is slow, relatively speaking
   // If an element may take 6us to create, getCustomPropertyNames might
   // cost 1.6us more.
   void inferObservers(ClassMirror cls) {
+    if (cls == _objectType) return;
+    inferObservers(cls.superclass);
     for (var method in cls.declarations.values) {
       if (method is! MethodMirror || method.isStatic
           || !method.isRegularMethod) continue;
 
       String name = MirrorSystem.getName(method.simpleName);
       if (name.endsWith(_OBSERVE_SUFFIX) && name != 'attributeChanged') {
         if (_observe == null) _observe = new Map();
         name = name.substring(0, name.length - 7);
         _observe[new Symbol(name)] = method.simpleName;
       }
@@ skipping 40 matching lines @@
 }
 
 /// track document.register'ed tag names and their declarations
 final Map _declarations = new Map<String, PolymerDeclaration>();
 
 bool _isRegistered(String name) => _declarations.containsKey(name);
 PolymerDeclaration _getDeclaration(String name) => _declarations[name];
 
 final _objectType = reflectClass(Object);
 
+
 Map _getPublishedProperties(ClassMirror cls, Map props) {
   if (cls == _objectType) return props;
   props = _getPublishedProperties(cls.superclass, props);
-  for (var field in cls.declarations.values) {
-    if (field is! VariableMirror ||
-        field.isFinal || field.isStatic || field.isPrivate) continue;
+  for (var member in cls.declarations.values) {
+    if (member.isStatic || member.isPrivate) continue;
 
-    for (var meta in field.metadata) {
-      if (meta.reflectee is PublishedProperty) {
-        if (props == null) props = {};
-        props[field.simpleName] = field;
-        break;
+    if (member is VariableMirror && !member.isFinal
+        || member is MethodMirror && member.isGetter) {
+
+      for (var meta in member.metadata) {
+        if (meta.reflectee is PublishedProperty) {
+          // Note: we delay the setter check until we find @published because
+          // it's a tad expensive.
+          if (member is! MethodMirror || _hasSetter(cls, member)) {
+            if (props == null) props = {};
+            props[member.simpleName] = member;
+          }
+          break;
+        }
       }
     }
   }
-
-  for (var getter in cls.declarations.values) {
-    if (getter is! MethodMirror || !getter.isGetter ||
-        getter.isStatic || getter.isPrivate) continue;
-
-    for (var meta in getter.metadata) {
-      if (meta.reflectee is PublishedProperty) {
-        if (_hasSetter(cls, getter)) {
-          if (props == null) props = {};
-          props[getter.simpleName] = getter;
-        }
-        break;
-      }
-    }
-  }
 
   return props;
 }
 
+DeclarationMirror _getProperty(ClassMirror cls, Symbol property) {
+  do {
+    var mirror = cls.declarations[property];
+    if (mirror is MethodMirror && mirror.isGetter && _hasSetter(cls, mirror)
+        || mirror is VariableMirror) {
+      return mirror;
+    }
+    cls = cls.superclass;
+  } while (cls != null);
+  return null;
+}
+
 bool _hasSetter(ClassMirror cls, MethodMirror getter) {
   var setterName = new Symbol('${MirrorSystem.getName(getter.simpleName)}=');
   var mirror = cls.declarations[setterName];
   return mirror is MethodMirror && mirror.isSetter;
 }
 
 
 /** Attribute prefix used for declarative event handlers. */
 const _EVENT_PREFIX = 'on-';
 
@@ skipping 92 matching lines @@
   return map;
 }();
 
 // Dart note: we need this function because we have additional renames JS does
 // not have. The JS renames are simply case differences, whereas we have ones
 // like doubleclick -> dblclick and stripping the webkit prefix.
 String _eventNameFromType(String eventType) {
   final result = _reverseEventTranslations[eventType];
   return result != null ? result : eventType;
 }