From d3a1beb42821598b836fe19eb025ecc1b46597f8 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Mon, 10 Feb 2014 16:42:18 -0800
Subject: [PATCH] Bug 970276 - Don't respect <link rel=""> elements from
 subframes (r=felipe)

---
 browser/base/content/browser-feeds.js  | 5 -----
 browser/modules/ContentLinkHandler.jsm | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/browser-feeds.js b/browser/base/content/browser-feeds.js
index 5ecced9462ed..5b1daa3d2888 100644
--- a/browser/base/content/browser-feeds.js
+++ b/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 = [];
 
diff --git a/browser/modules/ContentLinkHandler.jsm b/browser/modules/ContentLinkHandler.jsm
index 166a78a87649..ed58b1f663b7 100644
--- a/browser/modules/ContentLinkHandler.jsm
+++ b/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;