Title: [110370] tags/Safari-536.2.3/Source/WebKit2
Diff
Modified: tags/Safari-536.2.3/Source/WebKit2/ChangeLog (110369 => 110370)
--- tags/Safari-536.2.3/Source/WebKit2/ChangeLog 2012-03-10 05:04:55 UTC (rev 110369)
+++ tags/Safari-536.2.3/Source/WebKit2/ChangeLog 2012-03-10 05:40:15 UTC (rev 110370)
@@ -1,3 +1,23 @@
+2012-03-09 Mark Rowe <[email protected]>
+
+ Merge r110303.
+
+ 2012-03-08 Enrica Casucci <[email protected]>
+
+ REGRESSION (r109022): Files dragged onto input controls cannot be read due to sandbox violation.
+ https://bugs.webkit.org/show_bug.cgi?id=80203
+ <rdar://problem/10976643>
+
+ Reviewed by Alexey Proskuryakov.
+
+ This patch reverts a small part fo r109022, leaving access to
+ NSPasteboard in the WebProcess when retrieving pathnames for
+ files being dragged. This avoid the sandbox violation until we
+ implement a mechanism to provide a sandbox extension to the WebProcess.
+
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::getPathnamesForType):
+
2011-03-06 Lucas Forschler <[email protected]>
Merge 109826
Modified: tags/Safari-536.2.3/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (110369 => 110370)
--- tags/Safari-536.2.3/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2012-03-10 05:04:55 UTC (rev 110369)
+++ tags/Safari-536.2.3/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2012-03-10 05:40:15 UTC (rev 110370)
@@ -155,8 +155,11 @@
void WebPlatformStrategies::getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName)
{
- WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPasteboardPathnamesForType(pasteboardName, pasteboardType),
- Messages::WebContext::GetPasteboardPathnamesForType::Reply(pathnames), 0);
+ // FIXME: this needs to be replaced with the code below, once we resolve the sandboxing issue.
+ // WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPasteboardPathnamesForType(pasteboardName, pasteboardType),
+ // Messages::WebContext::GetPasteboardPathnamesForType::Reply(pathnames), 0);
+
+ PlatformPasteboard(pasteboardName).getPathnamesForType(pathnames, pasteboardType);
}
String WebPlatformStrategies::stringForType(const String& pasteboardType, const String& pasteboardName)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
