summaryrefslogtreecommitdiffstats
path: root/webkit/mocks
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 16:46:59 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 16:46:59 +0000
commit3504fce16112e71f7a1b84c75895b9891a3f41d3 (patch)
tree65cff00b7cb0b9ec535c011b9f1d8361e433562e /webkit/mocks
parent331ff823b6edc2f8c2b1c32cdb1a67828fbf04d9 (diff)
downloadchromium_src-3504fce16112e71f7a1b84c75895b9891a3f41d3.zip
chromium_src-3504fce16112e71f7a1b84c75895b9891a3f41d3.tar.gz
chromium_src-3504fce16112e71f7a1b84c75895b9891a3f41d3.tar.bz2
Fix for WebKit build break.
TEST=none BUG=none TBR=caseq Review URL: http://codereview.chromium.org/6865016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/mocks')
-rw-r--r--webkit/mocks/mock_webframe.cc25
-rw-r--r--webkit/mocks/mock_webframe.h17
2 files changed, 40 insertions, 2 deletions
diff --git a/webkit/mocks/mock_webframe.cc b/webkit/mocks/mock_webframe.cc
index 773b5a1..3984625 100644
--- a/webkit/mocks/mock_webframe.cc
+++ b/webkit/mocks/mock_webframe.cc
@@ -159,10 +159,33 @@ v8::Local<v8::Context> MockWebFrame::mainWorldScriptContext() const {
return v8::Local<v8::Context>();
}
+#ifdef WEB_FILE_SYSTEM_TYPE_EXTERNAL
v8::Handle<v8::Value> MockWebFrame::createFileSystem(
- int type, const WebString& name, const WebString& path) {
+ WebKit::WebFileSystem::Type type, const WebString& name,
+ const WebString& path) {
return v8::Handle<v8::Value>();
}
+
+v8::Handle<v8::Value> MockWebFrame::createFileEntry(
+ WebKit::WebFileSystem::Type type, const WebString& fileSystemName,
+ const WebString& fileSystemPath, const WebString& filePath,
+ bool isDirectory) {
+ return v8::Handle<v8::Value>();
+}
+#else
+v8::Handle<v8::Value> MockWebFrame::createFileSystem(
+ int type, const WebString& name,
+ const WebString& path) {
+ return v8::Handle<v8::Value>();
+}
+
+v8::Handle<v8::Value> MockWebFrame::createFileEntry(
+ int type, const WebString& fileSystemName,
+ const WebString& fileSystemPath, const WebString& filePath,
+ bool isDirectory) {
+ return v8::Handle<v8::Value>();
+}
+#endif
#endif
diff --git a/webkit/mocks/mock_webframe.h b/webkit/mocks/mock_webframe.h
index 199451f..62e640e 100644
--- a/webkit/mocks/mock_webframe.h
+++ b/webkit/mocks/mock_webframe.h
@@ -117,8 +117,23 @@ class MockWebFrame : public WebKit::WebFrame {
virtual v8::Handle<v8::Value> executeScriptAndReturnValue(
const WebScriptSource&);
virtual v8::Local<v8::Context> mainWorldScriptContext() const;
+#ifdef WEB_FILE_SYSTEM_TYPE_EXTERNAL
virtual v8::Handle<v8::Value> createFileSystem(
- int type, const WebString& name, const WebString& path);
+ WebKit::WebFileSystem::Type type, const WebString& name,
+ const WebString& path);
+ virtual v8::Handle<v8::Value> createFileEntry(
+ WebKit::WebFileSystem::Type type, const WebString& fileSystemName,
+ const WebString& fileSystemPath, const WebString& filePath,
+ bool isDirectory);
+#else
+ virtual v8::Handle<v8::Value> createFileSystem(
+ int type, const WebString& name,
+ const WebString& path);
+ virtual v8::Handle<v8::Value> createFileEntry(
+ int type, const WebString& fileSystemName,
+ const WebString& fileSystemPath, const WebString& filePath,
+ bool isDirectory);
+#endif
#endif
virtual bool insertStyleText(const WebString& styleText,
const WebString& elementId);