Changeset 63664 in webkit


Ignore:
Timestamp:
Jul 19, 2010 8:29:25 AM (14 years ago)
Author:
andersca@apple.com
Message:

WebKit2 does not have application cache
​https://bugs.webkit.org/show_bug.cgi?id=42552

Reviewed by Adam Roben.

WebKit2:

  • Shared/CoreIPCSupport/WebProcessMessageKinds.h:

(WebProcessMessage::):
Add SetApplicationCacheDirectory.

  • Shared/WebPreferencesStore.h:

(WebKit::WebPreferencesStore::encode):
(WebKit::WebPreferencesStore::decode):
add offlineWebApplicationCacheEnabled.

  • UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetOfflineWebApplicationCacheEnabled):
(WKPreferencesGetOfflineWebApplicationCacheEnabled):

  • UIProcess/API/C/WKPreferences.h:

Add getters/setters for whether the application cache is enabled.

  • UIProcess/WebContext.h:
  • UIProcess/WebPreferences.cpp:

(WebKit::WebPreferences::setOfflineWebApplicationCacheEnabled):
Update the store and call update().

  • UIProcess/WebPreferences.h:
  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::WebProcessProxy):
Ask the web process to set the application cache directory.

  • UIProcess/mac/WebContextMac.mm: Added.

(WebKit::WebContext::applicationCacheDirectory):
Return the application cache directory.

  • UIProcess/win/WebContextWin.cpp: Added.

(WebKit::WebContext::applicationCacheDirectory):
Ditto.

  • WebKit2.xcodeproj/project.pbxproj:

Add WebContextMac.mm

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::preferencesDidChange):

(WebKit::WebPage::didReceiveMessage):
Handle PreferencesDidChange. Get rid of the default: case statement so we'll
get warnings if we have unhandled message kinds.

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::setApplicationCacheDirectory):
Set the application cache directory.

(WebKit::WebProcess::didReceiveMessage):
Handle SetApplicationCacheDirectory.

win/WebKit2.vcproj:
Add WebContextWin.cpp

WebKitTools:

  • WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::resetPreferencesToConsistentValues):
Set up default preferences. Right now just enables the web application cache.

(WTR::TestInvocation::invoke):
Call resetPreferencesToConsistentValues.

  • WebKitTestRunner/TestInvocation.h:

LayoutTests:

  • platform/mac-wk2/Skipped:

Remove http/tests/appcache from skipped list.

