Changeset 57865 in webkit

Timestamp:

Apr 19, 2010 8:59:54 PM (14 years ago)

Author:

dumi@chromium.org

Message:

Bindings clean-up.
​https://bugs.webkit.org/show_bug.cgi?id=37833

Reviewed by Geoffrey Garen.

Move some WebSQLDatabases logic out of the bindings into
DOMWindow.cpp where it should be.

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::openDatabase):

• bindings/v8/custom/V8DOMWindowCustom.cpp:

(WebCore::V8DOMWindow::openDatabaseCallback):

• page/DOMWindow.cpp:

(WebCore::DOMWindow::openDatabase):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMWindowCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8DOMWindowCustom.cpp (modified) (1 diff)
• page/DOMWindow.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-19  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Geoffrey Garen.
+
+        Bindings clean-up.
+        https://bugs.webkit.org/show_bug.cgi?id=37833
+
+        Move some WebSQLDatabases logic out of the bindings into
+        DOMWindow.cpp where it should be.
+
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::openDatabase):
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        (WebCore::V8DOMWindow::openDatabaseCallback):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::openDatabase):
+
 2010-04-19  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -978 +978 @@
 
     JSValue result = toJS(exec, globalObject(), WTF::getPtr(impl()->openDatabase(ustringToString(name), ustringToString(version), ustringToString(displayName), estimatedSize, creationCallback.release(), ec)));
-    if (!ec && result.isNull())
-        ec = SECURITY_ERR;
 
     setDOMException(exec, ec);

trunk/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

@@ -736 +736 @@
 
     v8::Handle<v8::Value> result = toV8(imp->openDatabase(name, version, displayName, estimatedSize, creationCallback.release(), ec));
-    if (!ec && result.IsEmpty())
-        ec = SECURITY_ERR;
 
     V8Proxy::setDOMException(ec);

trunk/WebCore/page/DOMWindow.cpp

@@ -1200 +1200 @@
 PassRefPtr<Database> DOMWindow::openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
 {
-    if (!m_frame)
-        return 0;
-
-    if (!Database::isAvailable())
-        return 0;
-
-    Document* document = m_frame->document();
-    if (!document->securityOrigin()->canAccessDatabase()) {
+    RefPtr<Database> database = 0;
+    if (m_frame && Database::isAvailable() && m_frame->document()->securityOrigin()->canAccessDatabase())
+        database = Database::openDatabase(m_frame->document(), name, version, displayName, estimatedSize, creationCallback, ec);
+
+    if (!database && !ec)
         ec = SECURITY_ERR;
-        return 0;
-    }
-
-    return Database::openDatabase(document, name, version, displayName, estimatedSize, creationCallback, ec);
+
+    return database;
 }
 #endif