diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 11:34:21 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 11:34:21 +0000 |
| commit | a6cca85b50acf85e7c0ad2a573e10ef5ccace08d (patch) | |
| tree | 25fd91efd2ec01b8dbc57293a54a4759abc21acf /webkit | |
| parent | 11a65b697e1eca3e0a0c64164ee114b287125cf5 (diff) | |
| download | chromium_src-a6cca85b50acf85e7c0ad2a573e10ef5ccace08d.zip chromium_src-a6cca85b50acf85e7c0ad2a573e10ef5ccace08d.tar.gz chromium_src-a6cca85b50acf85e7c0ad2a573e10ef5ccace08d.tar.bz2 | |
Revert 129583 - Adding DRT support for drag-and-drop using IsolatedFileSystem
Mac 10.6 release bot is suffering flakiness and this change is suspected.
I have no idea but am reverting.
BUG=99823
TEST=LayoutTest is to be added
Review URL: https://chromiumcodereview.appspot.com/9866038
TBR=kinuko@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9968006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/webkit_support.cc | 12 | ||||
| -rw-r--r-- | webkit/support/webkit_support.h | 5 |
2 files changed, 0 insertions, 17 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 0f2ee69..fd2a098 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -49,7 +49,6 @@ #include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_surface.h" #include "webkit/appcache/web_application_cache_host_impl.h" -#include "webkit/fileapi/isolated_context.h" #include "webkit/glue/user_agent.h" #include "webkit/glue/webkit_constants.h" #include "webkit/glue/webkit_glue.h" @@ -681,17 +680,6 @@ void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type, fileSystem->OpenFileSystem(frame, type, size, create, callbacks); } -WebKit::WebString RegisterIsolatedFileSystem( - const WebKit::WebVector<WebKit::WebString>& filenames) { - std::set<FilePath> files; - for (size_t i = 0; i < filenames.size(); ++i) - files.insert(webkit_glue::WebStringToFilePath(filenames[i])); - std::string filesystemId = - fileapi::IsolatedContext::GetInstance()->RegisterIsolatedFileSystem( - files); - return UTF8ToUTF16(filesystemId); -} - // Keyboard code #if defined(TOOLKIT_USES_GTK) int NativeKeyCodeForWindowsKeyCode(int keycode, bool shift) { diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h index feaf0e4..1144d31 100644 --- a/webkit/support/webkit_support.h +++ b/webkit/support/webkit_support.h @@ -12,7 +12,6 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgentClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "ui/base/keycodes/keyboard_codes.h" namespace WebKit { @@ -216,10 +215,6 @@ WebKit::WebURL GetDevToolsPathAsURL(); void OpenFileSystem(WebKit::WebFrame* frame, WebKit::WebFileSystem::Type type, long long size, bool create, WebKit::WebFileSystemCallbacks* callbacks); -// Returns a filesystem ID for the newly created isolated filesystem. -WebKit::WebString RegisterIsolatedFileSystem( - const WebKit::WebVector<WebKit::WebString>& filenames); - // -------- Keyboard code enum { VKEY_LEFT = ui::VKEY_LEFT, |