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

Side by Side Diff: src/engine/main.cpp

Issue 10955040: Fix domain whitelisting and remove unused code (Closed)
Patch Set: Created June 25, 2013, 10:21 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/plugin/AdblockPlusClient.cpp » ('j') | src/plugin/PluginTabBase.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include <AdblockPlus.h> 1 #include <AdblockPlus.h>
2 #include <functional> 2 #include <functional>
3 #include <vector> 3 #include <vector>
4 #include <Windows.h> 4 #include <Windows.h>
5 5
6 #include "../shared/AutoHandle.h" 6 #include "../shared/AutoHandle.h"
7 #include "../shared/Communication.h" 7 #include "../shared/Communication.h"
8 #include "../shared/Dictionary.h" 8 #include "../shared/Dictionary.h"
9 #include "../shared/Utils.h" 9 #include "../shared/Utils.h"
10 #include "../shared/Version.h" 10 #include "../shared/Version.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 !text.compare(text.size() - suffixLen, suffixLen, suffix)) 113 !text.compare(text.size() - suffixLen, suffixLen, suffix))
114 { 114 {
115 domains.push_back(text.substr(prefixLen, text.size() - prefixLen - suffixLen)); 115 domains.push_back(text.substr(prefixLen, text.size() - prefixLen - suffixLen));
116 } 116 }
117 } 117 }
118 } 118 }
119 119
120 WriteStrings(response, domains); 120 WriteStrings(response, domains);
121 break; 121 break;
122 } 122 }
123 case Communication::PROC_IS_WHITELISTED_URL:
124 {
125 std::string url;
126 request >> url;
127 AdblockPlus::FilterPtr match = filterEngine->Matches(url, "DOCUMENT", "" );
Wladimir Palant 2013/06/25 11:55:13 Please use url as the document URL parameter as we
128 response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCE PTION);
129 break;
130 }
123 case Communication::PROC_ADD_FILTER: 131 case Communication::PROC_ADD_FILTER:
124 { 132 {
125 std::string text; 133 std::string text;
126 request >> text; 134 request >> text;
127 135
128 filterEngine->GetFilter(text)->AddToList(); 136 filterEngine->GetFilter(text)->AddToList();
129 break; 137 break;
130 } 138 }
131 case Communication::PROC_REMOVE_FILTER: 139 case Communication::PROC_REMOVE_FILTER:
132 { 140 {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 } 247 }
240 catch (std::runtime_error e) 248 catch (std::runtime_error e)
241 { 249 {
242 DebugException(e); 250 DebugException(e);
243 return 1; 251 return 1;
244 } 252 }
245 } 253 }
246 254
247 return 0; 255 return 0;
248 } 256 }
OLDNEW
« no previous file with comments | « no previous file | src/plugin/AdblockPlusClient.cpp » ('j') | src/plugin/PluginTabBase.cpp » ('J')

Powered by Google App Engine
This is Rietveld