Changeset 128338 in webkit

Timestamp:

Sep 12, 2012 10:42:23 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

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

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

Source/WebKit2:

Add Bundle C API to retrieve security origins with
an application cache. This is needed by WebKitTestRunner
to support originsWithApplicationCache.

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

(WKBundleCopyOriginsWithApplicationCache):

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

(WebKit::InjectedBundle::originsWithApplicationCache):
(WebKit):

• WebProcess/InjectedBundle/InjectedBundle.h:

(InjectedBundle):

Tools:

Add implementation for originsWithApplicationCache to
WebKitTestRunner.

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

(WTR::stringArrayToJS):
(WTR):
(WTR::TestRunner::originsWithApplicationCache):

• WebKitTestRunner/InjectedBundle/TestRunner.h:

(TestRunner):

LayoutTests:

Unskip http/tests/appcache/origins-with-appcache.html now that
WebKitTestRunner implements originsWithApplicationCache.

• platform/wk2/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/wk2/Skipped (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (modified) (2 diffs)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• 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/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-12  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [WK2][WKTR] TestRunner needs to implement originsWithApplicationCache
+        https://bugs.webkit.org/show_bug.cgi?id=96496
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Unskip http/tests/appcache/origins-with-appcache.html now that
+        WebKitTestRunner implements originsWithApplicationCache.
+
+        * platform/wk2/Skipped:
+
 2012-09-12  Bear Travis  <betravis@adobe.com>
 

trunk/LayoutTests/platform/wk2/Skipped

@@ -203 +203 @@
 fast/text/zero-font-size.html
 
-# WTR needs an implementation of originsWithApplicationCache
-http/tests/appcache/origins-with-appcache.html
-
 # WebKitTestRunner needs to support layoutTestController.dumpDOMAsWebArchive
 # <https://bugs.webkit.org/show_bug.cgi?id=42324>

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-12  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [WK2][WKTR] TestRunner needs to implement originsWithApplicationCache
+        https://bugs.webkit.org/show_bug.cgi?id=96496
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add Bundle C API to retrieve security origins with
+        an application cache. This is needed by WebKitTestRunner
+        to support originsWithApplicationCache.
+
+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+        (WKBundleCopyOriginsWithApplicationCache):
+        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::originsWithApplicationCache):
+        (WebKit):
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        (InjectedBundle):
+
 2012-09-12  Christophe Dumez  <christophe.dumez@intel.com>
 

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

@@ -26 +26 @@
 #include "config.h"
 #include "WKBundle.h"
-#include "WKBundlePrivate.h"
-
+
+#include "ImmutableArray.h"
 #include "InjectedBundle.h"
 #include "WKAPICast.h"
 #include "WKBundleAPICast.h"
+#include "WKBundlePrivate.h"
 
 using namespace WebKit;
@@ -257 +258 @@
 }
 
+WKArrayRef WKBundleCopyOriginsWithApplicationCache(WKBundleRef bundleRef)
+{
+    RefPtr<ImmutableArray> origins = toImpl(bundleRef)->originsWithApplicationCache();
+    return toAPI(origins.release().leakRef());
+}
+
 void WKBundleSetMinimumTimerInterval(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, double seconds)
 {

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

@@ -101 +101 @@
 WK_EXPORT void WKBundleSetApplicationCacheOriginQuota(WKBundleRef bundle, WKStringRef origin, uint64_t bytes);
 WK_EXPORT void WKBundleResetApplicationCacheOriginQuota(WKBundleRef bundle, WKStringRef origin);
+WK_EXPORT WKArrayRef WKBundleCopyOriginsWithApplicationCache(WKBundleRef bundle);
 
 // Garbage collection API

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

@@ -366 +366 @@
 }
 
+PassRefPtr<ImmutableArray> InjectedBundle::originsWithApplicationCache()
+{
+    HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash> origins;
+    cacheStorage().getOriginsWithCache(origins);
+    Vector< RefPtr<APIObject> > originsVector;
+
+    HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash>::iterator it = origins.begin();
+    HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash>::iterator end = origins.end();
+    for ( ; it != end; ++it)
+        originsVector.append(WebString::create((*it)->databaseIdentifier()));
+
+    return ImmutableArray::adopt(originsVector);
+}
+
 int InjectedBundle::numberOfPages(WebFrame* frame, double pageWidthInPixels, double pageHeightInPixels)
 {

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

@@ -152 +152 @@
     void setApplicationCacheOriginQuota(const String& origin, uint64_t);
     void resetApplicationCacheOriginQuota(const String& origin);
+    PassRefPtr<ImmutableArray> originsWithApplicationCache();
 
     // Garbage collection API

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-12  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [WK2][WKTR] TestRunner needs to implement originsWithApplicationCache
+        https://bugs.webkit.org/show_bug.cgi?id=96496
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add implementation for originsWithApplicationCache to
+        WebKitTestRunner.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::stringArrayToJS):
+        (WTR):
+        (WTR::TestRunner::originsWithApplicationCache):
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        (TestRunner):
+
 2012-09-12  Simon Hausmann  <simon.hausmann@nokia.com>
 

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

@@ -116 +116 @@
         void setApplicationCacheOriginQuota(in unsigned long long bytes);
         void disallowIncreaseForApplicationCacheQuota();
+        object originsWithApplicationCache();
 
         // Compositing testing.

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

@@ -331 +331 @@
 }
 
+static inline JSValueRef stringArrayToJS(JSContextRef context, WKArrayRef strings)
+{
+    const size_t count = WKArrayGetSize(strings);
+
+    JSValueRef jsStringsArray[count];
+    for (size_t i = 0; i < count; ++i) {
+        WKStringRef stringRef = static_cast<WKStringRef>(WKArrayGetItemAtIndex(strings, i));
+        JSRetainPtr<JSStringRef> stringJS = toJS(stringRef);
+        jsStringsArray[i] = JSValueMakeString(context, stringJS.get());
+    }
+
+    return JSObjectMakeArray(context, count, jsStringsArray, 0);
+}
+
+JSValueRef TestRunner::originsWithApplicationCache()
+{
+    WKRetainPtr<WKArrayRef> origins(AdoptWK, WKBundleCopyOriginsWithApplicationCache(InjectedBundle::shared().bundle()));
+
+    WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
+    JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
+
+    return stringArrayToJS(context, origins.get());
+}
+
 bool TestRunner::isCommandEnabled(JSStringRef name)
 {

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

@@ -153 +153 @@
     void disallowIncreaseForApplicationCacheQuota();
     bool shouldDisallowIncreaseForApplicationCacheQuota() { return m_disallowIncreaseForApplicationCacheQuota; }
+    JSValueRef originsWithApplicationCache();
 
     // Printing