route safebrowsing and httpse messages by tabId

fixes #3367 requires brave/muon@a6046ca
brave · Aug 25, 2016 · a12cac4 · a12cac4
1 parent 88f10e3
commit a12cac4
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/js/components/main.js b/js/components/main.js
@@ -315,27 +315,26 @@ class Main extends ImmutableComponent {
       windowActions.setActiveFrame(self.props.windowState.getIn(['frames', self.props.windowState.get('frames').size - 1])))
 
     ipc.on(messages.BLOCKED_RESOURCE, (e, blockType, details) => {
-      const filteredFrameProps = this.props.windowState.get('frames').filter((frame) => frame.get('provisionalLocation') === details.firstPartyUrl)
-      filteredFrameProps.forEach((frameProps) =>
-        windowActions.setBlockedBy(frameProps, blockType, details.url))
+      const frameProps = FrameStateUtil.getFrameByTabId(self.props.windowState, details.tabId)
+      frameProps && windowActions.setBlockedBy(frameProps, blockType, details.url)
     })
 
     ipc.on(messages.BLOCKED_PAGE, (e, blockType, details) => {
-      const filteredFrameProps = this.props.windowState.get('frames').filter((frame) => frame.get('provisionalLocation') === details.firstPartyUrl)
-      filteredFrameProps.forEach((frameProps) => {
-        if (blockType === appConfig.resourceNames.SAFE_BROWSING) {
-          // Since Safe Browsing never actually loads the main frame we need to add history here.
-          // That way about:safebrowsing can figure out the correct location.
-          windowActions.addHistory(frameProps)
-        }
-        windowActions.loadUrl(frameProps, blockType === appConfig.resourceNames.SAFE_BROWSING ? 'about:safebrowsing' : 'about:blank')
-      })
+      const frameProps = FrameStateUtil.getFrameByTabId(self.props.windowState, details.tabId)
+      if (!frameProps) {
+        return
+      }
+      if (blockType === appConfig.resourceNames.SAFE_BROWSING) {
+        // Since Safe Browsing never actually loads the main frame we need to add history here.
+        // That way about:safebrowsing can figure out the correct location.
+        windowActions.addHistory(frameProps)
+      }
+      windowActions.loadUrl(frameProps, blockType === appConfig.resourceNames.SAFE_BROWSING ? 'about:safebrowsing' : 'about:blank')
     })
 
     ipc.on(messages.HTTPSE_RULE_APPLIED, (e, ruleset, details) => {
-      const filteredFrameProps = this.props.windowState.get('frames').filter((frame) => frame.get('provisionalLocation') === details.firstPartyUrl)
-      filteredFrameProps.forEach((frameProps) =>
-        windowActions.setRedirectedBy(frameProps, ruleset, details.url))
+      const frameProps = FrameStateUtil.getFrameByTabId(self.props.windowState, details.tabId)
+      frameProps && windowActions.setRedirectedBy(frameProps, ruleset, details.url)
     })
 
     ipc.on(messages.SHOW_NOTIFICATION, (e, text) => {