Changeset 73789 in webkit

Timestamp:

Dec 10, 2010 1:01:31 PM (13 years ago)

Author:

chang.shu@nokia.com

Message:

2010-12-10 Krithigassree Sambamurthy <​krithigassree.sambamurthy@nokia.com>

Reviewed by Joseph Pecoraro.

Bug 43455 - [Qt]: Implement Application Cache Quotas
​https://bugs.webkit.org/show_bug.cgi?id=43455

Added new signal to report ApplicationCache Database
quota.

• Api/qwebpage.cpp:
• Api/qwebpage.h:

Added new functions to accomodate new appcache layout
test origin-quota.html.

• Api/qwebsecurityorigin.cpp: (QWebSecurityOrigin::setApplicationCacheQuota):
• Api/qwebsecurityorigin.h:
• WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::reachedApplicationCacheOriginQuota):
• WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::clearAllApplicationCaches):
• WebCoreSupport/DumpRenderTreeSupportQt.h:

2010-12-10 Krithigassree Sambamurthy <​krithigassree.sambamurthy@nokia.com>

Reviewed by Joseph Pecoraro.

[Qt]: Implement Application Cache Quotas
​https://bugs.webkit.org/show_bug.cgi?id=43455

• platform/qt/Skipped: Unskip now passing test origin-quota.html

2010-12-10 Krithigassree Sambamurthy <​krithigassree.sambamurthy@nokia.com>

Reviewed by Joseph Pecoraro.

Bug 43455 - [Qt]: Implement Application Cache Quotas
​https://bugs.webkit.org/show_bug.cgi?id=43455

Introduce functions to allow new appcache layout test origin-quota.html
to work correctly under Qt.

• DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::DumpRenderTree::DumpRenderTree): (WebCore::DumpRenderTree::dumpApplicationCacheQuota):
• DumpRenderTree/qt/DumpRenderTreeQt.h:

Introduce functions to allow new appcache layout test origin-quota.html
to be successful under qt. Changes required because LayoutTestControllerQt
does not inherit from LayoutController.

• DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::reset): (LayoutTestController::clearAllApplicationCaches): (LayoutTestController::setApplicationCacheOriginQuota):
• DumpRenderTree/qt/LayoutTestControllerQt.h: (LayoutTestController::shouldDumpApplicationCacheDelegateCallbacks): (LayoutTestController::dumpApplicationCacheDelegateCallbacks):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebpage.h (modified) (2 diffs)
• WebKit/qt/Api/qwebsecurityorigin.cpp (modified) (2 diffs)
• WebKit/qt/Api/qwebsecurityorigin.h (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (2 diffs)
• WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (2 diffs)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-10  Krithigassree Sambamurthy  <krithigassree.sambamurthy@nokia.com>
+
+        Reviewed by Joseph Pecoraro.
+
+        [Qt]: Implement Application Cache Quotas
+        https://bugs.webkit.org/show_bug.cgi?id=43455
+
+        * platform/qt/Skipped: Unskip now passing test origin-quota.html
+
 2010-12-09  Jenn Braithwaite  <jennb@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -1507 +1507 @@
 animations/animation-drt-api.html
 animations/animation-drt-api-multiple-keyframes.html
-
-# ============================================================================= #
-# failing application cache quota tests
-# ============================================================================= #
-http/tests/appcache/origin-quota.html
 
 # ============================================================================= #

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -4122 +4122 @@
     \sa QWebDatabase
 */
+/*!
+    \fn void QWebPage::applicationCacheQuotaExceeded(QWebSecurityOrigin* origin, quint64 defaultOriginQuota);
+
+    This signal is emitted whenever the web site is asking to store data to the application cache
+    database databaseName and the quota allocated to that web site is exceeded.
+
+*/
 
 /*!

trunk/WebKit/qt/Api/qwebpage.h

@@ -49 +49 @@
 class QWebPagePrivate;
 class QWebPluginFactory;
+class QWebSecurityOrigin;
 class QtViewportAttributesPrivate;
 
@@ -388 +389 @@
     void contentsChanged();
     void databaseQuotaExceeded(QWebFrame* frame, QString databaseName);
+    void applicationCacheQuotaExceeded(QWebSecurityOrigin* origin, quint64 defaultOriginQuota);
 
     void saveFrameStateRequested(QWebFrame* frame, QWebHistoryItem* item);

trunk/WebKit/qt/Api/qwebsecurityorigin.cpp

@@ -20 +20 @@
 #include "config.h"
 #include "qwebsecurityorigin.h"
-#include "qwebsecurityorigin_p.h"
-#include "qwebdatabase.h"
-#include "qwebdatabase_p.h"
-
+
+#include "ApplicationCacheStorage.h"
 #include "DatabaseTracker.h"
 #include "KURL.h"
 #include "SchemeRegistry.h"
 #include "SecurityOrigin.h"
+#include "qwebdatabase.h"
+#include "qwebdatabase_p.h"
+#include "qwebsecurityorigin_p.h"
 #include <QStringList>
 
@@ -153 +154 @@
 }
 
+void QWebSecurityOrigin::setApplicationCacheQuota(qint64 quota)
+{
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+    WebCore::cacheStorage().storeUpdatedQuotaForOrigin(d->origin.get(), quota);
+#endif
+}
 /*!
     Destroys the security origin.

trunk/WebKit/qt/Api/qwebsecurityorigin.h

@@ -52 +52 @@
 
     void setDatabaseQuota(qint64 quota);
+    void setApplicationCacheQuota(qint64 quota);
 
     QList<QWebDatabase> databases() const;

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-12-10  Krithigassree Sambamurthy  <krithigassree.sambamurthy@nokia.com>
+
+        Reviewed by Joseph Pecoraro.
+
+        Bug 43455 - [Qt]: Implement Application Cache Quotas
+        https://bugs.webkit.org/show_bug.cgi?id=43455
+
+        Added new signal to report ApplicationCache Database
+        quota.
+
+        * Api/qwebpage.cpp:
+        * Api/qwebpage.h:
+
+        Added new functions to accomodate new appcache layout
+        test origin-quota.html.
+
+        * Api/qwebsecurityorigin.cpp:
+        (QWebSecurityOrigin::setApplicationCacheQuota):
+        * Api/qwebsecurityorigin.h:
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::reachedApplicationCacheOriginQuota):
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::clearAllApplicationCaches):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
 2010-12-10  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -31 +31 @@
 #include "ChromeClientQt.h"
 
+#include "ApplicationCacheStorage.h"
 #include "DatabaseTracker.h"
 #include "FileChooser.h"
@@ -519 +520 @@
 }
 
-void ChromeClientQt::reachedApplicationCacheOriginQuota(SecurityOrigin*)
-{
-    notImplemented();
+void ChromeClientQt::reachedApplicationCacheOriginQuota(SecurityOrigin* origin)
+{
+    int64_t quota;
+    quint64 defaultOriginQuota = WebCore::cacheStorage().defaultOriginQuota();
+
+    QWebSecurityOriginPrivate* priv = new QWebSecurityOriginPrivate(origin);
+    QWebSecurityOrigin* securityOrigin = new QWebSecurityOrigin(priv);
+
+    if (!WebCore::cacheStorage().quotaForOrigin(origin, quota))
+       WebCore::cacheStorage().storeUpdatedQuotaForOrigin(origin, defaultOriginQuota);
+
+    emit m_webPage->applicationCacheQuotaExceeded(securityOrigin, defaultOriginQuota);
 }
 #endif

trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

@@ -24 +24 @@
 #include "DumpRenderTreeSupportQt.h"
 
+#include "ApplicationCacheStorage.h"
 #include "CSSComputedStyleDeclaration.h"
 #include "ChromeClientQt.h"
@@ -586 +587 @@
 }
 
+void DumpRenderTreeSupportQt::clearAllApplicationCaches()
+{
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+    WebCore::cacheStorage().empty();
+    WebCore::cacheStorage().vacuumDatabaseFile();
+#endif
+}
+
 void DumpRenderTreeSupportQt::dumpFrameLoader(bool b)
 {

trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

@@ -89 +89 @@
     static void setEditingBehavior(QWebPage* page, const QString& editingBehavior);
 
+    static void clearAllApplicationCaches();
+
     static void whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
     static void removeWhiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-12-10  Krithigassree Sambamurthy  <krithigassree.sambamurthy@nokia.com>
+
+        Reviewed by Joseph Pecoraro.
+
+        Bug 43455 - [Qt]: Implement Application Cache Quotas
+        https://bugs.webkit.org/show_bug.cgi?id=43455
+
+        Introduce functions to allow new appcache layout test origin-quota.html
+        to work correctly under Qt.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::DumpRenderTree):
+        (WebCore::DumpRenderTree::dumpApplicationCacheQuota):
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+
+        Introduce functions to allow new appcache layout test origin-quota.html
+        to be successful under qt. Changes required because LayoutTestControllerQt
+        does not inherit from LayoutController.
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::reset):
+        (LayoutTestController::clearAllApplicationCaches):
+        (LayoutTestController::setApplicationCacheOriginQuota):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+        (LayoutTestController::shouldDumpApplicationCacheDelegateCallbacks):
+        (LayoutTestController::dumpApplicationCacheDelegateCallbacks):
+
 2010-12-10  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -481 +481 @@
     connect(m_page, SIGNAL(databaseQuotaExceeded(QWebFrame*,QString)),
             this, SLOT(dumpDatabaseQuota(QWebFrame*,QString)));
+    connect(m_page, SIGNAL(applicationCacheQuotaExceeded(QWebSecurityOrigin *, quint64)),
+            this, SLOT(dumpApplicationCacheQuota(QWebSecurityOrigin *, quint64)));
     connect(m_page, SIGNAL(statusBarMessage(const QString&)),
             this, SLOT(statusBarMessage(const QString&)));
@@ -1023 +1025 @@
 }
 
+void DumpRenderTree::dumpApplicationCacheQuota(QWebSecurityOrigin* origin, quint64 defaultOriginQuota)
+{
+    if (!m_controller->shouldDumpApplicationCacheDelegateCallbacks())
+        return;
+
+    printf("UI DELEGATE APPLICATION CACHE CALLBACK: exceededApplicationCacheOriginQuotaForSecurityOrigin:{%s, %s, %i}\n",
+           origin->scheme().toUtf8().data(),
+           origin->host().toUtf8().data(),
+           origin->port()
+           );
+    origin->setApplicationCacheQuota(defaultOriginQuota);
+}
+
 void DumpRenderTree::statusBarMessage(const QString& message)
 {

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h

@@ -117 +117 @@
     void connectFrame(QWebFrame *frame);
     void dumpDatabaseQuota(QWebFrame* frame, const QString& dbName);
+    void dumpApplicationCacheQuota(QWebSecurityOrigin* origin, quint64 defaultOriginQuota);
     void statusBarMessage(const QString& message);
     void windowCloseRequested();

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -59 +59 @@
     m_dumpTitleChanges = false;
     m_dumpDatabaseCallbacks = false;
+    m_dumpApplicationCacheDelegateCallbacks = false;
     m_dumpStatusCallbacks = false;
     m_timeoutTimer.stop();
@@ -542 +543 @@
 void LayoutTestController::clearAllApplicationCaches()
 {
-    // FIXME: implement to support Application Cache quotas.
+    DumpRenderTreeSupportQt::clearAllApplicationCaches();
 }
 
 void LayoutTestController::setApplicationCacheOriginQuota(unsigned long long quota)
 {
-    // FIXME: implement to support Application Cache quotas.
+    if (!m_topLoadingFrame)
+        return;
+    m_topLoadingFrame->securityOrigin().setApplicationCacheQuota(quota);
 }
 

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

@@ -65 +65 @@
     bool shouldDumpChildFrameScrollPositions() const { return m_dumpChildFrameScrollPositions; }
     bool shouldDumpDatabaseCallbacks() const { return m_dumpDatabaseCallbacks; }
+    bool shouldDumpApplicationCacheDelegateCallbacks() const { return m_dumpApplicationCacheDelegateCallbacks; }
     bool shouldDumpStatusCallbacks() const { return m_dumpStatusCallbacks; }
     bool shouldWaitUntilDone() const { return m_waitForDone; }
@@ -95 +96 @@
     void dumpChildFrameScrollPositions() { m_dumpChildFrameScrollPositions = true; }
     void dumpDatabaseCallbacks() { m_dumpDatabaseCallbacks = true; }
+    void dumpApplicationCacheDelegateCallbacks() { m_dumpApplicationCacheDelegateCallbacks = true;}
     void dumpStatusCallbacks() { m_dumpStatusCallbacks = true; }
     void setCanOpenWindows() { m_canOpenWindows = true; }
@@ -264 +266 @@
     bool m_dumpTitleChanges;
     bool m_dumpDatabaseCallbacks;
+    bool m_dumpApplicationCacheDelegateCallbacks;
     bool m_dumpStatusCallbacks;
     bool m_waitForPolicy;