From 555252b6b6cc19455f977a578972cfb9b970ef98 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 5 Jan 2016 10:45:52 -0800
Subject: [PATCH 1/2] Remove duplicate code related to dom traversal in
 Polymer.dom.

---
 src/lib/dom-api-shadow.html | 22 ----------------------
 src/lib/dom-api-shady.html  | 22 ----------------------
 src/lib/dom-api.html        | 26 ++++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/src/lib/dom-api-shadow.html b/src/lib/dom-api-shadow.html
index 6a3cc300..cc73842b 100644
--- a/src/lib/dom-api-shadow.html
+++ b/src/lib/dom-api-shadow.html
@@ -26,28 +26,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       return TreeApi.arrayCopy(this.node.querySelectorAll(selector));
     },
 
-    _query: function(matcher, node) {
-      node = node || this.node;
-      var list = [];
-      this._queryElements(node.childNodes, matcher, list);
-      return list;
-    },
-
-    _queryElements: function(elements, matcher, list) {
-      for (var i=0, l=elements.length, c; (i<l) && (c=elements[i]); i++) {
-        if (c.nodeType === Node.ELEMENT_NODE) {
-          this._queryElement(c, matcher, list);
-        }
-      }
-    },
-
-    _queryElement: function(node, matcher, list) {
-      if (matcher(node)) {
-        list.push(node);
-      }
-      this._queryElements(node.childNodes, matcher, list);
-    },
-
     getOwnerRoot: function() {
       var n = this.node;
       while (n) {
diff --git a/src/lib/dom-api-shady.html b/src/lib/dom-api-shady.html
index 461566cd..64e41c1c 100644
--- a/src/lib/dom-api-shady.html
+++ b/src/lib/dom-api-shady.html
@@ -354,28 +354,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       }, this.node);
     },
 
-    _query: function(matcher, node) {
-      node = node || this.node;
-      var list = [];
-      this._queryElements(TreeApi.Logical.getChildNodes(node), matcher, list);
-      return list;
-    },
-
-    _queryElements: function(elements, matcher, list) {
-      for (var i=0, l=elements.length, c; (i<l) && (c=elements[i]); i++) {
-        if (c.nodeType === Node.ELEMENT_NODE) {
-          this._queryElement(c, matcher, list);
-        }
-      }
-    },
-
-    _queryElement: function(node, matcher, list) {
-      if (matcher(node)) {
-        list.push(node);
-      }
-      this._queryElements(TreeApi.Logical.getChildNodes(node), matcher, list);
-    },
-
     getDestinationInsertionPoints: function() {
       return this.node._destinationInsertionPoints || [];
     },
diff --git a/src/lib/dom-api.html b/src/lib/dom-api.html
index 0a45d9e0..d14f7f45 100644
--- a/src/lib/dom-api.html
+++ b/src/lib/dom-api.html
@@ -21,6 +21,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     'use strict';
 
     var Settings = Polymer.Settings;
+    var TreeApi = Polymer.TreeApi;
 
     var DomApi = function(node) {
       this.node = needsToWrap ? DomApi.wrap(node) : node;
@@ -134,6 +135,31 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         if (this.observer) {
           this.observer.notify();
         }
+      },
+
+      // NOTE: `_query` is used primarily for ShadyDOM's querySelector impl,
+      // but it's also generally useful to recurse through the element tree
+      // and is used by Polymer's styling system. 
+      _query: function(matcher, node) {
+        node = node || this.node;
+        var list = [];
+        this._queryElements(TreeApi.Logical.getChildNodes(node), matcher, list);
+        return list;
+      },
+
+      _queryElements: function(elements, matcher, list) {
+        for (var i=0, l=elements.length, c; (i<l) && (c=elements[i]); i++) {
+          if (c.nodeType === Node.ELEMENT_NODE) {
+            this._queryElement(c, matcher, list);
+          }
+        }
+      },
+
+      _queryElement: function(node, matcher, list) {
+        if (matcher(node)) {
+          list.push(node);
+        }
+        this._queryElements(TreeApi.Logical.getChildNodes(node), matcher, list);
       }
 
     };

From 33a24bb8e807688771c408d7ae13d97e95566c78 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 5 Jan 2016 11:11:05 -0800
Subject: [PATCH 2/2] Include more styling tests under ShadowDOM. Fix
 custom-style media query test to work under both shadow/shady.

---
 test/runner.html            | 6 ++----
 test/unit/custom-style.html | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/runner.html b/test/runner.html
index 7ae43c2a..654381b6 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -56,10 +56,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       'unit/styling-remote.html',
       'unit/styling-cross-scope-var.html',
       'unit/styling-cross-scope-apply.html',
-      // TODO(sorvell): disable until this Chrome bug is addressed:
-      // https://code.google.com/p/chromium/issues/detail?id=525280
-      // 'unit/styling-cross-scope-var.html?dom=shadow',
-      // 'unit/styling-cross-scope-apply.html?dom=shadow',
+      'unit/styling-cross-scope-var.html?dom=shadow',
+      'unit/styling-cross-scope-apply.html?dom=shadow',
       'unit/styling-cross-scope-unknown-host.html',
       'unit/custom-style.html',
       'unit/custom-style.html?dom=shadow',
diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
index fef176d1..d04c7340 100644
--- a/test/unit/custom-style.html
+++ b/test/unit/custom-style.html
@@ -155,7 +155,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
   <div class="foo"></div>
 
-  <div class="foo--bar style-scope"></div>
+  <div class="foo--bar"></div>
 
   <dom-module id="x-baz">
     <style>
@@ -489,7 +489,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       });
 
       test('BEM-like CSS selectors under media queries', function() {
-        assertComputed(document.querySelector('.foo--bar'), '3px');
+        assertComputed(document.querySelector('.foo--bar'), '20px');
       });
 
     });