Side by Side Diff: src/shared/Utils.h
Issue 29351560:
Issue 4395 - Setting page is loaded non-populated on some systems
Patch Set: Don't use UrlEscape and just compare unescaped canonical URLs
Created Sept. 8, 2016, 2:48 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« src/plugin/PluginTabBase.cpp ('k')
|
src/shared/Utils.cpp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 74 { | 74 { |
| 75 // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-st dstring | 75 // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-st dstring |
| 76 T trimmed(text); | 76 T trimmed(text); |
| 77 std::function<bool(T::value_type)> isspace = std::bind(&std::isspace<T::value_ type>, std::placeholders::_1, std::locale::classic()); | 77 std::function<bool(T::value_type)> isspace = std::bind(&std::isspace<T::value_ type>, std::placeholders::_1, std::locale::classic()); |
| 78 trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end(), st d::not1(isspace))); | 78 trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end(), st d::not1(isspace))); |
| 79 trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(isspace )).base(), trimmed.end()); | 79 trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(isspace )).base(), trimmed.end()); |
| 80 return trimmed; | 80 return trimmed; |
| 81 } | 81 } |
| 82 | 82 |
| 83 std::wstring CanonicalizeUrl(const std::wstring& url); | 83 std::wstring CanonicalizeUrl(const std::wstring& url); |
| 84 std::wstring EscapeUrl(const std::wstring& url); | |
| 85 | 84 |
| 86 #endif // UTILS_H | 85 #endif // UTILS_H |
| OLD | NEW |
« no previous file with comments
|
« src/plugin/PluginTabBase.cpp ('k')
|
src/shared/Utils.cpp » ('j')
|
no next file with comments »
