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

Side by Side Diff: src/plugin/PluginDomTraverserBase.h

Issue 5491870822039552: Issue #1234 - Remove old versions of ToWstring and ToCString (Closed)
Patch Set: Created Jan. 13, 2015, 3:35 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/plugin/PluginDebug.cpp ('k') | src/plugin/PluginFilter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #ifndef _PLUGIN_DOM_TRAVERSER_BASE_H_ 1 #ifndef _PLUGIN_DOM_TRAVERSER_BASE_H_
2 #define _PLUGIN_DOM_TRAVERSER_BASE_H_ 2 #define _PLUGIN_DOM_TRAVERSER_BASE_H_
3 3
4 4
5 #include "PluginTypedef.h" 5 #include "PluginTypedef.h"
6 #include "PluginTab.h" 6 #include "PluginTab.h"
7 7
8 8
9 class CPluginDomTraverserCacheBase 9 class CPluginDomTraverserCacheBase
10 { 10 {
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 // Some times, domain is missing. Should this be added on image src' s as well?'' 267 // Some times, domain is missing. Should this be added on image src' s as well?''
268 268
269 // eg. gadgetzone.com.au 269 // eg. gadgetzone.com.au
270 if (srcLegacy.Left(2) == L"//") 270 if (srcLegacy.Left(2) == L"//")
271 { 271 {
272 srcLegacy = L"http:" + srcLegacy; 272 srcLegacy = L"http:" + srcLegacy;
273 } 273 }
274 // eg. http://w3schools.com/html/html_examples.asp 274 // eg. http://w3schools.com/html/html_examples.asp
275 else if (srcLegacy.Left(4) != L"http" && srcLegacy.Left(6) != L"res: //") 275 else if (srcLegacy.Left(4) != L"http" && srcLegacy.Left(6) != L"res: //")
276 { 276 {
277 srcLegacy = L"http://" + to_CString(m_domain) + srcLegacy; 277 srcLegacy = L"http://" + ToCString(m_domain) + srcLegacy;
278 } 278 }
279 std::wstring src(ToWstring(srcLegacy)); 279 std::wstring src(ToWstring(srcLegacy));
280 UnescapeUrl(src); 280 UnescapeUrl(src);
281 281
282 // Check if Iframe should be traversed 282 // Check if Iframe should be traversed
283 if (OnIFrame(pFrameEl, src, indent)) 283 if (OnIFrame(pFrameEl, src, indent))
284 { 284 {
285 CComQIPtr<IWebBrowser2> pFrameBrowser = pFrameDispatch; 285 CComQIPtr<IWebBrowser2> pFrameBrowser = pFrameDispatch;
286 if (pFrameBrowser) 286 if (pFrameBrowser)
287 { 287 {
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 { 446 {
447 m_cacheIndexLast = 0; 447 m_cacheIndexLast = 0;
448 m_cacheDocumentHasFrames.clear(); 448 m_cacheDocumentHasFrames.clear();
449 m_cacheDocumentHasIframes.clear(); 449 m_cacheDocumentHasIframes.clear();
450 } 450 }
451 m_criticalSection.Unlock(); 451 m_criticalSection.Unlock();
452 } 452 }
453 453
454 454
455 #endif // _PLUGIN_DOM_TRAVERSER_BASE_H_ 455 #endif // _PLUGIN_DOM_TRAVERSER_BASE_H_
OLDNEW
« no previous file with comments | « src/plugin/PluginDebug.cpp ('k') | src/plugin/PluginFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld