Bug 1261351: Look past ShadowRoots when looking for the parent for th…

…e UndisplayedMap. r=dbaron
Brli · Jun 7, 2016 · af57948 · af57948
1 parent c172cd3
commit af57948
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/layout/base/crashtests/1261351-iframe.html b/layout/base/crashtests/1261351-iframe.html
@@ -0,0 +1,26 @@
+<body>
+<script type="application/javascript">
+  'use strict';
+  // -sp-context: content
+  (function () {
+    let proto = Object.create(HTMLDivElement.prototype);
+    proto.template = `<style></style>`;
+    proto.createdCallback = function() {
+    let shadow = this.createShadowRoot();
+    if (this.template) {
+      let te = document.createElement('template');
+      te.innerHTML = this.template;
+      shadow.appendChild(document.importNode(te.content, true));
+    }
+  };
+
+  let UiComponentTest = document.registerElement('ui-component-test', {
+    prototype: proto,
+  });
+
+  let uic = new UiComponentTest();
+  document.body.appendChild(uic);
+
+  })();
+</script>
+</body>
diff --git a/layout/base/crashtests/1261351.html b/layout/base/crashtests/1261351.html
@@ -0,0 +1,7 @@
+<iframe id="iframe" src="1261351-iframe.html"></iframe>
+<script type="application/javascript">
+  let iframe = document.getElementById("iframe");
+  iframe.addEventListener("load", function() {
+    document.getElementsByTagName("iframe")[0].marginWidth = "5";
+  });
+</script>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
@@ -470,4 +470,5 @@ load 1162813.xul
 load 1163583.html
 load 1234622-1.html
 load 1235467-1.html
+pref(dom.webcomponents.enabled,true) load 1261351.html
 load 1270797-1.html
diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp
@@ -255,7 +255,8 @@ nsFrameManager::SetStyleContextInMap(UndisplayedMap* aMap,
   NS_ASSERTION(!GetStyleContextInMap(aMap, aContent),
                "Already have an entry for aContent");
 
-  nsIContent* parent = aContent->GetParent();
+  nsIContent* parent = aContent->GetParentElementCrossingShadowRoot();
+  MOZ_ASSERT(parent || !aContent->GetParent(), "no non-elements");
 #ifdef DEBUG
   nsIPresShell* shell = aStyleContext->PresContext()->PresShell();
   NS_ASSERTION(parent || (shell && shell->GetDocument() &&