Bug 970276 - Don't respect <link rel=""> elements from subframes (r=felipe)

browser/base/content/browser-feeds.js

@@ -153,11 +153,6 @@ var FeedHandler = {
   },
 
   addFeed: function(link, browserForLink) {
-    if (!browserForLink) {
-      // ignore feeds loaded in subframes (see bug 305472)
-      return;
-    }
-
     if (!browserForLink.feeds)
       browserForLink.feeds = [];
 

browser/modules/ContentLinkHandler.jsm

@@ -31,6 +31,11 @@ this.ContentLinkHandler = {
     if (!link || !link.ownerDocument || !rel || !link.href)
       return;
 
+    // Ignore sub-frames (bugs 305472, 479408).
+    let window = link.ownerDocument.defaultView;
+    if (window != window.top)
+      return;
+
     var feedAdded = false;
     var iconAdded = false;
     var searchAdded = false;