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: Created Nov. 29, 2015, 3:59 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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 { 340 {
341 CComBSTR idBstr; 341 CComBSTR idBstr;
342 if (SUCCEEDED(pEl->get_id(&idBstr)) && idBstr) 342 if (SUCCEEDED(pEl->get_id(&idBstr)) && idBstr)
343 { 343 {
344 value = ToWstring(idBstr); 344 value = ToWstring(idBstr);
345 attrFound = true; 345 attrFound = true;
346 } 346 }
347 } 347 }
348 else 348 else
349 { 349 {
350 CComBSTR attrArgument(attrIt->m_attr.length(), attrIt->m_attr.c_str()); 350 auto x = GetHtmlElementAttribute(*pEl, attrIt->m_attr);
351 auto x = GetHtmlElementAttribute(*pEl, attrArgument);
352 attrFound = x.isAttributeFound; 351 attrFound = x.isAttributeFound;
353 if (attrFound) 352 if (attrFound)
354 { 353 {
355 value = x.attributeValue; 354 value = x.attributeValue;
356 } 355 }
357 } 356 }
358 357
359 if (attrFound) 358 if (attrFound)
360 { 359 {
361 if (attrIt->m_pos == CFilterElementHideAttrPos::EXACT) 360 if (attrIt->m_pos == CFilterElementHideAttrPos::EXACT)
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 CPluginDebug::DebugResultBlocking(type, srcTrimmed, domain); 676 CPluginDebug::DebugResultBlocking(type, srcTrimmed, domain);
678 } 677 }
679 else 678 else
680 { 679 {
681 CPluginDebug::DebugResultIgnoring(type, srcTrimmed, domain); 680 CPluginDebug::DebugResultIgnoring(type, srcTrimmed, domain);
682 } 681 }
683 } 682 }
684 #endif 683 #endif
685 return result; 684 return result;
686 } 685 }
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