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

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

Issue 29330709: Issue #3343 - Eliminate unescaping of URL (Closed)
Left Patch Set: Created Nov. 23, 2015, 2:16 p.m.
Right Patch Set: Reverted unrelated defect introduction Created Nov. 25, 2015, 4:17 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
« no previous file with change/comment | « src/plugin/AdblockPlusDomTraverser.cpp ('k') | src/plugin/PluginDomTraverserBase.h » ('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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 } 480 }
481 if (!urlVariant || urlVariant->vt != VT_BSTR) 481 if (!urlVariant || urlVariant->vt != VT_BSTR)
482 { 482 {
483 return; 483 return;
484 } 484 }
485 std::wstring url(urlVariant->bstrVal, SysStringLen(urlVariant->bstrVal)); 485 std::wstring url(urlVariant->bstrVal, SysStringLen(urlVariant->bstrVal));
486 486
487 // If webbrowser2 is equal to top level browser (as set in SetSite), we are 487 // If webbrowser2 is equal to top level browser (as set in SetSite), we are
488 // navigating new page 488 // navigating new page
489 CPluginClient* client = CPluginClient::GetInstance(); 489 CPluginClient* client = CPluginClient::GetInstance();
490 if (url.find(L"javascript") == std::wstring::npos) 490 if (url.find(L"javascript") == 0)
Oleksandr 2015/11/25 02:24:29 Nit: unrelated change.
sergei 2015/11/25 08:29:14 It's even completely different condition. `url.fin
Eric 2015/11/25 16:18:21 Doh! Reverted in new patch set.
491 { 491 {
492 } 492 }
493 else if (GetBrowser().IsEqualObject(webBrowser)) 493 else if (GetBrowser().IsEqualObject(webBrowser))
494 { 494 {
495 m_tab->OnNavigate(url); 495 m_tab->OnNavigate(url);
496 DEBUG_GENERAL( 496 DEBUG_GENERAL(
497 L"======================================================================== ========\n" 497 L"======================================================================== ========\n"
498 L"Begin main navigation url:" + url + L"\n" 498 L"Begin main navigation url:" + url + L"\n"
499 L"======================================================================== ========") 499 L"======================================================================== ========")
500 500
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1729 s_criticalSectionLocal.Unlock(); 1729 s_criticalSectionLocal.Unlock();
1730 1730
1731 } 1731 }
1732 } 1732 }
1733 } 1733 }
1734 1734
1735 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); 1735 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
1736 } 1736 }
1737 return hTabWnd; 1737 return hTabWnd;
1738 } 1738 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld