Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849

* changes:
  Merge WebKit at r65072 : Update WebKit revision number.
  Merge WebKit at r65072 : Update test_expectations.
  Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
  Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
  Merge WebKit at r65072: JSC build fix in InspectorController.h
  Merge WebKit at r65072: Fix V8 code generator.
  Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
  Merge WebKit at r65072: String class has moved to the WTF namespace.
  Merge Webkit at r65072 : Fix conflicts.
  Merge Webkit at r65072 : Fix Makefiles.
  Merge WebKit at r65072 : Initial merge by git.

1 files changed, 1 insertions, 65 deletions

diff --git a/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp b/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp
index f66ff3d..53d731d 100755
--- a/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp
@@ -33,12 +33,6 @@
 #if ENABLE(WORKERS)
 #include "V8WorkerContext.h"
 
-#if ENABLE(DATABASE)
-#include "Database.h"
-#include "V8Database.h"
-#include "V8DatabaseCallback.h"
-#include "V8DatabaseSync.h"
-#endif
 #include "DOMTimer.h"
 #include "ExceptionCode.h"
 #include "ScheduledAction.h"
@@ -71,7 +65,7 @@ v8::Handle<v8::Value> SetTimeoutOrInterval(const v8::Arguments& args, bool singl
 
     v8::Handle<v8::Context> v8Context = proxy->context();
     if (function->IsString()) {
-        WebCore::String stringFunction = toWebCoreString(function);
+        WTF::String stringFunction = toWebCoreString(function);
         timerId = DOMTimer::install(workerContext, new ScheduledAction(v8Context, stringFunction, workerContext->url()), timeout, singleShot);
     } else if (function->IsFunction()) {
         size_t paramCount = argumentCount >= 2 ? argumentCount - 2 : 0;
@@ -143,64 +137,6 @@ v8::Handle<v8::Value> toV8(WorkerContext* impl)
     return global;
 }
 
-#if ENABLE(DATABASE)
-v8::Handle<v8::Value> V8WorkerContext::openDatabaseCallback(const v8::Arguments& args)
-{
-    INC_STATS("DOM.V8WorkerContext.openDatabase()");
-    if (args.Length() < 4)
-        return throwError(SYNTAX_ERR);
-
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(name, args[0]);
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(version, args[1]);
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(displayName, args[2]);
-    EXCEPTION_BLOCK(unsigned long, estimatedSize, args[3]->Uint32Value());
-
-    WorkerContext* workerContext = V8WorkerContext::toNative(args.Holder());
-
-    RefPtr<DatabaseCallback> creationCallback;
-    if (args.Length() >= 5) {
-        if (!args[4]->IsObject())
-            return throwError(TYPE_MISMATCH_ERR);
-
-        creationCallback = V8DatabaseCallback::create(args[4]);
-    }
-
-    ExceptionCode ec = 0;
-    v8::Handle<v8::Value> result = toV8(workerContext->openDatabase(name, version, displayName, estimatedSize, creationCallback.release(), ec));
-
-    V8Proxy::setDOMException(ec);
-    return result;
-}
-
-v8::Handle<v8::Value> V8WorkerContext::openDatabaseSyncCallback(const v8::Arguments& args)
-{
-    INC_STATS("DOM.V8WorkerContext.openDatabaseSync()");
-    if (args.Length() < 4)
-        return throwError(SYNTAX_ERR);
-
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(name, args[0]);
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(version, args[1]);
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(displayName, args[2]);
-    EXCEPTION_BLOCK(unsigned long, estimatedSize, args[3]->Uint32Value());
-
-    WorkerContext* workerContext = V8WorkerContext::toNative(args.Holder());
-
-    RefPtr<DatabaseCallback> creationCallback;
-    if (args.Length() >= 5) {
-        if (!args[4]->IsObject())
-            return throwError(TYPE_MISMATCH_ERR);
-
-        creationCallback = V8DatabaseCallback::create(args[4]);
-    }
-
-    ExceptionCode ec = 0;
-    v8::Handle<v8::Value> result = toV8(workerContext->openDatabaseSync(name, version, displayName, estimatedSize, creationCallback.release(), ec));
-
-    V8Proxy::setDOMException(ec);
-    return result;
-}
-#endif
-
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS)