Diff
Modified: trunk/LayoutTests/ChangeLog (128295 => 128296)
--- trunk/LayoutTests/ChangeLog 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/LayoutTests/ChangeLog 2012-09-12 12:15:32 UTC (rev 128296)
@@ -1,3 +1,16 @@
+2012-09-12 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r128280.
+ http://trac.webkit.org/changeset/128280
+ https://bugs.webkit.org/show_bug.cgi?id=96498
+
+ it broke compilation on windows debug bot (Requested by loislo
+ on #webkit).
+
+ * platform/efl-wk1/TestExpectations:
+ * platform/efl/Skipped:
+ * platform/wk2/Skipped:
+
2012-09-12 Andrei Poenaru <poen...@adobe.com>
Web Inspector: Protocol Extension: Add "regionLayoutUpdate" event
Modified: trunk/LayoutTests/platform/efl/Skipped (128295 => 128296)
--- trunk/LayoutTests/platform/efl/Skipped 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-09-12 12:15:32 UTC (rev 128296)
@@ -103,6 +103,12 @@
# Fallback resource wasn't used for a redirect to a resource with another origin
http/tests/appcache/fallback.html
+# EFL's LayoutTestController does not implement applicationCacheDiskUsageForOrigin
+http/tests/appcache/origin-usage.html
+
+# EFL's LayoutTestController does not implement originsWithApplicationCache
+http/tests/appcache/origins-with-appcache.html
+
# EFL's LayoutTestController does not implement shadowPseudoId
media/video-controls-transformed.html
media/video-controls-visible-audio-only.html
Modified: trunk/LayoutTests/platform/efl-wk1/TestExpectations (128295 => 128296)
--- trunk/LayoutTests/platform/efl-wk1/TestExpectations 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/LayoutTests/platform/efl-wk1/TestExpectations 2012-09-12 12:15:32 UTC (rev 128296)
@@ -47,12 +47,6 @@
// Custom font loading delaying text drawing on Canvas
BUGWK87355 : canvas/philip/tests/2d.text.draw.fontface.notinpage.html = TEXT
-// EFL's TestRunner does not implement applicationCacheDiskUsageForOrigin
-BUGWK86460 : http/tests/appcache/origin-usage.html = TEXT
-
-// EFL's TestRunner does not implement originsWithApplicationCache
-BUGWK86498 : http/tests/appcache/origins-with-appcache.html = TEXT
-
// Missing showModalDialog implementation
BUGWK84589 : fast/animation/request-animation-frame-during-modal.html = TEXT
BUGWK84589 : http/tests/security/cross-frame-access-call.html = TEXT
Modified: trunk/LayoutTests/platform/wk2/Skipped (128295 => 128296)
--- trunk/LayoutTests/platform/wk2/Skipped 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/LayoutTests/platform/wk2/Skipped 2012-09-12 12:15:32 UTC (rev 128296)
@@ -202,7 +202,12 @@
fast/images/animated-gif-restored-from-bfcache.html
fast/text/zero-font-size.html
-# WTR needs an implementation of originsWithApplicationCache
+# WTR needs an implementation of dumpApplicationCacheDelegateCallbacks
+http/tests/appcache/origin-delete.html
+http/tests/appcache/origin-quota.html
+http/tests/appcache/origin-quota-continued-download.html
+http/tests/appcache/origin-quota-continued-download-multiple-manifests.html
+http/tests/appcache/origin-usage.html
http/tests/appcache/origins-with-appcache.html
# WebKitTestRunner needs to support layoutTestController.dumpDOMAsWebArchive
Modified: trunk/Source/WebKit2/ChangeLog (128295 => 128296)
--- trunk/Source/WebKit2/ChangeLog 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-12 12:15:32 UTC (rev 128296)
@@ -1,3 +1,29 @@
+2012-09-12 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r128280.
+ http://trac.webkit.org/changeset/128280
+ https://bugs.webkit.org/show_bug.cgi?id=96498
+
+ it broke compilation on windows debug bot (Requested by loislo
+ on #webkit).
+
+ * Shared/APIClientTraits.cpp:
+ (WebKit):
+ * Shared/APIClientTraits.h:
+ * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+ (WKBundleSetApplicationCacheOriginQuota):
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ * WebProcess/InjectedBundle/InjectedBundle.h:
+ (InjectedBundle):
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
+ (WebKit):
+ (InjectedBundlePageUIClient):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::reachedApplicationCacheOriginQuota):
+
2012-09-12 Byungwoo Lee <bw80....@samsung.com>
[EFL][WK2] WorkQueue::dispatchAfterDelay() doesn't work properly.
Modified: trunk/Source/WebKit2/Shared/APIClientTraits.cpp (128295 => 128296)
--- trunk/Source/WebKit2/Shared/APIClientTraits.cpp 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.cpp 2012-09-12 12:15:32 UTC (rev 128296)
@@ -75,11 +75,6 @@
sizeof(WKBundlePageFormClient)
};
-const size_t APIClientTraits<WKBundlePageUIClient>::interfaceSizesByVersion[] = {
- offsetof(WKBundlePageUIClient, didReachApplicationCacheOriginQuota),
- sizeof(WKBundlePageUIClient)
-};
-
const size_t APIClientTraits<WKContextInjectedBundleClient>::interfaceSizesByVersion[] = {
offsetof(WKContextInjectedBundleClient, getInjectedBundleInitializationUserData),
sizeof(WKContextInjectedBundleClient)
Modified: trunk/Source/WebKit2/Shared/APIClientTraits.h (128295 => 128296)
--- trunk/Source/WebKit2/Shared/APIClientTraits.h 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.h 2012-09-12 12:15:32 UTC (rev 128296)
@@ -54,10 +54,6 @@
static const size_t interfaceSizesByVersion[2];
};
-template<> struct APIClientTraits<WKBundlePageUIClient> {
- static const size_t interfaceSizesByVersion[2];
-};
-
template<> struct APIClientTraits<WKPageContextMenuClient> {
static const size_t interfaceSizesByVersion[3];
};
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (128295 => 128296)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2012-09-12 12:15:32 UTC (rev 128296)
@@ -248,14 +248,9 @@
void WKBundleSetApplicationCacheOriginQuota(WKBundleRef bundleRef, WKStringRef origin, uint64_t bytes)
{
- toImpl(bundleRef)->setApplicationCacheOriginQuota(toImpl(origin)->string(), bytes);
+ return toImpl(bundleRef)->setApplicationCacheOriginQuota(toImpl(origin)->string(), bytes);
}
-void WKBundleResetApplicationCacheOriginQuota(WKBundleRef bundleRef, WKStringRef origin)
-{
- toImpl(bundleRef)->resetApplicationCacheOriginQuota(toImpl(origin)->string());
-}
-
void WKBundleSetMinimumTimerInterval(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, double seconds)
{
toImpl(bundleRef)->setMinimumTimerInterval(toImpl(pageGroupRef), seconds);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (128295 => 128296)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2012-09-12 12:15:32 UTC (rev 128296)
@@ -236,7 +236,6 @@
typedef WKBundlePageUIElementVisibility (*WKBundlePageStatusBarIsVisibleCallback)(WKBundlePageRef page, const void *clientInfo);
typedef WKBundlePageUIElementVisibility (*WKBundlePageMenuBarIsVisibleCallback)(WKBundlePageRef page, const void *clientInfo);
typedef WKBundlePageUIElementVisibility (*WKBundlePageToolbarsAreVisibleCallback)(WKBundlePageRef page, const void *clientInfo);
-typedef void (*WKBundlePageReachedAppCacheOriginQuotaCallback)(WKBundlePageRef page, WKSecurityOriginRef origin, int64_t totalBytesNeeded, const void *clientInfo);
struct WKBundlePageUIClient {
int version;
@@ -255,13 +254,10 @@
WKBundlePageStatusBarIsVisibleCallback statusBarIsVisible;
WKBundlePageMenuBarIsVisibleCallback menuBarIsVisible;
WKBundlePageToolbarsAreVisibleCallback toolbarsAreVisible;
-
- // Version 1.
- WKBundlePageReachedAppCacheOriginQuotaCallback didReachApplicationCacheOriginQuota;
};
typedef struct WKBundlePageUIClient WKBundlePageUIClient;
-enum { kWKBundlePageUIClientCurrentVersion = 1 };
+enum { kWKBundlePageUIClientCurrentVersion = 0 };
// Editor client
typedef bool (*WKBundlePageShouldBeginEditingCallback)(WKBundlePageRef page, WKBundleRangeHandleRef range, const void* clientInfo);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (128295 => 128296)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2012-09-12 12:15:32 UTC (rev 128296)
@@ -99,7 +99,6 @@
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);
-WK_EXPORT void WKBundleResetApplicationCacheOriginQuota(WKBundleRef bundle, WKStringRef origin);
// Garbage collection API
WK_EXPORT void WKBundleGarbageCollectJavaScriptObjects(WKBundleRef bundle);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (128295 => 128296)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-09-12 12:15:32 UTC (rev 128296)
@@ -359,12 +359,6 @@
cacheStorage().storeUpdatedQuotaForOrigin(origin.get(), bytes);
}
-void InjectedBundle::resetApplicationCacheOriginQuota(const String& originString)
-{
- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
- cacheStorage().storeUpdatedQuotaForOrigin(origin.get(), cacheStorage().defaultOriginQuota());
-}
-
int InjectedBundle::numberOfPages(WebFrame* frame, double pageWidthInPixels, double pageHeightInPixels)
{
Frame* coreFrame = frame ? frame->coreFrame() : 0;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (128295 => 128296)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2012-09-12 12:15:32 UTC (rev 128296)
@@ -150,7 +150,6 @@
void setAppCacheMaximumSize(uint64_t);
uint64_t appCacheUsageForOrigin(const String& origin);
void setApplicationCacheOriginQuota(const String& origin, uint64_t);
- void resetApplicationCacheOriginQuota(const String& origin);
// Garbage collection API
void garbageCollectJavaScriptObjects();
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (128295 => 128296)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2012-09-12 12:15:32 UTC (rev 128296)
@@ -28,9 +28,8 @@
#include "InjectedBundleHitTestResult.h"
#include "WKAPICast.h"
-#include "WKBundleAPICast.h"
#include "WebGraphicsContext.h"
-#include "WebSecurityOrigin.h"
+#include "WKBundleAPICast.h"
#include <wtf/text/WTFString.h>
using namespace WebCore;
@@ -147,12 +146,4 @@
return m_client.toolbarsAreVisible(toAPI(page), m_client.clientInfo);
}
-void InjectedBundlePageUIClient::didReachApplicationCacheOriginQuota(WebPage* page, WebSecurityOrigin* origin, int64_t totalBytesNeeded)
-{
- if (!m_client.didReachApplicationCacheOriginQuota)
- return;
-
- m_client.didReachApplicationCacheOriginQuota(toAPI(page), toAPI(origin), totalBytesNeeded, m_client.clientInfo);
-}
-
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h (128295 => 128296)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2012-09-12 12:15:32 UTC (rev 128296)
@@ -42,7 +42,6 @@
class APIObject;
class WebFrame;
class WebPage;
-class WebSecurityOrigin;
class InjectedBundlePageUIClient : public APIClient<WKBundlePageUIClient, kWKBundlePageUIClientCurrentVersion> {
public:
@@ -65,8 +64,6 @@
WKBundlePageUIElementVisibility statusBarIsVisible(WebPage*);
WKBundlePageUIElementVisibility menuBarIsVisible(WebPage*);
WKBundlePageUIElementVisibility toolbarsAreVisible(WebPage*);
-
- void didReachApplicationCacheOriginQuota(WebPage*, WebSecurityOrigin*, int64_t totalBytesNeeded);
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (128295 => 128296)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2012-09-12 12:15:32 UTC (rev 128296)
@@ -45,7 +45,6 @@
#include "WebPreferencesStore.h"
#include "WebProcess.h"
#include "WebSearchPopupMenu.h"
-#include "WebSecurityOrigin.h"
#include <WebCore/AXObjectCache.h>
#include <WebCore/ColorChooser.h>
#include <WebCore/DatabaseTracker.h>
@@ -550,10 +549,9 @@
notImplemented();
}
-void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin* origin, int64_t totalBytesNeeded)
+void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t)
{
- RefPtr<WebSecurityOrigin> webSecurityOrigin = WebSecurityOrigin::createFromString(origin->toString());
- m_page->injectedBundleUIClient().didReachApplicationCacheOriginQuota(m_page, webSecurityOrigin.get(), totalBytesNeeded);
+ notImplemented();
}
#if ENABLE(DASHBOARD_SUPPORT)
Modified: trunk/Tools/ChangeLog (128295 => 128296)
--- trunk/Tools/ChangeLog 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Tools/ChangeLog 2012-09-12 12:15:32 UTC (rev 128296)
@@ -1,3 +1,22 @@
+2012-09-12 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r128280.
+ http://trac.webkit.org/changeset/128280
+ https://bugs.webkit.org/show_bug.cgi?id=96498
+
+ it broke compilation on windows debug bot (Requested by loislo
+ on #webkit).
+
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::InjectedBundlePage):
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
+ (InjectedBundlePage):
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::TestRunner):
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ (TestRunner):
+
2012-09-12 Simon Hausmann <simon.hausm...@nokia.com>
[Qt] Make it possible to build with "make release" and "make debug" on Windows
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (128295 => 128296)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-09-12 12:15:32 UTC (rev 128296)
@@ -47,7 +47,6 @@
void dumpResourceLoadCallbacks();
void dumpResourceResponseMIMETypes();
void dumpWillCacheResponse();
- void dumpApplicationCacheDelegateCallbacks();
// Special options.
void keepWebHistory();
@@ -114,7 +113,6 @@
long long applicationCacheDiskUsageForOrigin(in DOMString origin);
void clearApplicationCacheForOrigin(in DOMString name);
void setApplicationCacheOriginQuota(in unsigned long long bytes);
- void disallowIncreaseForApplicationCacheQuota();
// Compositing testing.
DOMString layerTreeAsText();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (128295 => 128296)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-09-12 12:15:32 UTC (rev 128296)
@@ -41,8 +41,6 @@
#include <WebKit2/WKBundleNavigationAction.h>
#include <WebKit2/WKBundleNodeHandlePrivate.h>
#include <WebKit2/WKBundlePagePrivate.h>
-#include <WebKit2/WKBundlePrivate.h>
-#include <WebKit2/WKSecurityOrigin.h>
#include <WebKit2/WKURLRequest.h>
#include <wtf/HashMap.h>
#include <wtf/text/CString.h>
@@ -351,7 +349,6 @@
0, /*statusBarIsVisible*/
0, /*menuBarIsVisible*/
0, /*toolbarsAreVisible*/
- didReachApplicationCacheOriginQuota,
};
WKBundlePageSetUIClient(m_page, &uiClient);
@@ -1321,11 +1318,6 @@
static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->willRunJavaScriptPrompt(message, defaultValue, frame);
}
-void InjectedBundlePage::didReachApplicationCacheOriginQuota(WKBundlePageRef page, WKSecurityOriginRef origin, int64_t totalBytesNeeded, const void* clientInfo)
-{
- static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->didReachApplicationCacheOriginQuota(origin, totalBytesNeeded);
-}
-
static WTF::String lastFileURLPathComponent(const WTF::String& path)
{
size_t pos = path.find("file://");
@@ -1410,34 +1402,6 @@
InjectedBundle::shared().stringBuilder()->append("\n");
}
-void InjectedBundlePage::didReachApplicationCacheOriginQuota(WKSecurityOriginRef origin, int64_t totalBytesNeeded)
-{
- if (!InjectedBundle::shared().testRunner()->shouldDumpApplicationCacheDelegateCallbacks())
- return;
-
- // For example, numbers from 30000 - 39999 will output as 30000.
- // Rounding up or down does not really matter for these tests. It's
- // sufficient to just get a range of 10000 to determine if we were
- // above or below a threshold.
- int64_t truncatedSpaceNeeded = (totalBytesNeeded / 10000) * 10000;
-
- InjectedBundle::shared().stringBuilder()->appendLiteral("UI DELEGATE APPLICATION CACHE CALLBACK: exceededApplicationCacheOriginQuotaForSecurityOrigin:{");
- InjectedBundle::shared().stringBuilder()->append(toWTFString(adoptWK(WKSecurityOriginCopyProtocol(origin))));
- InjectedBundle::shared().stringBuilder()->appendLiteral(", ");
- InjectedBundle::shared().stringBuilder()->append(toWTFString(adoptWK(WKSecurityOriginCopyHost(origin))));
- InjectedBundle::shared().stringBuilder()->appendLiteral(", ");
- InjectedBundle::shared().stringBuilder()->append(WTF::String::number(WKSecurityOriginGetPort(origin)));
- InjectedBundle::shared().stringBuilder()->appendLiteral("} totalSpaceNeeded:~");
- InjectedBundle::shared().stringBuilder()->append(WTF::String::number(truncatedSpaceNeeded));
- InjectedBundle::shared().stringBuilder()->append('\n');
-
- if (InjectedBundle::shared().testRunner()->shouldDisallowIncreaseForApplicationCacheQuota())
- return;
-
- // Reset default application cache quota.
- WKBundleResetApplicationCacheOriginQuota(InjectedBundle::shared().bundle(), adoptWK(WKSecurityOriginCopyToString(origin)).get());
-}
-
// Editor Client Callbacks
bool InjectedBundlePage::shouldBeginEditing(WKBundlePageRef page, WKBundleRangeHandleRef range, const void* clientInfo)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h (128295 => 128296)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h 2012-09-12 12:15:32 UTC (rev 128296)
@@ -124,13 +124,11 @@
static void willRunJavaScriptAlert(WKBundlePageRef, WKStringRef message, WKBundleFrameRef frame, const void* clientInfo);
static void willRunJavaScriptConfirm(WKBundlePageRef, WKStringRef message, WKBundleFrameRef frame, const void* clientInfo);
static void willRunJavaScriptPrompt(WKBundlePageRef, WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef frame, const void* clientInfo);
- static void didReachApplicationCacheOriginQuota(WKBundlePageRef, WKSecurityOriginRef, int64_t totalBytesNeeded, const void* clientInfo);
void willAddMessageToConsole(WKStringRef message, uint32_t lineNumber);
void willSetStatusbarText(WKStringRef statusbarText);
void willRunJavaScriptAlert(WKStringRef message, WKBundleFrameRef);
void willRunJavaScriptConfirm(WKStringRef message, WKBundleFrameRef);
void willRunJavaScriptPrompt(WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef);
- void didReachApplicationCacheOriginQuota(WKSecurityOriginRef, int64_t totalBytesNeeded);
#if ENABLE(FULLSCREEN_API)
// Full Screen client
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (128295 => 128296)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-09-12 12:15:32 UTC (rev 128296)
@@ -80,8 +80,6 @@
, m_dumpResourceLoadCallbacks(false)
, m_dumpResourceResponseMIMETypes(false)
, m_dumpWillCacheResponse(false)
- , m_dumpApplicationCacheDelegateCallbacks(false)
- , m_disallowIncreaseForApplicationCacheQuota(false)
, m_waitToDump(false)
, m_testRepaint(false)
, m_testRepaintSweepHorizontally(false)
@@ -325,11 +323,6 @@
WKBundleSetApplicationCacheOriginQuota(InjectedBundle::shared().bundle(), origin.get(), bytes);
}
-void TestRunner::disallowIncreaseForApplicationCacheQuota()
-{
- m_disallowIncreaseForApplicationCacheQuota = true;
-}
-
bool TestRunner::isCommandEnabled(JSStringRef name)
{
return WKBundlePageIsEditingCommandEnabled(InjectedBundle::shared().page()->page(), toWK(name).get());
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (128295 => 128296)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-09-12 12:13:50 UTC (rev 128295)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-09-12 12:15:32 UTC (rev 128296)
@@ -82,7 +82,6 @@
void dumpResourceLoadCallbacks() { m_dumpResourceLoadCallbacks = true; }
void dumpResourceResponseMIMETypes() { m_dumpResourceResponseMIMETypes = true; }
void dumpWillCacheResponse() { m_dumpWillCacheResponse = true; }
- void dumpApplicationCacheDelegateCallbacks() { m_dumpApplicationCacheDelegateCallbacks = true; }
void setShouldDumpFrameLoadCallbacks(bool value) { m_dumpFrameLoadCallbacks = value; }
void setShouldDumpProgressFinishedCallback(bool value) { m_dumpProgressFinishedCallback = value; }
@@ -150,8 +149,6 @@
void setAppCacheMaximumSize(uint64_t);
long long applicationCacheDiskUsageForOrigin(JSStringRef origin);
void setApplicationCacheOriginQuota(unsigned long long);
- void disallowIncreaseForApplicationCacheQuota();
- bool shouldDisallowIncreaseForApplicationCacheQuota() { return m_disallowIncreaseForApplicationCacheQuota; }
// Printing
bool isPageBoxVisible(int pageIndex);
@@ -174,7 +171,6 @@
bool shouldDumpResourceLoadCallbacks() const { return m_dumpResourceLoadCallbacks; }
bool shouldDumpResourceResponseMIMETypes() const { return m_dumpResourceResponseMIMETypes; }
bool shouldDumpWillCacheResponse() const { return m_dumpWillCacheResponse; }
- bool shouldDumpApplicationCacheDelegateCallbacks() const { return m_dumpApplicationCacheDelegateCallbacks; }
bool isPolicyDelegateEnabled() const { return m_policyDelegateEnabled; }
bool isPolicyDelegatePermissive() const { return m_policyDelegatePermissive; }
@@ -271,8 +267,6 @@
bool m_dumpResourceLoadCallbacks;
bool m_dumpResourceResponseMIMETypes;
bool m_dumpWillCacheResponse;
- bool m_dumpApplicationCacheDelegateCallbacks;
- bool m_disallowIncreaseForApplicationCacheQuota;
bool m_waitToDump; // True if waitUntilDone() has been called, but notifyDone() has not yet been called.
bool m_testRepaint;
bool m_testRepaintSweepHorizontally;
