Changeset 63682 in webkit


Ignore:
Timestamp:
Jul 19, 2010 1:08:06 PM (14 years ago)
Author:
weinig@apple.com
Message:

Add local storage support for WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=42584

Reviewed by Darin Adler.

  • Shared/WebPreferencesStore.cpp:

(WebKit::WebPreferencesStore::WebPreferencesStore):
(WebKit::WebPreferencesStore::swap):

  • Shared/WebPreferencesStore.h:

(WebKit::WebPreferencesStore::encode):
(WebKit::WebPreferencesStore::decode):

  • UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetLocalStorageEnabled):
(WKPreferencesGetLocalStorageEnabled):

  • UIProcess/API/C/WKPreferences.h:
  • UIProcess/WebPreferences.cpp:

(WebKit::WebPreferences::setLocalStorageEnabled):
(WebKit::WebPreferences::localStorageEnabled):

  • UIProcess/WebPreferences.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::WebPage):
(WebKit::WebPage::preferencesDidChange):

Location:
trunk/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r63677 r63682  
     12010-07-19  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Add local storage support for WebKit2
     6        https://bugs.webkit.org/show_bug.cgi?id=42584
     7
     8        * Shared/WebPreferencesStore.cpp:
     9        (WebKit::WebPreferencesStore::WebPreferencesStore):
     10        (WebKit::WebPreferencesStore::swap):
     11        * Shared/WebPreferencesStore.h:
     12        (WebKit::WebPreferencesStore::encode):
     13        (WebKit::WebPreferencesStore::decode):
     14        * UIProcess/API/C/WKPreferences.cpp:
     15        (WKPreferencesSetLocalStorageEnabled):
     16        (WKPreferencesGetLocalStorageEnabled):
     17        * UIProcess/API/C/WKPreferences.h:
     18        * UIProcess/WebPreferences.cpp:
     19        (WebKit::WebPreferences::setLocalStorageEnabled):
     20        (WebKit::WebPreferences::localStorageEnabled):
     21        * UIProcess/WebPreferences.h:
     22        * WebProcess/WebPage/WebPage.cpp:
     23        (WebKit::WebPage::WebPage):
     24        (WebKit::WebPage::preferencesDidChange):
     25
    1262010-07-19  Simon Fraser  <simon.fraser@apple.com>
    227

  • trunk/WebKit2/Shared/WebPreferencesStore.cpp

    r61587 r63682  
    3232    , loadsImagesAutomatically(true)
    3333    , pluginsEnabled(true)
     34    , offlineWebApplicationCacheEnabled(false)
     35    , localStorageEnabled(true)
    3436    , minimumFontSize(9)
    3537    , minimumLogicalFontSize(9)
    … …  
    4951    javaScriptEnabled = other.javaScriptEnabled;
    5052    loadsImagesAutomatically = other.loadsImagesAutomatically;
    51 
     53    pluginsEnabled = other.pluginsEnabled;
     54    offlineWebApplicationCacheEnabled = other.offlineWebApplicationCacheEnabled;
     55    localStorageEnabled = other.localStorageEnabled;
    5256    minimumFontSize = other.minimumFontSize;
    5357    minimumLogicalFontSize = other.minimumLogicalFontSize;
    … …  
    7478    std::swap(javaScriptEnabled, other.javaScriptEnabled);
    7579    std::swap(loadsImagesAutomatically, other.loadsImagesAutomatically);
     80    std::swap(pluginsEnabled, other.pluginsEnabled);
     81    std::swap(offlineWebApplicationCacheEnabled, other.offlineWebApplicationCacheEnabled);
     82    std::swap(localStorageEnabled, other.localStorageEnabled);
    7683    std::swap(minimumFontSize, other.minimumFontSize);
    7784    std::swap(minimumLogicalFontSize, other.minimumLogicalFontSize);

  • trunk/WebKit2/Shared/WebPreferencesStore.h

    r63664 r63682  
    4646        encoder.encode(pluginsEnabled);
    4747        encoder.encode(offlineWebApplicationCacheEnabled);
     48        encoder.encode(localStorageEnabled);
    4849        encoder.encode(minimumFontSize);
    4950        encoder.encode(minimumLogicalFontSize);
    … …  
    6768            return false;
    6869        if (!decoder.decode(s.offlineWebApplicationCacheEnabled))
     70            return false;
     71        if (!decoder.decode(s.localStorageEnabled))
    6972            return false;
    7073        if (!decoder.decode(s.minimumFontSize))
    … …  
    9598    bool pluginsEnabled;
    9699    bool offlineWebApplicationCacheEnabled;
     100    bool localStorageEnabled;
    97101
    98102    uint32_t minimumFontSize;

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

    r63664 r63682  
    7575}
    7676
     77void WKPreferencesSetLocalStorageEnabled(WKPreferencesRef preferencesRef, bool localStorageEnabled)
     78{
     79    toWK(preferencesRef)->setLocalStorageEnabled(localStorageEnabled);
     80}
     81
     82bool WKPreferencesGetLocalStorageEnabled(WKPreferencesRef preferencesRef)
     83{
     84    return toWK(preferencesRef)->localStorageEnabled();
     85}
     86
    7787WKPreferencesRef WKPreferencesRetain(WKPreferencesRef preferencesRef)
    7888{

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

    r63664 r63682  
    4040WK_EXPORT WKPreferencesRef WKPreferencesCreateCopy(WKPreferencesRef);
    4141
     42// Defaults to true.
    4243WK_EXPORT void WKPreferencesSetJavaScriptEnabled(WKPreferencesRef preferences, bool javaScriptEnabled);
    4344WK_EXPORT bool WKPreferencesGetJavaScriptEnabled(WKPreferencesRef preferences);
     45
     46// Defaults to true.
    4447WK_EXPORT void WKPreferencesSetLoadsImagesAutomatically(WKPreferencesRef preferences, bool loadsImagesAutomatically);
    4548WK_EXPORT bool WKPreferencesGetLoadsImagesAutomatically(WKPreferencesRef preferences);
     49
     50// Defaults to false.
    4651WK_EXPORT void WKPreferencesSetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferences, bool offlineWebApplicationCacheEnabled);
    4752WK_EXPORT bool WKPreferencesGetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferences);
     53
     54// Defaults to true.
     55WK_EXPORT void WKPreferencesSetLocalStorageEnabled(WKPreferencesRef preferences, bool localStorageEnabled);
     56WK_EXPORT bool WKPreferencesGetLocalStorageEnabled(WKPreferencesRef preferences);
    4857
    4958WK_EXPORT WKPreferencesRef WKPreferencesRetain(WKPreferencesRef preferences);

  • trunk/WebKit2/UIProcess/WebPreferences.cpp

    r63664 r63682  
    9898}
    9999
     100void WebPreferences::setLocalStorageEnabled(bool b)
     101{
     102    m_store.localStorageEnabled = b;
     103    update();
     104}
     105
     106bool WebPreferences::localStorageEnabled() const
     107{
     108    return m_store.localStorageEnabled;
     109}
     110
    100111} // namespace WebKit

  • trunk/WebKit2/UIProcess/WebPreferences.h

    r63664 r63682  
    6565    bool offlineWebApplicationCacheEnabled() const;
    6666
     67    void setLocalStorageEnabled(bool);
     68    bool localStorageEnabled() const;
     69
    6770private:
    6871    WebPreferences();

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

    r63664 r63682  
    9090    m_page->settings()->setLoadsImagesAutomatically(store.loadsImagesAutomatically);
    9191    m_page->settings()->setPluginsEnabled(store.pluginsEnabled);
     92    m_page->settings()->setOfflineWebApplicationCacheEnabled(store.offlineWebApplicationCacheEnabled);
     93    m_page->settings()->setLocalStorageEnabled(store.localStorageEnabled);
    9294    m_page->settings()->setMinimumFontSize(store.minimumFontSize);
    9395    m_page->settings()->setMinimumLogicalFontSize(store.minimumLogicalFontSize);
    … …  
    329331    m_page->settings()->setLoadsImagesAutomatically(store.loadsImagesAutomatically);
    330332    m_page->settings()->setOfflineWebApplicationCacheEnabled(store.offlineWebApplicationCacheEnabled);
     333    m_page->settings()->setLocalStorageEnabled(store.localStorageEnabled);
    331334}
    332335
Note: See TracChangeset for help on using the changeset viewer.