From ea392e3f28c2366f2dbb78a419247ac98e16554c Mon Sep 17 00:00:00 2001
From: Keanu Lee <keanulee@google.com>
Date: Tue, 7 Mar 2017 11:34:54 -0800
Subject: [PATCH 1/4] Allow hybrid elements (like iron-list) to make template
 instances with mutable data

---
 lib/legacy/legacy-element-mixin.html | 1 +
 lib/legacy/templatizer-behavior.html | 6 +++++-
 lib/utils/templatize.html            | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/legacy/legacy-element-mixin.html b/lib/legacy/legacy-element-mixin.html
index 6272b1cecf..57cb51e273 100644
--- a/lib/legacy/legacy-element-mixin.html
+++ b/lib/legacy/legacy-element-mixin.html
@@ -15,6 +15,7 @@
 <link rel="import" href="../utils/import-href.html">
 <link rel="import" href="../utils/render-status.html">
 <link rel="import" href="../utils/unresolved.html">
+<link rel="import" href="mutable-data-behavior.html">
 <link rel="import" href="polymer.dom.html">
 
 <script>
diff --git a/lib/legacy/templatizer-behavior.html b/lib/legacy/templatizer-behavior.html
index 968db24197..653e52e5f8 100644
--- a/lib/legacy/templatizer-behavior.html
+++ b/lib/legacy/templatizer-behavior.html
@@ -84,11 +84,15 @@
        * by `stamp` to create new instances of the template.
        *
        * @param {HTMLTemplateElement} template Template to prepare
+       * @param {Boolean=} mutableData When `true`, the generated class will skip
+       *   strict dirty-checking for objects and arrays (always consider them to
+       *   be "dirty"). Defaults to false.
        * @return {TemplateInstance} Description
        */
-      templatize(template) {
+      templatize(template, mutableData) {
         this._templatizerTemplate = template;
         this.ctor = Polymer.Templatize.templatize(template, this, {
+          mutableData: Boolean(mutableData),
           parentModel: this._parentModel,
           instanceProps: this._instanceProps,
           forwardHostProp: this._forwardHostPropV2,
diff --git a/lib/utils/templatize.html b/lib/utils/templatize.html
index a4bf1335fb..ad1008aee3 100644
--- a/lib/utils/templatize.html
+++ b/lib/utils/templatize.html
@@ -354,6 +354,9 @@
        *   to the instance by the templatize owner.  These properties shadow any
        *   host properties, and changes within the template to these properties
        *   will result in `notifyInstanceProperties` to be called.
+       * - `mutableData`: When `true`, the generated class will skip strict
+       *   dirty-checking for objects and arrays (always consider them to be
+       *   "dirty").
        * - `notifyInstanceProperties(instance, property, value)`: Called when
        *   an instance property changes.  Users may choose to call `notifyPath`
        *   on e.g. the owner to notify the change.

From 7cebe120be09f6b68be97850d93dd51c53aa8222 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Tue, 7 Mar 2017 12:49:56 -0800
Subject: [PATCH 2/4] move mutable data mixin to be loaded by polymer.html

---
 lib/legacy/class.html                    | 2 +-
 lib/legacy/legacy-element-mixin.html     | 1 -
 polymer.html                             | 2 ++
 test/unit/property-effects-elements.html | 3 ---
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/legacy/class.html b/lib/legacy/class.html
index 7a7436d8f3..b828ecb047 100644
--- a/lib/legacy/class.html
+++ b/lib/legacy/class.html
@@ -126,7 +126,7 @@
             }
           }
         } else {
-          Polymer._warn('behavior is null, check for missing or 404 import');
+          console.warn('behavior is null, check for missing or 404 import');
         }
       }
       return list;
diff --git a/lib/legacy/legacy-element-mixin.html b/lib/legacy/legacy-element-mixin.html
index 57cb51e273..6272b1cecf 100644
--- a/lib/legacy/legacy-element-mixin.html
+++ b/lib/legacy/legacy-element-mixin.html
@@ -15,7 +15,6 @@
 <link rel="import" href="../utils/import-href.html">
 <link rel="import" href="../utils/render-status.html">
 <link rel="import" href="../utils/unresolved.html">
