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

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

Issue 4912420225024000: Issue #1234 - Convert strings associated with URL's (Closed)
Left Patch Set: Created Oct. 20, 2014, 2:34 a.m.
Right Patch Set: Created Jan. 5, 2015, 4:15 p.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
LEFTRIGHT
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 2
3 #include "PluginClient.h" 3 #include "PluginClient.h"
4 #include "PluginSettings.h" 4 #include "PluginSettings.h"
5 #include "PluginTab.h" 5 #include "PluginTab.h"
6 #include "PluginDomTraverser.h" 6 #include "AdblockPlusDomTraverser.h"
7 #include "PluginClass.h" 7 #include "PluginClass.h"
8 #include "PluginTabBase.h" 8 #include "PluginTabBase.h"
9 #include "PluginUtil.h" 9 #include "PluginUtil.h"
10 #include <dispex.h> 10 #include <dispex.h>
11 #include <Mshtmhst.h> 11 #include <Mshtmhst.h>
12 12
13 int CPluginTabBase::s_dictionaryVersion = 0; 13 int CPluginTabBase::s_dictionaryVersion = 0;
14 int CPluginTabBase::s_settingsVersion = 1; 14 int CPluginTabBase::s_settingsVersion = 1;
15 int CPluginTabBase::s_filterVersion = 0; 15 int CPluginTabBase::s_filterVersion = 0;
16 int CPluginTabBase::s_whitelistVersion = 0; 16 int CPluginTabBase::s_whitelistVersion = 0;
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 pOleObj->GetClientSite(&pClientSite); 202 pOleObj->GetClientSite(&pClientSite);
203 if (pClientSite != NULL) 203 if (pClientSite != NULL)
204 { 204 {
205 CComPtr<IDocHostUIHandler> docHostUIHandler; 205 CComPtr<IDocHostUIHandler> docHostUIHandler;
206 pClientSite->QueryInterface(IID_IDocHostUIHandler, (void**)&docHostUIHandl er); 206 pClientSite->QueryInterface(IID_IDocHostUIHandler, (void**)&docHostUIHandl er);
207 if (docHostUIHandler != NULL) 207 if (docHostUIHandler != NULL)
208 { 208 {
209 docHostUIHandler->UpdateUI(); 209 docHostUIHandler->UpdateUI();
210 } 210 }
211 } 211 }
212
213 pDoc.Release();
214 pDocDispatch.Release();
215 } 212 }
216 } 213 }
217 214
218 std::wstring CPluginTabBase::GetDocumentDomain() 215 std::wstring CPluginTabBase::GetDocumentDomain()
219 { 216 {
220 std::wstring domain; 217 std::wstring domain;
221 218
222 m_criticalSection.Lock(); 219 m_criticalSection.Lock();
223 { 220 {
224 domain = m_documentDomain; 221 domain = m_documentDomain;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 CPluginClient::LogPluginError(pluginError.GetErrorCode(), pluginError. GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), tr ue, pluginError.GetProcessId(), pluginError.GetThreadId()); 348 CPluginClient::LogPluginError(pluginError.GetErrorCode(), pluginError. GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), tr ue, pluginError.GetProcessId(), pluginError.GetThreadId());
352 } 349 }
353 350
354 // Non-hanging sleep 351 // Non-hanging sleep
355 Sleep(50); 352 Sleep(50);
356 } 353 }
357 354
358 tabLoopIteration++; 355 tabLoopIteration++;
359 } 356 }
360 } 357 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld