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-present eyeo GmbH | 3 * Copyright (C) 2006-present 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 1136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1147 | 1147 |
1148 loading = true; | 1148 loading = true; |
1149 addDomListener = true; | 1149 addDomListener = true; |
1150 elementsHidden = false; | 1150 elementsHidden = false; |
1151 loadError = null; | 1151 loadError = null; |
1152 url = newUrl; | 1152 url = newUrl; |
1153 | 1153 |
1154 if (url != null) | 1154 if (url != null) |
1155 { | 1155 { |
1156 elemHideLatch = new CountDownLatch(1); | 1156 elemHideLatch = new CountDownLatch(1); |
1157 elemHideThread = new ElemHideThread(elemHideLatch); | 1157 synchronized (elemHideThreadLockObject) |
1158 elemHideThread.setFinishedRunnable(elemHideThreadFinishedRunnable); | 1158 { |
1159 elemHideThread.start(); | 1159 elemHideThread = new ElemHideThread(elemHideLatch); |
| 1160 elemHideThread.setFinishedRunnable(elemHideThreadFinishedRunnable); |
| 1161 elemHideThread.start(); |
| 1162 } |
1160 } | 1163 } |
1161 else | 1164 else |
1162 { | 1165 { |
1163 elemHideLatch = null; | 1166 elemHideLatch = null; |
1164 } | 1167 } |
1165 } | 1168 } |
1166 | 1169 |
1167 private void buildInjectJs() | 1170 private void buildInjectJs() |
1168 { | 1171 { |
1169 try | 1172 try |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1453 w("Busy with elemhide selectors, delayed disposing scheduled"); | 1456 w("Busy with elemhide selectors, delayed disposing scheduled"); |
1454 elemHideThread.setFinishedRunnable(disposeRunnable); | 1457 elemHideThread.setFinishedRunnable(disposeRunnable); |
1455 } | 1458 } |
1456 else | 1459 else |
1457 { | 1460 { |
1458 disposeRunnable.run(); | 1461 disposeRunnable.run(); |
1459 } | 1462 } |
1460 } | 1463 } |
1461 } | 1464 } |
1462 } | 1465 } |
OLD | NEW |