OLD | NEW |
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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 onActivated: new ext._EventTarget(), | 103 onActivated: new ext._EventTarget(), |
104 onRemoved: new ext._EventTarget() | 104 onRemoved: new ext._EventTarget() |
105 }; | 105 }; |
106 | 106 |
107 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) | 107 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) |
108 { | 108 { |
109 if (changeInfo.status == "loading") | 109 if (changeInfo.status == "loading") |
110 ext.pages.onLoading._dispatch(new Page(tab)); | 110 ext.pages.onLoading._dispatch(new Page(tab)); |
111 }); | 111 }); |
112 | 112 |
| 113 function createFrame(tabId, frameId) |
| 114 { |
| 115 var frames = framesOfTabs[tabId]; |
| 116 if (!frames) |
| 117 frames = framesOfTabs[tabId] = Object.create(null); |
| 118 |
| 119 var frame = frames[frameId]; |
| 120 if (!frame) |
| 121 frame = frames[frameId] = {}; |
| 122 |
| 123 return frame; |
| 124 } |
| 125 |
113 chrome.webNavigation.onBeforeNavigate.addListener(function(details) | 126 chrome.webNavigation.onBeforeNavigate.addListener(function(details) |
114 { | 127 { |
| 128 // Capture parent frame here because onCommitted doesn't get this info. |
| 129 var frame = createFrame(details.tabId, details.frameId); |
| 130 frame.parent = frames[details.parentFrameId] || null; |
| 131 }); |
| 132 |
| 133 chrome.webNavigation.onCommitted.addListener(function(details) |
| 134 { |
115 if (details.frameId == 0) | 135 if (details.frameId == 0) |
116 { | 136 { |
117 ext._removeFromAllPageMaps(details.tabId); | 137 ext._removeFromAllPageMaps(details.tabId); |
118 | 138 |
119 chrome.tabs.get(details.tabId, function() | 139 chrome.tabs.get(details.tabId, function() |
120 { | 140 { |
121 // If the tab is prerendered, chrome.tabs.get() sets | 141 // If the tab is prerendered, chrome.tabs.get() sets |
122 // chrome.runtime.lastError and we have to dispatch the onLoading event, | 142 // chrome.runtime.lastError and we have to dispatch the onLoading event, |
123 // since the onUpdated event isn't dispatched for prerendered tabs. | 143 // since the onUpdated event isn't dispatched for prerendered tabs. |
124 // However, we have to keep relying on the unUpdated event for tabs that | 144 // However, we have to keep relying on the unUpdated event for tabs that |
125 // are already visible. Otherwise browser action changes get overridden | 145 // are already visible. Otherwise browser action changes get overridden |
126 // when Chrome automatically resets them on navigation. | 146 // when Chrome automatically resets them on navigation. |
127 if (chrome.runtime.lastError) | 147 if (chrome.runtime.lastError) |
128 { | 148 { |
129 ext.pages.onLoading._dispatch( | 149 ext.pages.onLoading._dispatch( |
130 new Page({ | 150 new Page({ |
131 id: details.tabId, | 151 id: details.tabId, |
132 url: details.url | 152 url: details.url |
133 }) | 153 }) |
134 ); | 154 ); |
135 } | 155 } |
136 }); | 156 }); |
137 } | 157 } |
138 | 158 |
139 // Add or update frame in frame structure | 159 // Update frame URL in frame structure |
140 var frames = framesOfTabs[details.tabId]; | 160 var frame = createFrame(details.tabId, details.frameId); |
141 if (!frames) | 161 frame.url = new URL(details.url); |
142 frames = framesOfTabs[details.tabId] = Object.create(null); | |
143 | |
144 frames[details.frameId] = { | |
145 parent: frames[details.parentFrameId] || null, | |
146 url: new URL(details.url) | |
147 }; | |
148 }); | 162 }); |
149 | 163 |
150 function forgetTab(tabId) | 164 function forgetTab(tabId) |
151 { | 165 { |
152 ext.pages.onRemoved._dispatch(tabId); | 166 ext.pages.onRemoved._dispatch(tabId); |
153 | 167 |
154 ext._removeFromAllPageMaps(tabId); | 168 ext._removeFromAllPageMaps(tabId); |
155 delete framesOfTabs[tabId]; | 169 delete framesOfTabs[tabId]; |
156 } | 170 } |
157 | 171 |
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
622 ext.windows = { | 636 ext.windows = { |
623 create: function(createData, callback) | 637 create: function(createData, callback) |
624 { | 638 { |
625 chrome.windows.create(createData, function(createdWindow) | 639 chrome.windows.create(createData, function(createdWindow) |
626 { | 640 { |
627 afterTabLoaded(callback)(createdWindow.tabs[0]); | 641 afterTabLoaded(callback)(createdWindow.tabs[0]); |
628 }); | 642 }); |
629 } | 643 } |
630 }; | 644 }; |
631 })(); | 645 })(); |
OLD | NEW |