Merge WebKit at r64523 : Initial merge by git.

Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4

4 files changed, 15 insertions, 11 deletions

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/WebIndexedDatabase.h b/WebKit/chromium/public/WebIDBFactory.h
index 5517a0c..5eb6f58 100644..100755
--- a/WebKit/chromium/public/WebIndexedDatabase.h
+++ b/WebKit/chromium/public/WebIDBFactory.h
@@ -26,10 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebIndexedDatabase_h
-#define WebIndexedDatabase_h
+#ifndef WebIDBFactory_h
+#define WebIDBFactory_h
 
 #include "WebCommon.h"
+#include "WebDOMStringList.h"
 #include "WebIDBCallbacks.h"
 #include "WebSecurityOrigin.h"
 #include "WebString.h"
@@ -41,14 +42,14 @@ 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.
+// 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 WebIndexedDatabase {
+class WebIDBFactory {
 public:
-    WEBKIT_API static WebIndexedDatabase* create();
+    WEBKIT_API static WebIDBFactory* create();
 
-    virtual ~WebIndexedDatabase() { }
+    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)
@@ -66,4 +67,4 @@ public:
 
 } // namespace WebKit
 
-#endif // WebIndexedDatabase_h
+#endif // WebIDBFactory_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();
 };