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

Delta Between Two Patch Sets: src/plugin/AdblockPlusClient.cpp

Issue 5747779603267584: Issue #1234 - Rework strings in debug facility (Closed)
Left Patch Set: Fixed spaces Created Feb. 25, 2015, 3:24 p.m.
Right Patch Set: typo fix Created March 5, 2015, 12:43 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « adblockplus.gyp ('k') | src/plugin/AdblockPlusDomTraverser.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 message >> specialization; 144 message >> specialization;
145 description.specialization = ToUtf16String(specialization); 145 description.specialization = ToUtf16String(specialization);
146 message >> description.listed; 146 message >> description.listed;
147 result.push_back(description); 147 result.push_back(description);
148 } 148 }
149 return result; 149 return result;
150 } 150 }
151 } 151 }
152 152
153 CAdblockPlusClient* CAdblockPlusClient::s_instance = NULL; 153 CAdblockPlusClient* CAdblockPlusClient::s_instance = NULL;
154 154 CComAutoCriticalSection CAdblockPlusClient::s_criticalSectionLocal;
155 CAdblockPlusClient::CAdblockPlusClient() : CPluginClientBase() 155
156 CAdblockPlusClient::CAdblockPlusClient()
156 { 157 {
157 m_filter = std::auto_ptr<CPluginFilter>(new CPluginFilter()); 158 m_filter = std::auto_ptr<CPluginFilter>(new CPluginFilter());
158 } 159 }
159 160
160 bool CAdblockPlusClient::CallEngine(Communication::OutputBuffer& message, Commun ication::InputBuffer& inputBuffer) 161 bool CAdblockPlusClient::CallEngine(Communication::OutputBuffer& message, Commun ication::InputBuffer& inputBuffer)
161 { 162 {
162 DEBUG_GENERAL("CallEngine start"); 163 DEBUG_GENERAL("CallEngine start");
163 CriticalSection::Lock lock(enginePipeLock); 164 CriticalSection::Lock lock(enginePipeLock);
164 try 165 try
165 { 166 {
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 DEBUG_GENERAL("CompareVersions"); 558 DEBUG_GENERAL("CompareVersions");
558 Communication::OutputBuffer request; 559 Communication::OutputBuffer request;
559 request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8S tring(v2); 560 request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8S tring(v2);
560 Communication::InputBuffer response; 561 Communication::InputBuffer response;
561 if (!CallEngine(request, response)) 562 if (!CallEngine(request, response))
562 return 0; 563 return 0;
563 int result; 564 int result;
564 response >> result; 565 response >> result;
565 return result; 566 return result;
566 } 567 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld