Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Unified Diff: trunk/Source/core/page/DragData.cpp

Issue 211853002: Revert 169711 "Prevent web content from forging File entries in ..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/Source/core/page/DragData.h ('k') | trunk/Source/web/WebDragData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/Source/core/page/DragData.cpp
===================================================================
--- trunk/Source/core/page/DragData.cpp (revision 169978)
+++ trunk/Source/core/page/DragData.cpp (working copy)
@@ -69,21 +69,16 @@
bool DragData::containsURL(FilenameConversionPolicy filenamePolicy) const
{
return m_platformDragData->types().contains(mimeTypeTextURIList)
- || (filenamePolicy == ConvertFilenames
- && (m_platformDragData->containsFilenames() || !m_platformDragData->filenameForNavigation().isEmpty()));
+ || (filenamePolicy == ConvertFilenames && m_platformDragData->containsFilenames());
}
String DragData::asURL(FilenameConversionPolicy filenamePolicy, String* title) const
{
String url;
- if (m_platformDragData->types().contains(mimeTypeTextURIList)) {
+ if (m_platformDragData->types().contains(mimeTypeTextURIList))
m_platformDragData->urlAndTitle(url, title);
- } else if (filenamePolicy == ConvertFilenames) {
- if (containsFiles())
- url = filePathToURL(m_platformDragData->filenames()[0]);
- else
- url = filePathToURL(m_platformDragData->filenameForNavigation());
- }
+ else if (filenamePolicy == ConvertFilenames && containsFiles())
+ url = filePathToURL(m_platformDragData->filenames()[0]);
return url;
}
« no previous file with comments | « trunk/Source/core/page/DragData.h ('k') | trunk/Source/web/WebDragData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698