Title: [132166] trunk/Tools
- Revision
- 132166
- Author
- joc...@chromium.org
- Date
- 2012-10-22 17:42:42 -0700 (Mon, 22 Oct 2012)
Log Message
[chromium] Move the call to RegisterIsolatedFileSystem to the WebTestDelegate interface
https://bugs.webkit.org/show_bug.cgi?id=100048
Reviewed by Adam Barth.
The call needs to be done outside of the sandbox.
* DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
(WebTestDelegate):
* DumpRenderTree/chromium/TestRunner/src/EventSender.cpp:
(WebTestRunner):
(WebTestRunner::EventSender::beginDragWithFiles):
* DumpRenderTree/chromium/TestRunner/src/TestDelegate.h:
(TestDelegate):
* DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp:
(WebTestInterfaces::Internal):
(WebTestRunner::WebTestInterfaces::Internal::registerIsolatedFileSystem):
(WebTestRunner):
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::registerIsolatedFileSystem):
* DumpRenderTree/chromium/WebViewHost.h:
(WebViewHost):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (132165 => 132166)
--- trunk/Tools/ChangeLog 2012-10-23 00:39:59 UTC (rev 132165)
+++ trunk/Tools/ChangeLog 2012-10-23 00:42:42 UTC (rev 132166)
@@ -1,3 +1,28 @@
+2012-10-22 Jochen Eisinger <joc...@chromium.org>
+
+ [chromium] Move the call to RegisterIsolatedFileSystem to the WebTestDelegate interface
+ https://bugs.webkit.org/show_bug.cgi?id=100048
+
+ Reviewed by Adam Barth.
+
+ The call needs to be done outside of the sandbox.
+
+ * DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
+ (WebTestDelegate):
+ * DumpRenderTree/chromium/TestRunner/src/EventSender.cpp:
+ (WebTestRunner):
+ (WebTestRunner::EventSender::beginDragWithFiles):
+ * DumpRenderTree/chromium/TestRunner/src/TestDelegate.h:
+ (TestDelegate):
+ * DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp:
+ (WebTestInterfaces::Internal):
+ (WebTestRunner::WebTestInterfaces::Internal::registerIsolatedFileSystem):
+ (WebTestRunner):
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::registerIsolatedFileSystem):
+ * DumpRenderTree/chromium/WebViewHost.h:
+ (WebViewHost):
+
2012-10-22 Dirk Pranke <dpra...@chromium.org>
webkitpy: remove unneeded debug messages from find_files()
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h (132165 => 132166)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h 2012-10-23 00:39:59 UTC (rev 132165)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h 2012-10-23 00:42:42 UTC (rev 132166)
@@ -57,6 +57,8 @@
// for deleting them.
virtual void postTask(WebTask*) = 0;
virtual void postDelayedTask(WebTask*, long long ms) = 0;
+
+ virtual WebKit::WebString registerIsolatedFileSystem(const WebKit::WebVector<WebKit::WebString>& absoluteFilenames) = 0;
};
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp (132165 => 132166)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp 2012-10-23 00:39:59 UTC (rev 132165)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp 2012-10-23 00:42:42 UTC (rev 132166)
@@ -51,6 +51,7 @@
#include "platform/WebDragData.h"
#include "platform/WebPoint.h"
#include "platform/WebString.h"
+#include "platform/WebVector.h"
#include "webkit/support/webkit_support.h"
#include <wtf/Deque.h>
#include <wtf/StringExtras.h>
@@ -901,15 +902,15 @@
{
currentDragData.initialize();
Vector<string> files = arguments[0].toStringVector();
- Vector<WebString> absoluteFilenames;
+ WebVector<WebString> absoluteFilenames(files.size());
for (size_t i = 0; i < files.size(); ++i) {
WebDragData::Item item;
item.storageType = WebDragData::Item::StorageTypeFilename;
item.filenameData = webkit_support::GetAbsoluteWebStringFromUTF8Path(files[i]);
currentDragData.addItem(item);
- absoluteFilenames.append(item.filenameData);
+ absoluteFilenames[i] = item.filenameData;
}
- currentDragData.setFilesystemId(webkit_support::RegisterIsolatedFileSystem(absoluteFilenames));
+ currentDragData.setFilesystemId(m_delegate->registerIsolatedFileSystem(absoluteFilenames));
currentDragEffectsAllowed = WebKit::WebDragOperationCopy;
// Provide a drag source.
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestDelegate.h (132165 => 132166)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestDelegate.h 2012-10-23 00:39:59 UTC (rev 132165)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestDelegate.h 2012-10-23 00:42:42 UTC (rev 132166)
@@ -54,6 +54,7 @@
virtual void printMessage(const std::string& message) const = 0;
virtual void postTask(WebTestRunner::WebTask*) = 0;
virtual void postDelayedTask(WebTestRunner::WebTask*, long long ms) = 0;
+ virtual WebKit::WebString registerIsolatedFileSystem(const WebKit::WebVector<WebKit::WebString>& absoluteFilenames) = 0;
};
#endif // TestDelegate_h
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp (132165 => 132166)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp 2012-10-23 00:39:59 UTC (rev 132165)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp 2012-10-23 00:42:42 UTC (rev 132166)
@@ -66,6 +66,7 @@
virtual void printMessage(const std::string& message) const;
virtual void postTask(WebTask*);
virtual void postDelayedTask(WebTask*, long long ms);
+ virtual WebString registerIsolatedFileSystem(const WebVector<WebString>& absoluteFilenames);
private:
TestInterfaces m_interfaces;
@@ -141,6 +142,11 @@
m_delegate->postDelayedTask(task, ms);
}
+WebString WebTestInterfaces::Internal::registerIsolatedFileSystem(const WebVector<WebString>& absoluteFilenames)
+{
+ return m_delegate->registerIsolatedFileSystem(absoluteFilenames);
+}
+
WebTestInterfaces::WebTestInterfaces()
{
m_internal = new Internal;
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (132165 => 132166)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-10-23 00:39:59 UTC (rev 132165)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-10-23 00:42:42 UTC (rev 132166)
@@ -1495,6 +1495,11 @@
::postDelayedTask(task, ms);
}
+WebString WebViewHost::registerIsolatedFileSystem(const WebVector<WebString>& absoluteFilenames)
+{
+ return webkit_support::RegisterIsolatedFileSystem(absoluteFilenames);
+}
+
// Public functions -----------------------------------------------------------
WebViewHost::WebViewHost(TestShell* shell)
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (132165 => 132166)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-10-23 00:39:59 UTC (rev 132165)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-10-23 00:42:42 UTC (rev 132166)
@@ -138,6 +138,7 @@
virtual void printMessage(const std::string& message) const OVERRIDE;
virtual void postTask(WebTestRunner::WebTask*) OVERRIDE;
virtual void postDelayedTask(WebTestRunner::WebTask*, long long ms) OVERRIDE;
+ virtual WebKit::WebString registerIsolatedFileSystem(const WebKit::WebVector<WebKit::WebString>& absoluteFilenames) OVERRIDE;
// NavigationHost
virtual bool navigate(const TestNavigationEntry&, bool reload);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
