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

Side by Side Diff: compiled/ElemHide.cpp

Issue 29721753: Issue 6180 - use ABP_TEXT everywhere in order to let String be a UTF-8 string (Closed) Base URL: https://github.com/adblockplus/adblockpluscore.git@adb2678354813ce5b6de095072954c5a784a7bc4
Patch Set: Created March 13, 2018, 6:20 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 224
225 auto filter = entry.second; 225 auto filter = entry.second;
226 if (filter && !GetException(*filter, docDomain)) 226 if (filter && !GetException(*filter, docDomain))
227 selectors->push_back(filter); 227 selectors->push_back(filter);
228 } 228 }
229 } 229 }
230 230
231 if (currentDomain.empty()) 231 if (currentDomain.empty())
232 break; 232 break;
233 233
234 auto nextDot = currentDomain.find(u'.'); 234 auto nextDot = currentDomain.find(ABP_TEXT('.'));
235 currentDomain = nextDot == String::npos ? 235 currentDomain = nextDot == String::npos ?
236 u""_str : DependentString(currentDomain, nextDot + 1); 236 ABP_TEXT(""_str) : DependentString(currentDomain, nextDot + 1);
237 } 237 }
238 238
239 return selectors.release(); 239 return selectors.release();
240 } 240 }
OLDNEW
« no previous file with comments | « .travis/travis-script.sh ('k') | compiled/Map.h » ('j') | compiled/String.h » ('J')

Powered by Google App Engine
This is Rietveld