Changeset 147754 in webkit

Timestamp:

Apr 5, 2013 9:40:31 AM (11 years ago)

Author:

timothy@apple.com

Message:

Allow the Web Inspector to use WebSQL.

This fixes an exception on load in the Safari Web Inspector.

​https://webkit.org/b/114040
rdar://problem/13581422

Reviewed by Anders Carlsson.

Source/WebKit/mac:

• WebCoreSupport/WebInspectorClient.mm:

(-[WebInspectorWindowController webView:frame:exceededDatabaseQuotaForSecurityOrigin:database:]): Added.

Source/WebKit2:

• UIProcess/mac/WebInspectorProxyMac.mm:

(WebKit::exceededDatabaseQuota): Added.
(WebKit::WebInspectorProxy::platformCreateInspectorPage): Hook up exceededDatabaseQuota.

Location:

trunk/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebInspectorClient.mm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (modified) (3 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-04-05  Timothy Hatcher  <timothy@apple.com>
+
+        Allow the Web Inspector to use WebSQL.
+
+        This fixes an exception on load in the Safari Web Inspector.
+
+        https://webkit.org/b/114040
+        rdar://problem/13581422
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/WebInspectorClient.mm:
+        (-[WebInspectorWindowController webView:frame:exceededDatabaseQuotaForSecurityOrigin:database:]): Added.
+
 2013-04-02  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm

@@ -34 +34 @@
 #import "WebFrameView.h"
 #import "WebInspector.h"
+#import "WebInspectorFrontend.h"
 #import "WebInspectorPrivate.h"
-#import "WebInspectorFrontend.h"
 #import "WebLocalizableStringsInternal.h"
 #import "WebNodeHighlighter.h"
+#import "WebPolicyDelegate.h"
+#import "WebQuotaManager.h"
+#import "WebSecurityOriginPrivate.h"
 #import "WebUIDelegate.h"
-#import "WebPolicyDelegate.h"
 #import "WebViewInternal.h"
+#import <algorithm>
 #import <WebCore/Frame.h>
 #import <WebCore/InspectorController.h>
@@ -688 +691 @@
 }
 
+- (void)webView:(WebView *)sender frame:(WebFrame *)frame exceededDatabaseQuotaForSecurityOrigin:(WebSecurityOrigin *)origin database:(NSString *)databaseIdentifier
+{
+    id <WebQuotaManager> databaseQuotaManager = origin.databaseQuotaManager;
+    databaseQuotaManager.quota = std::max<unsigned long long>(5 * 1024 * 1024, databaseQuotaManager.usage * 1.25);
+}
+
 // MARK: -
 // MARK: Policy delegate

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-05  Timothy Hatcher  <timothy@apple.com>
+
+        Allow the Web Inspector to use WebSQL.
+
+        This fixes an exception on load in the Safari Web Inspector.
+
+        https://webkit.org/b/114040
+        rdar://problem/13581422
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (WebKit::exceededDatabaseQuota): Added.
+        (WebKit::WebInspectorProxy::platformCreateInspectorPage): Hook up exceededDatabaseQuota.
+
 2013-04-04  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

@@ -37 +37 @@
 #import "WebPreferences.h"
 #import "WebProcessProxy.h"
+#import <algorithm>
 #import <mach-o/dyld.h>
 #import <WebKitSystemInterface.h>
@@ -223 +224 @@
 
     webInspectorProxy->setInspectorWindowFrame(frame);
+}
+
+static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long, unsigned long long, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, const void*)
+{
+    return std::max<unsigned long long>(expectedUsage, currentDatabaseUsage * 1.25);
 }
 
@@ -411 +417 @@
         0, // didDraw
         0, // pageDidScroll
-        0, // exceededDatabaseQuota
+        exceededDatabaseQuota,
         0, // runOpenPanel
         0, // decidePolicyForGeolocationPermissionRequest