[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[dumi at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit f315e59c73a2f914a1cb0243c3de907468261ae1
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 22:51:43 2010 +0000

    Allow creating/dropping virtual tables when the module is FTS2.
    
    Reviewed by Dimitri Glazkov.
    
    https://bugs.webkit.org/show_bug.cgi?id=34867
    
    * storage/DatabaseAuthorizer.cpp:
    (WebCore::DatabaseAuthorizer::createVTable):
    (WebCore::DatabaseAuthorizer::dropVTable):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54990 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 82e379f..ae1a99a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-18  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Allow creating/dropping virtual tables when the module is FTS2.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34867
+
+        * storage/DatabaseAuthorizer.cpp:
+        (WebCore::DatabaseAuthorizer::createVTable):
+        (WebCore::DatabaseAuthorizer::dropVTable):
+
 2010-02-18  Peter Kasting  <pkasting at google.com>
 
         Not reviewed, Chromium build fix.
diff --git a/WebCore/storage/DatabaseAuthorizer.cpp b/WebCore/storage/DatabaseAuthorizer.cpp
index d87d4d9..6b6b147 100644
--- a/WebCore/storage/DatabaseAuthorizer.cpp
+++ b/WebCore/storage/DatabaseAuthorizer.cpp
@@ -263,21 +263,29 @@ int DatabaseAuthorizer::dropTempView(const String&)
     return (m_readOnly && m_securityEnabled ? SQLAuthDeny : SQLAuthAllow);
 }
 
-int DatabaseAuthorizer::createVTable(const String&, const String&)
+int DatabaseAuthorizer::createVTable(const String& tableName, const String& moduleName)
 {
     if (m_readOnly && m_securityEnabled)
         return SQLAuthDeny;
 
+    // fts2 is used in Chromium
+    if (moduleName != "fts2")
+        return SQLAuthDeny;
+
     m_lastActionChangedDatabase = true;
-    return m_securityEnabled ? SQLAuthDeny : SQLAuthAllow;
+    return denyBasedOnTableName(tableName);
 }
 
-int DatabaseAuthorizer::dropVTable(const String&, const String&)
+int DatabaseAuthorizer::dropVTable(const String& tableName, const String& moduleName)
 {
     if (m_readOnly && m_securityEnabled)
         return SQLAuthDeny;
 
-    return m_securityEnabled ? SQLAuthDeny : SQLAuthAllow;
+    // fts2 is used in Chromium
+    if (moduleName != "fts2")
+        return SQLAuthDeny;
+
+    return denyBasedOnTableName(tableName);
 }
 
 int DatabaseAuthorizer::allowDelete(const String& tableName)

-- 
WebKit Debian packaging