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

Side by Side Diff: src/plugin/PluginFilter.cpp

Issue 29331537: Noissue - Change argument of 'GetHtmlElementAttribute()' to 'std::wstring'
Patch Set: rebase only Created May 17, 2016, 7:40 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
« no previous file with comments | « src/engine/NotificationWindow.cpp ('k') | src/shared/MsHTMLUtils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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-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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 { 348 {
349 CComBSTR idBstr; 349 CComBSTR idBstr;
350 if (SUCCEEDED(pEl->get_id(&idBstr)) && idBstr) 350 if (SUCCEEDED(pEl->get_id(&idBstr)) && idBstr)
351 { 351 {
352 value = ToWstring(idBstr); 352 value = ToWstring(idBstr);
353 attrFound = true; 353 attrFound = true;
354 } 354 }
355 } 355 }
356 else 356 else
357 { 357 {
358 CComBSTR attrArgument(attrIt->m_attr.length(), attrIt->m_attr.c_str()); 358 auto x = GetHtmlElementAttribute(*pEl, attrIt->m_attr);
359 auto x = GetHtmlElementAttribute(*pEl, attrArgument);
360 attrFound = x.isAttributeFound; 359 attrFound = x.isAttributeFound;
361 if (attrFound) 360 if (attrFound)
362 { 361 {
363 value = x.attributeValue; 362 value = x.attributeValue;
364 } 363 }
365 } 364 }
366 365
367 if (attrFound) 366 if (attrFound)
368 { 367 {
369 if (attrIt->m_pos == CFilterElementHideAttrPos::EXACT) 368 if (attrIt->m_pos == CFilterElementHideAttrPos::EXACT)
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 654
656 void CPluginFilter::ClearFilters() 655 void CPluginFilter::ClearFilters()
657 { 656 {
658 // Clear filter maps 657 // Clear filter maps
659 CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap); 658 CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
660 m_elementHideTags.clear(); 659 m_elementHideTags.clear();
661 m_elementHideTagsId.clear(); 660 m_elementHideTagsId.clear();
662 m_elementHideTagsClass.clear(); 661 m_elementHideTagsClass.clear();
663 } 662 }
664 663
OLDNEW
« no previous file with comments | « src/engine/NotificationWindow.cpp ('k') | src/shared/MsHTMLUtils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld