Skip to content

Commit

Permalink
Merge r172592 - WebKit2GTK - WebKitWebProcess assertion fails when dr…
Browse files Browse the repository at this point in the history
…agging and dropping a file into the view

https://bugs.webkit.org/show_bug.cgi?id=127576

Patch by Michael Catanzaro <mcatanzaro@igalia.com> on 2014-08-14
Reviewed by Carlos Garcia Campos.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::performDragControllerAction): Assume read access
to any file that has been dragged into the web view when compiling for
GTK, since we don't support sandbox extensions.
  • Loading branch information
mcatanzaro authored and carlosgcampos committed Aug 25, 2014
1 parent d996735 commit 5379da6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
12 changes: 12 additions & 0 deletions Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
2014-08-14 Michael Catanzaro <mcatanzaro@igalia.com>

WebKit2GTK - WebKitWebProcess assertion fails when dragging and dropping a file into the view
https://bugs.webkit.org/show_bug.cgi?id=127576

Reviewed by Carlos Garcia Campos.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::performDragControllerAction): Assume read access
to any file that has been dragged into the web view when compiling for
GTK, since we don't support sandbox extensions.

2014-08-21 Víctor Manuel Jáquez Leal <vjaquez@igalia.com>

[GTK] WebkitWebProcess crashing navigating away from ogg video element
Expand Down
3 changes: 3 additions & 0 deletions Source/WebKit2/UIProcess/WebPageProxy.cpp
Expand Up @@ -1102,6 +1102,9 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
if (!isValid())
return;
#if PLATFORM(GTK)
String url = dragData.asURL(nullptr);
if (!url.isEmpty())
m_process->assumeReadAccessToBaseURL(url);
m_process->send(Messages::WebPage::PerformDragControllerAction(action, dragData), m_pageID);
#else
m_process->send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), dragStorageName, dragData.flags(), sandboxExtensionHandle, sandboxExtensionsForUpload), m_pageID);
Expand Down

0 comments on commit 5379da6

Please sign in to comment.