Changeset 128296 in webkit


Ignore:
Timestamp:
Sep 12, 2012 5:15:32 AM (12 years ago)
Author:
loislo@chromium.org
Message:

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).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-09-12

Source/WebKit2:

  • 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):

Tools:

  • 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):

LayoutTests:

  • platform/efl-wk1/TestExpectations:
  • platform/efl/Skipped:
  • platform/wk2/Skipped:
Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r128293 r128296  
     12012-09-12  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r128280.
     4        http://trac.webkit.org/changeset/128280
     5        https://bugs.webkit.org/show_bug.cgi?id=96498
     6
     7        it broke compilation on windows debug bot (Requested by loislo
     8        on #webkit).
     9
     10        * platform/efl-wk1/TestExpectations:
     11        * platform/efl/Skipped:
     12        * platform/wk2/Skipped:
     13
    1142012-09-12  Andrei Poenaru  <poenaru@adobe.com>
    215
  • trunk/LayoutTests/platform/efl-wk1/TestExpectations

    r128280 r128296  
    4848BUGWK87355 : canvas/philip/tests/2d.text.draw.fontface.notinpage.html = TEXT
    4949
    50 // EFL's TestRunner does not implement applicationCacheDiskUsageForOrigin
    51 BUGWK86460 : http/tests/appcache/origin-usage.html = TEXT
    52 
    53 // EFL's TestRunner does not implement originsWithApplicationCache
    54 BUGWK86498 : http/tests/appcache/origins-with-appcache.html = TEXT
    55 
    5650// Missing showModalDialog implementation
    5751BUGWK84589 : fast/animation/request-animation-frame-during-modal.html = TEXT
  • trunk/LayoutTests/platform/efl/Skipped

    r128280 r128296  
    103103# Fallback resource wasn't used for a redirect to a resource with another origin
    104104http/tests/appcache/fallback.html
     105
     106# EFL's LayoutTestController does not implement applicationCacheDiskUsageForOrigin
     107http/tests/appcache/origin-usage.html
     108
     109# EFL's LayoutTestController does not implement originsWithApplicationCache
     110http/tests/appcache/origins-with-appcache.html
    105111
    106112# EFL's LayoutTestController does not implement shadowPseudoId
  • trunk/LayoutTests/platform/wk2/Skipped

    r128280 r128296  
    203203fast/text/zero-font-size.html
    204204
    205 # WTR needs an implementation of originsWithApplicationCache
     205# WTR needs an implementation of dumpApplicationCacheDelegateCallbacks
     206http/tests/appcache/origin-delete.html
     207http/tests/appcache/origin-quota.html
     208http/tests/appcache/origin-quota-continued-download.html
     209http/tests/appcache/origin-quota-continued-download-multiple-manifests.html
     210http/tests/appcache/origin-usage.html
    206211http/tests/appcache/origins-with-appcache.html
    207212
  • trunk/Source/WebKit2/ChangeLog

    r128289 r128296  
     12012-09-12  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r128280.
     4        http://trac.webkit.org/changeset/128280
     5        https://bugs.webkit.org/show_bug.cgi?id=96498
     6
     7        it broke compilation on windows debug bot (Requested by loislo
     8        on #webkit).
     9
     10        * Shared/APIClientTraits.cpp:
     11        (WebKit):
     12        * Shared/APIClientTraits.h:
     13        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
     14        (WKBundleSetApplicationCacheOriginQuota):
     15        * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
     16        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
     17        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     18        * WebProcess/InjectedBundle/InjectedBundle.h:
     19        (InjectedBundle):
     20        * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
     21        * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
     22        (WebKit):
     23        (InjectedBundlePageUIClient):
     24        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     25        (WebKit::WebChromeClient::reachedApplicationCacheOriginQuota):
     26
    1272012-09-12  Byungwoo Lee  <bw80.lee@samsung.com>
    228
  • trunk/Source/WebKit2/Shared/APIClientTraits.cpp

    r128280 r128296  
    7676};
    7777
    78 const size_t APIClientTraits<WKBundlePageUIClient>::interfaceSizesByVersion[] = {
    79     offsetof(WKBundlePageUIClient, didReachApplicationCacheOriginQuota),
    80     sizeof(WKBundlePageUIClient)
    81 };
    82 
    8378const size_t APIClientTraits<WKContextInjectedBundleClient>::interfaceSizesByVersion[] = {
    8479    offsetof(WKContextInjectedBundleClient, getInjectedBundleInitializationUserData),
  • trunk/Source/WebKit2/Shared/APIClientTraits.h

    r128280 r128296  
    5555};
    5656
    57 template<> struct APIClientTraits<WKBundlePageUIClient> {
    58     static const size_t interfaceSizesByVersion[2];
    59 };
    60 
    6157template<> struct APIClientTraits<WKPageContextMenuClient> {
    6258    static const size_t interfaceSizesByVersion[3];
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp

    r128280 r128296  
    249249void WKBundleSetApplicationCacheOriginQuota(WKBundleRef bundleRef, WKStringRef origin, uint64_t bytes)
    250250{
    251     toImpl(bundleRef)->setApplicationCacheOriginQuota(toImpl(origin)->string(), bytes);
    252 }
    253 
    254 void WKBundleResetApplicationCacheOriginQuota(WKBundleRef bundleRef, WKStringRef origin)
    255 {
    256     toImpl(bundleRef)->resetApplicationCacheOriginQuota(toImpl(origin)->string());
     251    return toImpl(bundleRef)->setApplicationCacheOriginQuota(toImpl(origin)->string(), bytes);
    257252}
    258253
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h

    r128280 r128296  
    237237typedef WKBundlePageUIElementVisibility (*WKBundlePageMenuBarIsVisibleCallback)(WKBundlePageRef page, const void *clientInfo);
    238238typedef WKBundlePageUIElementVisibility (*WKBundlePageToolbarsAreVisibleCallback)(WKBundlePageRef page, const void *clientInfo);
    239 typedef void (*WKBundlePageReachedAppCacheOriginQuotaCallback)(WKBundlePageRef page, WKSecurityOriginRef origin, int64_t totalBytesNeeded, const void *clientInfo);
    240239
    241240struct WKBundlePageUIClient {
     
    256255    WKBundlePageMenuBarIsVisibleCallback                                menuBarIsVisible;
    257256    WKBundlePageToolbarsAreVisibleCallback                              toolbarsAreVisible;
    258 
    259     // Version 1.
    260     WKBundlePageReachedAppCacheOriginQuotaCallback                      didReachApplicationCacheOriginQuota;
    261257};
    262258typedef struct WKBundlePageUIClient WKBundlePageUIClient;
    263259
    264 enum { kWKBundlePageUIClientCurrentVersion = 1 };
     260enum { kWKBundlePageUIClientCurrentVersion = 0 };
    265261
    266262// Editor client
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h

    r128280 r128296  
    100100WK_EXPORT uint64_t WKBundleGetAppCacheUsageForOrigin(WKBundleRef bundle, WKStringRef origin);
    101101WK_EXPORT void WKBundleSetApplicationCacheOriginQuota(WKBundleRef bundle, WKStringRef origin, uint64_t bytes);
    102 WK_EXPORT void WKBundleResetApplicationCacheOriginQuota(WKBundleRef bundle, WKStringRef origin);
    103102
    104103// Garbage collection API
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

    r128280 r128296  
    360360}
    361361
    362 void InjectedBundle::resetApplicationCacheOriginQuota(const String& originString)
    363 {
    364     RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
    365     cacheStorage().storeUpdatedQuotaForOrigin(origin.get(), cacheStorage().defaultOriginQuota());
    366 }
    367 
    368362int InjectedBundle::numberOfPages(WebFrame* frame, double pageWidthInPixels, double pageHeightInPixels)
    369363{
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

    r128280 r128296  
    151151    uint64_t appCacheUsageForOrigin(const String& origin);
    152152    void setApplicationCacheOriginQuota(const String& origin, uint64_t);
    153     void resetApplicationCacheOriginQuota(const String& origin);
    154153
    155154    // Garbage collection API
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp

    r128280 r128296  
    2929#include "InjectedBundleHitTestResult.h"
    3030#include "WKAPICast.h"
     31#include "WebGraphicsContext.h"
    3132#include "WKBundleAPICast.h"
    32 #include "WebGraphicsContext.h"
    33 #include "WebSecurityOrigin.h"
    3433#include <wtf/text/WTFString.h>
    3534
     
    148147}
    149148
    150 void InjectedBundlePageUIClient::didReachApplicationCacheOriginQuota(WebPage* page, WebSecurityOrigin* origin, int64_t totalBytesNeeded)
    151 {
    152     if (!m_client.didReachApplicationCacheOriginQuota)
    153         return;
    154 
    155     m_client.didReachApplicationCacheOriginQuota(toAPI(page), toAPI(origin), totalBytesNeeded, m_client.clientInfo);
    156 }
    157 
    158149} // namespace WebKit
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h

    r128280 r128296  
    4343class WebFrame;
    4444class WebPage;
    45 class WebSecurityOrigin;
    4645
    4746class InjectedBundlePageUIClient : public APIClient<WKBundlePageUIClient, kWKBundlePageUIClientCurrentVersion> {
     
    6665    WKBundlePageUIElementVisibility menuBarIsVisible(WebPage*);
    6766    WKBundlePageUIElementVisibility toolbarsAreVisible(WebPage*);
    68 
    69     void didReachApplicationCacheOriginQuota(WebPage*, WebSecurityOrigin*, int64_t totalBytesNeeded);
    7067};
    7168
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r128280 r128296  
    4646#include "WebProcess.h"
    4747#include "WebSearchPopupMenu.h"
    48 #include "WebSecurityOrigin.h"
    4948#include <WebCore/AXObjectCache.h>
    5049#include <WebCore/ColorChooser.h>
     
    551550}
    552551
    553 void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin* origin, int64_t totalBytesNeeded)
    554 {
    555     RefPtr<WebSecurityOrigin> webSecurityOrigin = WebSecurityOrigin::createFromString(origin->toString());
    556     m_page->injectedBundleUIClient().didReachApplicationCacheOriginQuota(m_page, webSecurityOrigin.get(), totalBytesNeeded);
     552void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t)
     553{
     554    notImplemented();
    557555}
    558556
  • trunk/Tools/ChangeLog

    r128295 r128296  
     12012-09-12  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r128280.
     4        http://trac.webkit.org/changeset/128280
     5        https://bugs.webkit.org/show_bug.cgi?id=96498
     6
     7        it broke compilation on windows debug bot (Requested by loislo
     8        on #webkit).
     9
     10        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
     11        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     12        (WTR::InjectedBundlePage::InjectedBundlePage):
     13        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
     14        (InjectedBundlePage):
     15        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
     16        (WTR::TestRunner::TestRunner):
     17        * WebKitTestRunner/InjectedBundle/TestRunner.h:
     18        (TestRunner):
     19
    1202012-09-12  Simon Hausmann  <simon.hausmann@nokia.com>
    221
  • trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

    r128280 r128296  
    4848        void dumpResourceResponseMIMETypes();
    4949        void dumpWillCacheResponse();
    50         void dumpApplicationCacheDelegateCallbacks();
    5150
    5251        // Special options.
     
    115114        void clearApplicationCacheForOrigin(in DOMString name);
    116115        void setApplicationCacheOriginQuota(in unsigned long long bytes);
    117         void disallowIncreaseForApplicationCacheQuota();
    118116
    119117        // Compositing testing.
  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r128280 r128296  
    4242#include <WebKit2/WKBundleNodeHandlePrivate.h>
    4343#include <WebKit2/WKBundlePagePrivate.h>
    44 #include <WebKit2/WKBundlePrivate.h>
    45 #include <WebKit2/WKSecurityOrigin.h>
    4644#include <WebKit2/WKURLRequest.h>
    4745#include <wtf/HashMap.h>
     
    352350        0, /*menuBarIsVisible*/
    353351        0, /*toolbarsAreVisible*/
    354         didReachApplicationCacheOriginQuota,
    355352    };
    356353    WKBundlePageSetUIClient(m_page, &uiClient);
     
    13221319}
    13231320
    1324 void InjectedBundlePage::didReachApplicationCacheOriginQuota(WKBundlePageRef page, WKSecurityOriginRef origin, int64_t totalBytesNeeded, const void* clientInfo)
    1325 {
    1326     static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->didReachApplicationCacheOriginQuota(origin, totalBytesNeeded);
    1327 }
    1328 
    13291321static WTF::String lastFileURLPathComponent(const WTF::String& path)
    13301322{
     
    14091401    InjectedBundle::shared().stringBuilder()->append(toWTFString(defaultValue));
    14101402    InjectedBundle::shared().stringBuilder()->append("\n");
    1411 }
    1412 
    1413 void InjectedBundlePage::didReachApplicationCacheOriginQuota(WKSecurityOriginRef origin, int64_t totalBytesNeeded)
    1414 {
    1415     if (!InjectedBundle::shared().testRunner()->shouldDumpApplicationCacheDelegateCallbacks())
    1416         return;
    1417 
    1418     // For example, numbers from 30000 - 39999 will output as 30000.
    1419     // Rounding up or down does not really matter for these tests. It's
    1420     // sufficient to just get a range of 10000 to determine if we were
    1421     // above or below a threshold.
    1422     int64_t truncatedSpaceNeeded = (totalBytesNeeded / 10000) * 10000;
    1423 
    1424     InjectedBundle::shared().stringBuilder()->appendLiteral("UI DELEGATE APPLICATION CACHE CALLBACK: exceededApplicationCacheOriginQuotaForSecurityOrigin:{");
    1425     InjectedBundle::shared().stringBuilder()->append(toWTFString(adoptWK(WKSecurityOriginCopyProtocol(origin))));
    1426     InjectedBundle::shared().stringBuilder()->appendLiteral(", ");
    1427     InjectedBundle::shared().stringBuilder()->append(toWTFString(adoptWK(WKSecurityOriginCopyHost(origin))));
    1428     InjectedBundle::shared().stringBuilder()->appendLiteral(", ");
    1429     InjectedBundle::shared().stringBuilder()->append(WTF::String::number(WKSecurityOriginGetPort(origin)));
    1430     InjectedBundle::shared().stringBuilder()->appendLiteral("} totalSpaceNeeded:~");
    1431     InjectedBundle::shared().stringBuilder()->append(WTF::String::number(truncatedSpaceNeeded));
    1432     InjectedBundle::shared().stringBuilder()->append('\n');
    1433 
    1434     if (InjectedBundle::shared().testRunner()->shouldDisallowIncreaseForApplicationCacheQuota())
    1435         return;
    1436 
    1437     // Reset default application cache quota.
    1438     WKBundleResetApplicationCacheOriginQuota(InjectedBundle::shared().bundle(), adoptWK(WKSecurityOriginCopyToString(origin)).get());
    14391403}
    14401404
  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h

    r128280 r128296  
    125125    static void willRunJavaScriptConfirm(WKBundlePageRef, WKStringRef message, WKBundleFrameRef frame, const void* clientInfo);
    126126    static void willRunJavaScriptPrompt(WKBundlePageRef, WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef frame, const void* clientInfo);
    127     static void didReachApplicationCacheOriginQuota(WKBundlePageRef, WKSecurityOriginRef, int64_t totalBytesNeeded, const void* clientInfo);
    128127    void willAddMessageToConsole(WKStringRef message, uint32_t lineNumber);
    129128    void willSetStatusbarText(WKStringRef statusbarText);
     
    131130    void willRunJavaScriptConfirm(WKStringRef message, WKBundleFrameRef);
    132131    void willRunJavaScriptPrompt(WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef);
    133     void didReachApplicationCacheOriginQuota(WKSecurityOriginRef, int64_t totalBytesNeeded);
    134132
    135133#if ENABLE(FULLSCREEN_API)
  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

    r128280 r128296  
    8181    , m_dumpResourceResponseMIMETypes(false)
    8282    , m_dumpWillCacheResponse(false)
    83     , m_dumpApplicationCacheDelegateCallbacks(false)
    84     , m_disallowIncreaseForApplicationCacheQuota(false)
    8583    , m_waitToDump(false)
    8684    , m_testRepaint(false)
     
    326324}
    327325
    328 void TestRunner::disallowIncreaseForApplicationCacheQuota()
    329 {
    330     m_disallowIncreaseForApplicationCacheQuota = true;
    331 }
    332 
    333326bool TestRunner::isCommandEnabled(JSStringRef name)
    334327{
  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

    r128280 r128296  
    8383    void dumpResourceResponseMIMETypes() { m_dumpResourceResponseMIMETypes = true; }
    8484    void dumpWillCacheResponse() { m_dumpWillCacheResponse = true; }
    85     void dumpApplicationCacheDelegateCallbacks() { m_dumpApplicationCacheDelegateCallbacks = true; }
    8685
    8786    void setShouldDumpFrameLoadCallbacks(bool value) { m_dumpFrameLoadCallbacks = value; }
     
    151150    long long applicationCacheDiskUsageForOrigin(JSStringRef origin);
    152151    void setApplicationCacheOriginQuota(unsigned long long);
    153     void disallowIncreaseForApplicationCacheQuota();
    154     bool shouldDisallowIncreaseForApplicationCacheQuota() { return m_disallowIncreaseForApplicationCacheQuota; }
    155152
    156153    // Printing
     
    175172    bool shouldDumpResourceResponseMIMETypes() const { return m_dumpResourceResponseMIMETypes; }
    176173    bool shouldDumpWillCacheResponse() const { return m_dumpWillCacheResponse; }
    177     bool shouldDumpApplicationCacheDelegateCallbacks() const { return m_dumpApplicationCacheDelegateCallbacks; }
    178174
    179175    bool isPolicyDelegateEnabled() const { return m_policyDelegateEnabled; }
     
    272268    bool m_dumpResourceResponseMIMETypes;
    273269    bool m_dumpWillCacheResponse;
    274     bool m_dumpApplicationCacheDelegateCallbacks;
    275     bool m_disallowIncreaseForApplicationCacheQuota;
    276270    bool m_waitToDump; // True if waitUntilDone() has been called, but notifyDone() has not yet been called.
    277271    bool m_testRepaint;
Note: See TracChangeset for help on using the changeset viewer.