From db14019a23d96bc8a444b6576a5da8bd1cfbc8b0 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 4 Aug 2010 11:41:34 +0100 Subject: Merge WebKit at r64523 : Initial merge by git. Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4 --- WebKit/chromium/public/WebDOMStringList.h | 2 +- WebKit/chromium/public/WebIDBFactory.h | 70 +++++++++++++++++++++++++++++ WebKit/chromium/public/WebIndexedDatabase.h | 69 ---------------------------- WebKit/chromium/public/WebKitClient.h | 4 +- WebKit/chromium/public/WebRuntimeFeatures.h | 3 ++ 5 files changed, 76 insertions(+), 72 deletions(-) create mode 100755 WebKit/chromium/public/WebIDBFactory.h delete mode 100644 WebKit/chromium/public/WebIndexedDatabase.h (limited to 'WebKit/chromium/public') diff --git a/WebKit/chromium/public/WebDOMStringList.h b/WebKit/chromium/public/WebDOMStringList.h index d88fcee..dabf1b7 100644 --- a/WebKit/chromium/public/WebDOMStringList.h +++ b/WebKit/chromium/public/WebDOMStringList.h @@ -46,7 +46,7 @@ class WebDOMStringList { public: ~WebDOMStringList() { reset(); } - WebDOMStringList(); + WEBKIT_API WebDOMStringList(); WebDOMStringList(const WebDOMStringList& l) { assign(l); } WebDOMStringList& operator=(const WebDOMStringList& l) { diff --git a/WebKit/chromium/public/WebIDBFactory.h b/WebKit/chromium/public/WebIDBFactory.h new file mode 100755 index 0000000..5eb6f58 --- /dev/null +++ b/WebKit/chromium/public/WebIDBFactory.h @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2010 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef WebIDBFactory_h +#define WebIDBFactory_h + +#include "WebCommon.h" +#include "WebDOMStringList.h" +#include "WebIDBCallbacks.h" +#include "WebSecurityOrigin.h" +#include "WebString.h" + +namespace WebKit { + +class WebFrame; +class WebIDBDatabase; +class WebString; +class WebSecurityOrigin; + +// The entry point into the IndexedDatabase API. These classes match their Foo and +// FooSync counterparts in the spec, but operate only in an async manner. +// http://dev.w3.org/2006/webapi/WebSimpleDB/ +class WebIDBFactory { +public: + WEBKIT_API static WebIDBFactory* create(); + + virtual ~WebIDBFactory() { } + + // The WebKit implementation of open ignores the WebFrame* parameter. + virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame) + { + int exceptionCode; + open(name, description, callbacks, origin, webFrame, exceptionCode); + } + // FIXME: Delete soon. Compatability hack. + virtual void open(const WebString& name, const WebString& description, + WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, int& exceptionCode) + { + open(name, description, callbacks, origin, webFrame); + } +}; + +} // namespace WebKit + +#endif // WebIDBFactory_h diff --git a/WebKit/chromium/public/WebIndexedDatabase.h b/WebKit/chromium/public/WebIndexedDatabase.h deleted file mode 100644 index 5517a0c..0000000 --- a/WebKit/chromium/public/WebIndexedDatabase.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2010 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef WebIndexedDatabase_h -#define WebIndexedDatabase_h - -#include "WebCommon.h" -#include "WebIDBCallbacks.h" -#include "WebSecurityOrigin.h" -#include "WebString.h" - -namespace WebKit { - -class WebFrame; -class WebIDBDatabase; -class WebString; -class WebSecurityOrigin; - -// The entry point into the IndexedDatabase API. These classes match their _____Request and -// _____Sync counterparts in the spec, but operate only in an async manner. -// http://dev.w3.org/2006/webapi/WebSimpleDB/ -class WebIndexedDatabase { -public: - WEBKIT_API static WebIndexedDatabase* create(); - - virtual ~WebIndexedDatabase() { } - - // The WebKit implementation of open ignores the WebFrame* parameter. - virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame) - { - int exceptionCode; - open(name, description, callbacks, origin, webFrame, exceptionCode); - } - // FIXME: Delete soon. Compatability hack. - virtual void open(const WebString& name, const WebString& description, - WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, int& exceptionCode) - { - open(name, description, callbacks, origin, webFrame); - } -}; - -} // namespace WebKit - -#endif // WebIndexedDatabase_h diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h index 48765ac..5959a1c 100644 --- a/WebKit/chromium/public/WebKitClient.h +++ b/WebKit/chromium/public/WebKitClient.h @@ -52,7 +52,7 @@ class WebCookieJar; class WebFileSystem; class WebGLES2Context; class WebGraphicsContext3D; -class WebIndexedDatabase; +class WebIDBFactory; class WebMessagePortChannel; class WebMimeRegistry; class WebPluginListBuilder; @@ -131,7 +131,7 @@ public: // Indexed Database ---------------------------------------------------- - virtual WebIndexedDatabase* indexedDatabase() { return 0; } + virtual WebIDBFactory* idbFactory() { return 0; } // Keygen -------------------------------------------------------------- diff --git a/WebKit/chromium/public/WebRuntimeFeatures.h b/WebKit/chromium/public/WebRuntimeFeatures.h index 95307a2..517aad5 100644 --- a/WebKit/chromium/public/WebRuntimeFeatures.h +++ b/WebKit/chromium/public/WebRuntimeFeatures.h @@ -80,6 +80,9 @@ public: WEBKIT_API static void enableDeviceOrientation(bool); WEBKIT_API static bool isDeviceOrientationEnabled(); + WEBKIT_API static void enableSpeechInput(bool); + WEBKIT_API static bool isSpeechInputEnabled(); + private: WebRuntimeFeatures(); }; -- cgit v1.1