WebKitTools:
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Nov 2007 02:19:35 +0000 (02:19 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Nov 2007 02:19:35 +0000 (02:19 +0000)
        Reviewed by Anders.

        Add database quota UIDelegates methods to DRT UIDelegate.

        * DumpRenderTree/mac/UIDelegate.mm:
        (-[UIDelegate webView:quotaForSecurityOrigin:toCreateDatabase:withEstimatedSize:]):
        (-[UIDelegate webView:quotaForSecurityOrigin:fromProposedQuota:database:]):

LayoutTests:

        Reviewed by Anders.

        Revert r28213 which added an error callback that was not needed and changed
        the results.

        * storage/transaction_callback_exception_crash.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28218 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/storage/transaction_callback_exception_crash.html
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/mac/UIDelegate.mm

index 1daf4a0..cb89462 100644 (file)
@@ -1,3 +1,12 @@
+2007-11-29  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders.
+
+        Revert r28213 which added an error callback that was not needed and changed
+        the results.
+
+        * storage/transaction_callback_exception_crash.html:
+
 2007-11-29  Alice Liu  <alice.liu@apple.com>
 
         Reviewed by Adam.
index 258d037..ae66bec 100644 (file)
@@ -1,7 +1,6 @@
 <html>
 <head>
 <script>
-
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
@@ -9,15 +8,10 @@ if (window.layoutTestController) {
 
 var db = openDatabase("15976Test", "1.0", "Test for http://bugs.webkit.org/show_bug.cgi?id=15976", 1);
 db.transaction(function(tx) { 
-    if (window.layoutTestController)
-        setTimeout("layoutTestController.notifyDone()", 0);
-    throw "TransactionCallbackError";
-}, function(err) {
-    if (window.layoutTestController)
-        setTimout("layoutTestController.notifyDone()", 0);
-    document.body.innerText = "Transaction error occured";
+   if (window.layoutTestController)
+       window.setTimeout(function() { layoutTestController.notifyDone() }, 0);
+   throw "TransactionCallbackError";
 });
-
 </script>
 </head>
 <body>
index dc0b00a..d6d20de 100644 (file)
@@ -1,3 +1,13 @@
+2007-11-29  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders.
+
+        Add database quota UIDelegates methods to DRT UIDelegate.
+
+        * DumpRenderTree/mac/UIDelegate.mm:
+        (-[UIDelegate webView:quotaForSecurityOrigin:toCreateDatabase:withEstimatedSize:]):
+        (-[UIDelegate webView:quotaForSecurityOrigin:fromProposedQuota:database:]):
+
 2007-11-29  Kevin McCullough  <kmccullough@apple.com>
 
         Reviewed by Sam.
index 27d790b..0ea30da 100644 (file)
@@ -35,6 +35,7 @@
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebView.h>
+#import <WebKit/WebSecurityOriginPrivate.h>
 #import <wtf/Assertions.h>
 
 DumpRenderTreeDraggingInfo *draggingInfo = nil;
@@ -121,6 +122,17 @@ DumpRenderTreeDraggingInfo *draggingInfo = nil;
     [window close];
 }
 
+- (unsigned long long)webView:(WebView *)sender quotaForSecurityOrigin:(WebSecurityOrigin *)origin toCreateDatabase:(NSString *)newDatabaseName withEstimatedSize:(unsigned long long)estimatedSize
+{
+    return estimatedSize;
+}
+
+- (unsigned long long)webView:(WebView *)sender quotaForSecurityOrigin:(WebSecurityOrigin *)origin fromProposedQuota:(unsigned long long)proposedNewQuota database:(NSString *)databaseIdentifier
+{
+    return proposedNewQuota;
+}
+
+
 - (void)dealloc
 {
     [draggingInfo release];