Changeset 128190 in webkit

Timestamp:

Sep 11, 2012 8:23:37 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2][WKTR] TestRunner needs to implement setApplicationCacheOriginQuota
​https://bugs.webkit.org/show_bug.cgi?id=96379

Patch by Christophe Dumez <Christophe Dumez> on 2012-09-11
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

Add Bundle C API to set the application cache quota for a
given security origin. This is needed by WebKitTestRunner
to implement setApplicationCacheOriginQuota().

• WebProcess/InjectedBundle/API/c/WKBundle.cpp:

(WKBundleSetApplicationCacheOriginQuota):

• WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::setApplicationCacheOriginQuota):
(WebKit):

• WebProcess/InjectedBundle/InjectedBundle.h:

(InjectedBundle):

Tools:

Add implementation for setApplicationCacheOriginQuota
to WebKitTestRunner.

• WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
• WebKitTestRunner/InjectedBundle/TestRunner.cpp:

(WTR::TestRunner::setApplicationCacheOriginQuota):
(WTR):

• WebKitTestRunner/InjectedBundle/TestRunner.h:

(TestRunner):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (2 diffs)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-11  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [WK2][WKTR] TestRunner needs to implement setApplicationCacheOriginQuota
+        https://bugs.webkit.org/show_bug.cgi?id=96379
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add Bundle C API to set the application cache quota for a
+        given security origin. This is needed by WebKitTestRunner
+        to implement setApplicationCacheOriginQuota().
+
+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+        (WKBundleSetApplicationCacheOriginQuota):
+        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::setApplicationCacheOriginQuota):
+        (WebKit):
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        (InjectedBundle):
+
 2012-09-11  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp

@@ -247 +247 @@
 }
 
+void WKBundleSetApplicationCacheOriginQuota(WKBundleRef bundleRef, WKStringRef origin, uint64_t bytes)
+{
+    return toImpl(bundleRef)->setApplicationCacheOriginQuota(toImpl(origin)->string(), bytes);
+}
+
 void WKBundleSetMinimumTimerInterval(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, double seconds)
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h

@@ -99 +99 @@
 WK_EXPORT void WKBundleSetAppCacheMaximumSize(WKBundleRef bundle, uint64_t size);
 WK_EXPORT uint64_t WKBundleGetAppCacheUsageForOrigin(WKBundleRef bundle, WKStringRef origin);
+WK_EXPORT void WKBundleSetApplicationCacheOriginQuota(WKBundleRef bundle, WKStringRef origin, uint64_t bytes);
 
 // Garbage collection API

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -48 +48 @@
 #include <JavaScriptCore/JSLock.h>
 #include <WebCore/ApplicationCache.h>
+#include <WebCore/ApplicationCacheStorage.h>
 #include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
@@ -352 +353 @@
 }
 
+void InjectedBundle::setApplicationCacheOriginQuota(const String& originString, uint64_t bytes)
+{
+    RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
+    cacheStorage().storeUpdatedQuotaForOrigin(origin.get(), bytes);
+}
+
 int InjectedBundle::numberOfPages(WebFrame* frame, double pageWidthInPixels, double pageHeightInPixels)
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

@@ -150 +150 @@
     void setAppCacheMaximumSize(uint64_t);
     uint64_t appCacheUsageForOrigin(const String& origin);
+    void setApplicationCacheOriginQuota(const String& origin, uint64_t);
 
     // Garbage collection API

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-11  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [WK2][WKTR] TestRunner needs to implement setApplicationCacheOriginQuota
+        https://bugs.webkit.org/show_bug.cgi?id=96379
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add implementation for setApplicationCacheOriginQuota
+        to WebKitTestRunner.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::setApplicationCacheOriginQuota):
+        (WTR):
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        (TestRunner):
+
 2012-09-11  Luciano Wolf  <luciano.wolf@openbossa.org>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

@@ -112 +112 @@
         long long applicationCacheDiskUsageForOrigin(in DOMString origin);
         void clearApplicationCacheForOrigin(in DOMString name);
+        void setApplicationCacheOriginQuota(in unsigned long long bytes);
 
         // Compositing testing.

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

@@ -318 +318 @@
 }
 
+void TestRunner::setApplicationCacheOriginQuota(unsigned long long bytes)
+{
+    WKRetainPtr<WKStringRef> origin(AdoptWK, WKStringCreateWithUTF8CString("http://127.0.0.1:8000"));
+    WKBundleSetApplicationCacheOriginQuota(InjectedBundle::shared().bundle(), origin.get(), bytes);
+}
+
 bool TestRunner::isCommandEnabled(JSStringRef name)
 {

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

@@ -149 +149 @@
     void setAppCacheMaximumSize(uint64_t);
     long long applicationCacheDiskUsageForOrigin(JSStringRef origin);
+    void setApplicationCacheOriginQuota(unsigned long long);
 
     // Printing