-<link rel="import" href="mutable-data-behavior.html">
 <link rel="import" href="polymer.dom.html">
 
 <script>
diff --git a/polymer.html b/polymer.html
index 130a5c9ef7..0331373cd6 100644
--- a/polymer.html
+++ b/polymer.html
@@ -17,6 +17,8 @@
 <link rel="import" href="lib/elements/array-selector.html">
 <!-- custom-style -->
 <link rel="import" href="lib/elements/custom-style.html">
+<!-- bc behaviors -->
+<link rel="import" href="lib/legacy/mutable-data-behavior.html">
 <script>
   // bc
   Polymer.Base = Polymer.LegacyElementMixin(HTMLElement).prototype;
diff --git a/test/unit/property-effects-elements.html b/test/unit/property-effects-elements.html
index 4e4e1344ce..7005ec55b3 100644
--- a/test/unit/property-effects-elements.html
+++ b/test/unit/property-effects-elements.html
@@ -7,9 +7,6 @@
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="../../lib/legacy/mutable-data-behavior.html">
-<link rel="import" href="../../lib/mixins/mutable-data.html">
-
 <dom-module id="x-basic">
   <template>
     <div id="boundChild"

From 4439436f87b520e907abf02d145d84eaef856091 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 7 Mar 2017 13:47:21 -0800
Subject: [PATCH 3/4] fix behavior warn test.

---
 test/unit/behaviors.html | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/test/unit/behaviors.html b/test/unit/behaviors.html
index daafb592cb..27535891e3 100644
--- a/test/unit/behaviors.html
+++ b/test/unit/behaviors.html
@@ -414,11 +414,7 @@
   });
 
   test('behavior is null generates warning', function() {
-    var warned = false, oldWarn = Polymer._warn;
-    Polymer._warn = function(message) {
-      assert.match(message, /behavior is null/);
-      warned = true;
-    };
+    sinon.spy(console, 'warn');
     Polymer({
       is: 'behavior-null',
       behaviors: [
@@ -426,8 +422,8 @@
       ]
     });
     document.createElement('behavior-null');
-    assert.equal(warned, true, 'Null behaviour should generate warning');
-    Polymer.Base._warn = oldWarn;
+    assert.equal(console.warn.callCount, 1, 'Null behaviour should generate warning');
+    console.warn.restore();
   });
 
   test('behavior array is unique', function() {

From d9418e1adb2a29d124ff762cf442f7b71bd7af1a Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 7 Mar 2017 13:50:15 -0800
Subject: [PATCH 4/4] another test fix.

---
 lib/legacy/class.html          |  2 +-
 test/unit/mixin-behaviors.html | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/legacy/class.html b/lib/legacy/class.html
index b828ecb047..7411d4bb15 100644
--- a/lib/legacy/class.html
+++ b/lib/legacy/class.html
@@ -312,7 +312,7 @@
      */
     Polymer.Class = function(info) {
       if (!info) {
-        Polymer._warn('Polymer.Class requires `info` argument');
+        console.warn('Polymer.Class requires `info` argument');
       }
       let klass = GenerateClassFromInfo(info, info.behaviors ?
         // note: mixinBehaviors ensures `LegacyElementMixin`.
diff --git a/test/unit/mixin-behaviors.html b/test/unit/mixin-behaviors.html
index 139b83b870..3a598b6318 100644
--- a/test/unit/mixin-behaviors.html
+++ b/test/unit/mixin-behaviors.html
@@ -495,11 +495,7 @@
   });
 
   test('behavior is null generates warning', function() {
-    var warned = false, oldWarn = Polymer._warn;
-    Polymer._warn = function(message) {
-      assert.match(message, /behavior is null/);
-      warned = true;
-    };
+    sinon.spy(console, 'warn');
     Polymer({
       is: 'behavior-null',
       behaviors: [
@@ -507,8 +503,8 @@
       ]
     });
     document.createElement('behavior-null');
-    assert.equal(warned, true, 'Null behaviour should generate warning');
-    Polymer.Base._warn = oldWarn;
+    assert.equal(console.warn.callCount, 1, 'Null behaviour should generate warning');
+    console.warn.restore();
   });
 
   test('behavior array is unique', function() {