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

Unified Diff: src/plugin/PluginClass.cpp

Issue 29330709: Issue #3343 - Eliminate unescaping of URL (Closed)
Patch Set: Created Nov. 23, 2015, 2:16 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/plugin/AdblockPlusDomTraverser.cpp ('k') | src/plugin/PluginDomTraverserBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/plugin/PluginClass.cpp
===================================================================
--- a/src/plugin/PluginClass.cpp
+++ b/src/plugin/PluginClass.cpp
@@ -188,7 +188,6 @@
if (SUCCEEDED(browser->get_LocationURL(&bstrURL)) && bstrURL)
{
url = std::wstring(bstrURL, SysStringLen(bstrURL));
- UnescapeUrl(url);
}
}
else
@@ -484,12 +483,11 @@
return;
}
std::wstring url(urlVariant->bstrVal, SysStringLen(urlVariant->bstrVal));
- UnescapeUrl(url);
// If webbrowser2 is equal to top level browser (as set in SetSite), we are
// navigating new page
CPluginClient* client = CPluginClient::GetInstance();
- if (url.find(L"javascript") == 0)
+ if (url.find(L"javascript") == std::wstring::npos)
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.
{
}
else if (GetBrowser().IsEqualObject(webBrowser))
@@ -545,7 +543,6 @@
return;
}
std::wstring frameSrc = GetLocationUrl(*webBrowser2);
- UnescapeUrl(frameSrc);
bool isRootPageBrowser = GetBrowser().IsEqualObject(webBrowser2);
m_tab->OnDocumentComplete(webBrowser2, frameSrc, isRootPageBrowser);
}
« no previous file with comments | « src/plugin/AdblockPlusDomTraverser.cpp ('k') | src/plugin/PluginDomTraverserBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld