Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1547)

Unified Diff: third_party/WebKit/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp
===================================================================
--- third_party/WebKit/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp (revision 9383)
+++ third_party/WebKit/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp (working copy)
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2009 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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.
- */
-
-#include "config.h"
-
-#include "v8_binding.h"
-#include "v8_custom.h"
-#include "v8_proxy.h"
-
-#include "Database.h"
-#include "SQLValue.h"
-#include "V8CustomSQLStatementCallback.h"
-#include "V8CustomSQLStatementErrorCallback.h"
-#include <wtf/Vector.h>
-
-using namespace WTF;
-
-namespace WebCore {
-
-CALLBACK_FUNC_DECL(SQLTransactionExecuteSql)
-{
- INC_STATS("DOM.SQLTransaction.executeSql()");
-
- if (args.Length() == 0) {
- V8Proxy::ThrowError(V8Proxy::SYNTAX_ERROR, "SQL statement is required.");
- return v8::Undefined();
- }
-
- String statement = ToWebCoreString(args[0]);
-
- Vector<SQLValue> sqlValues;
-
- if (args.Length() > 1) {
- // FIXME: Make this work for v8::Arrayish objects, as well
- if (!args[1]->IsArray()) {
- V8Proxy::ThrowError(V8Proxy::TYPE_ERROR, "Statement arguments must be an v8::Array.");
- return v8::Undefined();
- }
-
- v8::Local<v8::Array> arguments = v8::Local<v8::Array>::Cast(args[1]);
- uint32_t length = arguments->Length();
-
- for (unsigned int i = 0; i < length; ++i) {
- v8::Local<v8::Value> value = arguments->Get(v8::Integer::New(i));
- if (value.IsEmpty() || value->IsNull())
- sqlValues.append(SQLValue());
- else if (value->IsNumber())
- sqlValues.append(SQLValue(value->NumberValue()));
- else
- sqlValues.append(SQLValue(ToWebCoreString(value)));
- }
- }
-
- SQLTransaction* transaction = V8Proxy::ToNativeObject<SQLTransaction>(V8ClassIndex::SQLTRANSACTION, args.Holder());
-
- Frame* frame = V8Proxy::retrieveFrame();
-
- RefPtr<SQLStatementCallback> callback;
- if (args.Length() > 2) {
- if (!args[2]->IsObject()) {
- V8Proxy::ThrowError(V8Proxy::TYPE_ERROR, "Statement callback must be of valid type.");
- return v8::Undefined();
- }
-
- if (frame)
- callback = V8CustomSQLStatementCallback::create(args[2], frame);
- }
-
- RefPtr<SQLStatementErrorCallback> errorCallback;
- if (args.Length() > 3) {
- if (!args[2]->IsObject()) {
- V8Proxy::ThrowError(V8Proxy::TYPE_ERROR, "Statement error callback must be of valid type.");
- return v8::Undefined();
- }
-
- if (frame)
- errorCallback = V8CustomSQLStatementErrorCallback::create(args[3], frame);
- }
-
- ExceptionCode ec = 0;
- transaction->executeSQL(statement, sqlValues, callback, errorCallback, ec);
- V8Proxy::SetDOMException(ec);
-
- return v8::Undefined();
-}
-
-} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698