Location:
trunk
Files:
19 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r63663 r63664  
     12010-07-19  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        WebKit2 does not have application cache
     6        https://bugs.webkit.org/show_bug.cgi?id=42552
     7
     8        * platform/mac-wk2/Skipped:
     9        Remove http/tests/appcache from skipped list.
     10
    1112010-07-19  Yury Semikhatsky  <yurys@chromium.org>
    212

  • trunk/LayoutTests/platform/mac-wk2/Skipped

    r63644 r63664  
    23132313transitions/transition-hit-test-transform.html
    23142314transitions/transition-shorthand-delay.html
    2315 
    2316 # WebKit2 does not have application cache
    2317 # <https://bugs.webkit.org/show_bug.cgi?id=42552>
    2318 http/tests/appcache

  • trunk/WebKit2/ChangeLog

    r63640 r63664  
     12010-07-19  Anders carlsson  <andersca@apple.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        WebKit2 does not have application cache
     6        https://bugs.webkit.org/show_bug.cgi?id=42552
     7
     8        * Shared/CoreIPCSupport/WebProcessMessageKinds.h:
     9        (WebProcessMessage::):
     10        Add SetApplicationCacheDirectory.
     11
     12        * Shared/WebPreferencesStore.h:
     13        (WebKit::WebPreferencesStore::encode):
     14        (WebKit::WebPreferencesStore::decode):
     15        add offlineWebApplicationCacheEnabled.
     16
     17        * UIProcess/API/C/WKPreferences.cpp:
     18        (WKPreferencesSetOfflineWebApplicationCacheEnabled):
     19        (WKPreferencesGetOfflineWebApplicationCacheEnabled):
     20        * UIProcess/API/C/WKPreferences.h:
     21        Add getters/setters for whether the application cache is enabled.
     22
     23        * UIProcess/WebContext.h:
     24        * UIProcess/WebPreferences.cpp:
     25        (WebKit::WebPreferences::setOfflineWebApplicationCacheEnabled):
     26        Update the store and call update().
     27       
     28        * UIProcess/WebPreferences.h:
     29        * UIProcess/WebProcessProxy.cpp:
     30        (WebKit::WebProcessProxy::WebProcessProxy):
     31        Ask the web process to set the application cache directory.
     32
     33        * UIProcess/mac/WebContextMac.mm: Added.
     34        (WebKit::WebContext::applicationCacheDirectory):
     35        Return the application cache directory.
     36
     37        * UIProcess/win/WebContextWin.cpp: Added.
     38        (WebKit::WebContext::applicationCacheDirectory):
     39        Ditto.
     40
     41        * WebKit2.xcodeproj/project.pbxproj:
     42        Add WebContextMac.mm
     43
     44        * WebProcess/WebPage/WebPage.cpp:
     45        (WebKit::WebPage::preferencesDidChange):
     46       
     47        (WebKit::WebPage::didReceiveMessage):
     48        Handle PreferencesDidChange. Get rid of the default: case statement so we'll
     49        get warnings if we have unhandled message kinds.
     50
     51        * WebProcess/WebProcess.cpp:
     52        (WebKit::WebProcess::setApplicationCacheDirectory):
     53        Set the application cache directory.
     54
     55        (WebKit::WebProcess::didReceiveMessage):
     56        Handle SetApplicationCacheDirectory.
     57
     58        win/WebKit2.vcproj:
     59        Add WebContextWin.cpp
     60
    1612010-07-18  Anders Carlsson  <andersca@apple.com>
    262

  • trunk/WebKit2/Shared/CoreIPCSupport/WebProcessMessageKinds.h

    r62320 r63664  
    3535enum Kind {
    3636    LoadInjectedBundle,
     37    SetApplicationCacheDirectory,
    3738    Create,
    3839    PostMessage,

  • trunk/WebKit2/Shared/WebPreferencesStore.h

    r61719 r63664  
    4545        encoder.encode(loadsImagesAutomatically);
    4646        encoder.encode(pluginsEnabled);
     47        encoder.encode(offlineWebApplicationCacheEnabled);
    4748        encoder.encode(minimumFontSize);
    4849        encoder.encode(minimumLogicalFontSize);
    … …  
    6465            return false;
    6566        if (!decoder.decode(s.pluginsEnabled))
     67            return false;
     68        if (!decoder.decode(s.offlineWebApplicationCacheEnabled))
    6669            return false;
    6770        if (!decoder.decode(s.minimumFontSize))
    … …  
    9194    bool loadsImagesAutomatically;
    9295    bool pluginsEnabled;
    93    
     96    bool offlineWebApplicationCacheEnabled;
     97
    9498    uint32_t minimumFontSize;
    9599    uint32_t minimumLogicalFontSize;

  • trunk/WebKit2/UIProcess/API/C/WKPreferences.cpp

    r57310 r63664  
    6565}
    6666
     67void WKPreferencesSetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferencesRef, bool offlineWebApplicationCacheEnabled)
     68{
     69    toWK(preferencesRef)->setOfflineWebApplicationCacheEnabled(offlineWebApplicationCacheEnabled);
     70}
     71
     72bool WKPreferencesGetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferencesRef)
     73{
     74    return toWK(preferencesRef)->offlineWebApplicationCacheEnabled();
     75}
     76
    6777WKPreferencesRef WKPreferencesRetain(WKPreferencesRef preferencesRef)
    6878{

  • trunk/WebKit2/UIProcess/API/C/WKPreferences.h

    r61048 r63664  
    4444WK_EXPORT void WKPreferencesSetLoadsImagesAutomatically(WKPreferencesRef preferences, bool loadsImagesAutomatically);
    4545WK_EXPORT bool WKPreferencesGetLoadsImagesAutomatically(WKPreferencesRef preferences);
     46WK_EXPORT void WKPreferencesSetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferences, bool offlineWebApplicationCacheEnabled);
     47WK_EXPORT bool WKPreferencesGetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferences);
    4648
    4749WK_EXPORT WKPreferencesRef WKPreferencesRetain(WKPreferencesRef preferences);

  • trunk/WebKit2/UIProcess/WebContext.h

    r63621 r63664  
    8585
    8686    PluginInfoStore* pluginInfoStore() { return &m_pluginInfoStore; }
     87    WebCore::String applicationCacheDirectory();
    8788
    8889private:

  • trunk/WebKit2/UIProcess/WebPreferences.cpp

    r57310 r63664  
    8787}
    8888
     89void WebPreferences::setOfflineWebApplicationCacheEnabled(bool b)
     90{
     91    m_store.offlineWebApplicationCacheEnabled = b;
     92    update();
     93}
     94   
     95bool WebPreferences::offlineWebApplicationCacheEnabled() const
     96{
     97    return m_store.offlineWebApplicationCacheEnabled;
     98}
     99
    89100} // namespace WebKit

  • trunk/WebKit2/UIProcess/WebPreferences.h

    r57310 r63664  
    6262    bool loadsImagesAutomatically() const;
    6363
     64    void setOfflineWebApplicationCacheEnabled(bool);
     65    bool offlineWebApplicationCacheEnabled() const;
     66
    6467private:
    6568    WebPreferences();

  • trunk/WebKit2/UIProcess/WebProcessProxy.cpp

    r63621 r63664  
    5959    connect();
    6060
     61    // FIXME: Instead of sending three separate initialization related messages here, we should just send a
     62    // single "Initialize" messages with a struct that has all the needed information.
     63    send(WebProcessMessage::SetApplicationCacheDirectory, 0, CoreIPC::In(m_context->applicationCacheDirectory()));
     64
    6165    // FIXME: We could instead send the bundle path as part of the arguments to process creation?
    6266    // Would that be better than sending a connection?
    … …  
    6771    setUpAcceleratedCompositing();
    6872#endif
     73
    6974}
    7075

  • trunk/WebKit2/UIProcess/mac/WebContextMac.mm

    r63663 r63664  
    2424 */
    2525
    26 #ifndef WebPreferences_h
    27 #define WebPreferences_h
     26#include "WebContext.h"
    2827
    29 #include "WebPreferencesStore.h"
    30 #include <wtf/HashSet.h>
    31 #include <wtf/PassRefPtr.h>
    32 #include <wtf/RefCounted.h>
    33 #include <wtf/RefPtr.h>
     28#include <sys/param.h>
     29
     30using namespace WebCore;
     31
     32NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
    3433
    3534namespace WebKit {
    3635
    37 class WebContext;
     36String WebContext::applicationCacheDirectory()
     37{
     38    NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
     39    if (!appName)
     40        appName = [[NSProcessInfo processInfo] processName];
     41   
     42    ASSERT(appName);
     43   
     44    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     45    NSString *cacheDir = [defaults objectForKey:WebKitLocalCacheDefaultsKey];
    3846
    39 class WebPreferences : public RefCounted<WebPreferences> {
    40 public:
    41     static WebPreferences* shared();
     47    if (!cacheDir || ![cacheDir isKindOfClass:[NSString class]]) {
     48#ifdef BUILDING_ON_TIGER
     49        cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"];
     50#else
     51        char cacheDirectory[MAXPATHLEN];
     52        size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
     53   
     54        if (cacheDirectoryLen)
     55            cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
     56#endif
     57    }
    4258
    43     static PassRefPtr<WebPreferences> create()
    44     {
    45         return adoptRef(new WebPreferences);
    46     }
    47     static PassRefPtr<WebPreferences> copy(WebPreferences* preferences)
    48     {
    49         return adoptRef(new WebPreferences(preferences));
    50     }
    51     ~WebPreferences();
    52 
    53     void addContext(WebContext*);
    54     void removeContext(WebContext*);
    55 
    56     const WebPreferencesStore& store() const { return m_store; }
    57 
    58     void setJavaScriptEnabled(bool);
    59     bool javaScriptEnabled() const;
    60 
    61     void setLoadsImagesAutomatically(bool);
    62     bool loadsImagesAutomatically() const;
    63 
    64 private:
    65     WebPreferences();
    66     WebPreferences(WebPreferences*);
    67 
    68     void update();
    69 
    70     HashSet<WebContext*> m_contexts;
    71     WebPreferencesStore m_store;
    72 };
     59    return [cacheDir stringByAppendingPathComponent:appName];
     60}
    7361
    7462} // namespace WebKit
    7563
    76 #endif // WebPreferences_h

  • trunk/WebKit2/UIProcess/win/WebContextWin.cpp

    r63663 r63664  
    2424 */
    2525
    26 #ifndef WebProcessMessageKinds_h
    27 #define WebProcessMessageKinds_h
     26#include "WebContext.h"
    2827
    29 // Messages sent from WebKit to the web process.
     28#include <WebCore/FileSystem.h>
    3029
    31 #include "MessageID.h"
     30using namespace WebCore;
    3231
    33 namespace WebProcessMessage {
     32namespace WebKit {
    3433
    35 enum Kind {
    36     LoadInjectedBundle,
    37     Create,
    38     PostMessage,
    39 #if PLATFORM(MAC)
    40     SetupAcceleratedCompositingPort
    41 #endif
    42 };
    43 
     34String WebContext::applicationCacheDirectory()
     35{
     36    return localUserSpecificStorageDirectory();
    4437}
    4538
    46 namespace CoreIPC {
     39} // namespace WebKit
    4740
    48 template<> struct MessageKindTraits<WebProcessMessage::Kind> {
    49     static const MessageClass messageClass = MessageClassWebProcess;
    50 };
    51 
    52 }
    53 
    54 #endif // WebProcessMessageKinds_h

  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r63631 r63664  
    3333                1A10475A110A5AD500A43ECD /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */; };
    3434                1A1C4EC810D06099005E67E7 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
     35                1A1C649B11F4174200553C19 /* WebContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C648611F415B700553C19 /* WebContextMac.mm */; };
    3536                1A2161B011F37664008AD0F5 /* NPJSObjectMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2161AE11F37664008AD0F5 /* NPJSObjectMap.h */; };
    3637                1A2161B111F37664008AD0F5 /* NPJSObjectMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2161AF11F37664008AD0F5 /* NPJSObjectMap.cpp */; };
    … …  
    302303                0F52667311DD4A490006D33C /* WebProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessProxyMac.mm; sourceTree = "<group>"; };
    303304                1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
     305                1A1C648611F415B700553C19 /* WebContextMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMac.mm; sourceTree = "<group>"; };
    304306                1A2161AE11F37664008AD0F5 /* NPJSObjectMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPJSObjectMap.h; sourceTree = "<group>"; };
    305307                1A2161AF11F37664008AD0F5 /* NPJSObjectMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPJSObjectMap.cpp; sourceTree = "<group>"; };
    … …  
    11221124                                0F5265BB11DD37860006D33C /* LayerBackedDrawingAreaProxyMac.mm */,
    11231125                                0F52667311DD4A490006D33C /* WebProcessProxyMac.mm */,
     1126                                1A1C648611F415B700553C19 /* WebContextMac.mm */,
    11241127                        );
    11251128                        path = mac;
    … …  
    14411444                                1A2161B111F37664008AD0F5 /* NPJSObjectMap.cpp in Sources */,
    14421445                                1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */,
     1446                                1A1C649B11F4174200553C19 /* WebContextMac.mm in Sources */,
    14431447                        );
    14441448                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

    r63377 r63664  
    328328    m_page->settings()->setJavaScriptEnabled(store.javaScriptEnabled);
    329329    m_page->settings()->setLoadsImagesAutomatically(store.loadsImagesAutomatically);
     330    m_page->settings()->setOfflineWebApplicationCacheEnabled(store.offlineWebApplicationCacheEnabled);
    330331}
    331332
    … …  
    375376         
    376377            setActive(active);
    377             break;
     378            return;
    378379        }
    379380        case WebPageMessage::SetFocused: {
    … …  
    383384           
    384385            setFocused(focused);
    385             break;
     386            return;
    386387        }
    387388        case WebPageMessage::SetIsInWindow: {
    … …  
    391392           
    392393            setIsInWindow(isInWindow);
    393             break;
     394            return;
    394395        }
    395396        case WebPageMessage::MouseEvent: {
    … …  
    400401            PlatformMouseEvent platformEvent = platform(event);
    401402            mouseEvent(platformEvent);
    402             break;
     403            return;
     404        }
     405        case WebPageMessage::PreferencesDidChange: {
     406            WebPreferencesStore store;
     407            if (!arguments.decode(store))
     408                return;
     409           
     410            preferencesDidChange(store);
     411            return;
    403412        }
    404413        case WebPageMessage::WheelEvent: {
    … …  
    409418            PlatformWheelEvent platformEvent = platform(event);
    410419            wheelEvent(platformEvent);
    411             break;
     420            return;
    412421        }
    413422        case WebPageMessage::KeyEvent: {
    … …  
    418427            PlatformKeyboardEvent platformEvent = platform(event);
    419428            keyEvent(platformEvent);
    420             break;
     429            return;
    421430        }
    422431        case WebPageMessage::LoadURL: {
    … …  
    426435           
    427436            loadURL(url);
    428             break;
     437            return;
    429438        }
    430439        case WebPageMessage::StopLoading:
    … …  
    437446
    438447            reload(reloadFromOrigin);
    439             break;
     448            return;
    440449        }
    441450        case WebPageMessage::GoForward: {
    … …  
    444453                return;
    445454            goForward(backForwardItemID);
    446             break;
     455            return;
    447456        }
    448457        case WebPageMessage::GoBack: {
    … …  
    451460                return;
    452461            goBack(backForwardItemID);
    453             break;
     462            return;
    454463        }
    455464       case WebPageMessage::GoToBackForwardItem: {
    … …  
    458467                return;
    459468            goToBackForwardItem(backForwardItemID);
    460             break;
     469            return;
    461470        }
    462471        case WebPageMessage::DidReceivePolicyDecision: {
    … …  
    467476                return;
    468477            didReceivePolicyDecision(webFrame(frameID), listenerID, (WebCore::PolicyAction)policyAction);
    469             break;
     478            return;
    470479        }
    471480        case WebPageMessage::RunJavaScriptInMainFrame: {
    … …  
    475484                return;
    476485            runJavaScriptInMainFrame(script, callbackID);
    477             break;
     486            return;
    478487        }
    479488        case WebPageMessage::GetRenderTreeExternalRepresentation: {
    … …  
    482491                return;
    483492            getRenderTreeExternalRepresentation(callbackID);
    484             break;
     493            return;
    485494        }
    486495        case WebPageMessage::Close: {
    487496            close();
    488             break;
     497            return;
    489498        }
    490499        case WebPageMessage::TryClose: {
    491500            tryClose();
    492             break;
    493         }
    494         default:
    495             ASSERT_NOT_REACHED();
    496             break;
     501            return;
     502        }
    497503    }
     504
     505    ASSERT_NOT_REACHED();
    498506}
    499507

  • trunk/WebKit2/WebProcess/WebProcess.cpp

    r62788 r63664  
    3737#include "WebPreferencesStore.h"
    3838#include "WebProcessMessageKinds.h"
     39#include <WebCore/ApplicationCacheStorage.h>
    3940#include <wtf/PassRefPtr.h>
    4041
    … …  
    8687        m_injectedBundle.clear();
    8788    }
     89}
     90
     91void WebProcess::setApplicationCacheDirectory(const String& directory)
     92{
     93    cacheStorage().setCacheDirectory(directory);
    8894}
    8995
    … …  
    160166                return;
    161167            }
     168            case WebProcessMessage::SetApplicationCacheDirectory: {
     169                String directory;
     170                if (!arguments->decode(CoreIPC::Out(directory)))
     171                    return;
     172               
     173                setApplicationCacheDirectory(directory);
     174                return;
     175            }
    162176            case WebProcessMessage::Create: {
    163177                uint64_t pageID = arguments->destinationID();

  • trunk/WebKit2/WebProcess/WebProcess.h

    r62320 r63664  
    6868
    6969    void loadInjectedBundle(const WebCore::String&);
     70    void setApplicationCacheDirectory(const WebCore::String&);
    7071    void forwardMessageToInjectedBundle(const WebCore::String&);
    7172

  • trunk/WebKit2/win/WebKit2.vcproj

    r63639 r63664  
    11941194                                </File>
    11951195                                <File
     1196                                        RelativePath="..\UIProcess\win\WebContextWin.cpp"
     1197                                        >
     1198                                </File>
     1199                                <File
    11961200                                        RelativePath="..\UIProcess\win\WebView.cpp"
    11971201                                        >

  • trunk/WebKitTools/ChangeLog

    r63661 r63664  
     12010-07-19  Anders carlsson  <andersca@apple.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        WebKit2 does not have application cache
     6        https://bugs.webkit.org/show_bug.cgi?id=42552
     7
     8        * WebKitTestRunner/TestInvocation.cpp:
     9        (WTR::TestInvocation::resetPreferencesToConsistentValues):
     10        Set up default preferences. Right now just enables the web application cache.
     11
     12        (WTR::TestInvocation::invoke):
     13        Call resetPreferencesToConsistentValues.
     14
     15        * WebKitTestRunner/TestInvocation.h:
     16
    1172010-07-19  Kent Tamura  <tkent@chromium.org>
    218

  • trunk/WebKitTools/WebKitTestRunner/TestInvocation.cpp

    r63583 r63664  
    9797}
    9898
     99void TestInvocation::resetPreferencesToConsistentValues()
     100{
     101    WKPreferencesRef preferences = WKContextGetPreferences(TestController::shared().context());
     102   
     103    WKPreferencesSetOfflineWebApplicationCacheEnabled(preferences, true);
     104}
     105
    99106void TestInvocation::invoke()
    100107{
    101108    sizeWebViewForCurrentTest(m_pathOrURL);
     109    resetPreferencesToConsistentValues();
     110
    102111    WKRetainPtr<WKStringRef> message(AdoptWK, WKStringCreateWithCFString(CFSTR("BeginTest")));
    103112    WKContextPostMessageToInjectedBundle(TestController::shared().context(), message.get());

  • trunk/WebKitTools/WebKitTestRunner/TestInvocation.h

    r63155 r63664  
    4343    void dump(const char*);
    4444
     45    void resetPreferencesToConsistentValues();
     46
    4547    // Helper
    4648    static void runUntil(bool& done);
Note: See TracChangeset for help on using the changeset viewer.