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

Delta Between Two Patch Sets: libadblockplus-android-webview/src/org/adblockplus/libadblockplus/android/webview/AdblockWebView.java

Issue 29677555: Issue 6299 - Avoid main thread lock on URL loading (Closed)
Left Patch Set: Created Jan. 23, 2018, 6:12 a.m.
Right Patch Set: added "final" for domain Created Jan. 23, 2018, 10:33 a.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 | « libadblockplus-android-webview/pom.xml ('k') | libadblockplus-android-webviewapp/AndroidManifest.xml » ('j') | 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-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 994 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 } 1005 }
1006 } 1006 }
1007 finally 1007 finally
1008 { 1008 {
1009 for (Subscription eachSubscription : subscriptions) 1009 for (Subscription eachSubscription : subscriptions)
1010 { 1010 {
1011 eachSubscription.dispose(); 1011 eachSubscription.dispose();
1012 } 1012 }
1013 } 1013 }
1014 1014
1015 String domain = provider.getEngine().getFilterEngine().getHostFromURL( url); 1015 final String domain = provider.getEngine().getFilterEngine().getHostFr omURL(url);
1016 if (domain == null) 1016 if (domain == null)
anton 2018/01/23 06:14:10 Not sure if it can happen
1017 { 1017 {
1018 e("Failed to extract domain from " + url); 1018 e("Failed to extract domain from " + url);
1019 selectorsString = EMPTY_ELEMHIDE_ARRAY_STRING; 1019 selectorsString = EMPTY_ELEMHIDE_ARRAY_STRING;
1020 } 1020 }
1021 else 1021 else
1022 { 1022 {
1023 d("Requesting elemhide selectors from AdblockEngine for " + url + " in " + this); 1023 d("Requesting elemhide selectors from AdblockEngine for " + url + " in " + this);
1024 List<String> selectors = provider 1024 List<String> selectors = provider
1025 .getEngine() 1025 .getEngine()
1026 .getElementHidingSelectors(url, domain, referrers); 1026 .getElementHidingSelectors(url, domain, referrers);
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
1432 w("Busy with elemhide selectors, delayed disposing scheduled"); 1432 w("Busy with elemhide selectors, delayed disposing scheduled");
1433 elemHideThread.setFinishedRunnable(disposeRunnable); 1433 elemHideThread.setFinishedRunnable(disposeRunnable);
1434 } 1434 }
1435 else 1435 else
1436 { 1436 {
1437 disposeRunnable.run(); 1437 disposeRunnable.run();
1438 } 1438 }
1439 } 1439 }
1440 } 1440 }
1441 } 1441 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld