[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[levin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 1bc093fbcc9522d1038f27959e3536f2756059e9
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 00:36:32 2010 +0000

    2010-03-03  David Levin  <levin at chromium.org>
    
            No review, rolling out r55480.
            http://trac.webkit.org/changeset/55480
    
            The patch broke fast/frames/sandboxed-iframe-storage.html
    
            * storage/Database.cpp:
            * storage/Database.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55484 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 768985b..47dd7f5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-03  David Levin  <levin at chromium.org>
+
+        No review, rolling out r55480.
+        http://trac.webkit.org/changeset/55480
+
+        The patch broke fast/frames/sandboxed-iframe-storage.html
+
+        * storage/Database.cpp:
+        * storage/Database.h:
+
 2010-03-03  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp
index a0bcb83..42eeb11 100644
--- a/WebCore/storage/Database.cpp
+++ b/WebCore/storage/Database.cpp
@@ -35,7 +35,6 @@
 #include "ChangeVersionWrapper.h"
 #include "CString.h"
 #include "DatabaseAuthorizer.h"
-#include "DatabaseCallback.h"
 #include "DatabaseTask.h"
 #include "DatabaseThread.h"
 #include "DatabaseTracker.h"
diff --git a/WebCore/storage/Database.h b/WebCore/storage/Database.h
index 85abfa6..0fd0511 100644
--- a/WebCore/storage/Database.h
+++ b/WebCore/storage/Database.h
@@ -30,6 +30,7 @@
 #define Database_h
 
 #if ENABLE(DATABASE)
+#include "DatabaseCallback.h"
 #include "PlatformString.h"
 #include "SecurityOrigin.h"
 #include "SQLiteDatabase.h"

-- 
WebKit Debian packaging