Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: chrome/ext/background.js

Issue 29350357: Issue 4386 - Fixed determining document domain, particularly after being redirected (Closed)
Left Patch Set: Fixed variable names Created Sept. 5, 2016, 3:47 p.m.
Right Patch Set: Fixed another regression from last-minute changes Created Sept. 5, 2016, 3:59 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 if (!frame) 120 if (!frame)
121 frame = frames[frameId] = {}; 121 frame = frames[frameId] = {};
122 122
123 return frame; 123 return frame;
124 } 124 }
125 125
126 chrome.webNavigation.onBeforeNavigate.addListener(function(details) 126 chrome.webNavigation.onBeforeNavigate.addListener(function(details)
127 { 127 {
128 // Capture parent frame here because onCommitted doesn't get this info. 128 // Capture parent frame here because onCommitted doesn't get this info.
129 var frame = createFrame(details.tabId, details.frameId); 129 var frame = createFrame(details.tabId, details.frameId);
130 frame.parent = frames[details.parentFrameId] || null; 130 frame.parent = framesOfTabs[details.tabId][details.parentFrameId] || null;
131 }); 131 });
132 132
133 chrome.webNavigation.onCommitted.addListener(function(details) 133 chrome.webNavigation.onCommitted.addListener(function(details)
134 { 134 {
135 if (details.frameId == 0) 135 if (details.frameId == 0)
136 { 136 {
137 ext._removeFromAllPageMaps(details.tabId); 137 ext._removeFromAllPageMaps(details.tabId);
138 138
139 chrome.tabs.get(details.tabId, function() 139 chrome.tabs.get(details.tabId, function()
140 { 140 {
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 ext.windows = { 636 ext.windows = {
637 create: function(createData, callback) 637 create: function(createData, callback)
638 { 638 {
639 chrome.windows.create(createData, function(createdWindow) 639 chrome.windows.create(createData, function(createdWindow)
640 { 640 {
641 afterTabLoaded(callback)(createdWindow.tabs[0]); 641 afterTabLoaded(callback)(createdWindow.tabs[0]);
642 }); 642 });
643 } 643 }
644 }; 644 };
645 })(); 645 })();
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld