Changeset 63682 in webkit
- Timestamp:
- Jul 19, 2010 1:08:06 PM (14 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r63677 r63682 1 2010-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 1 26 2010-07-19 Simon Fraser <simon.fraser@apple.com> 2 27 -
trunk/WebKit2/Shared/WebPreferencesStore.cpp
r61587 r63682 32 32 , loadsImagesAutomatically(true) 33 33 , pluginsEnabled(true) 34 , offlineWebApplicationCacheEnabled(false) 35 , localStorageEnabled(true) 34 36 , minimumFontSize(9) 35 37 , minimumLogicalFontSize(9) … … 49 51 javaScriptEnabled = other.javaScriptEnabled; 50 52 loadsImagesAutomatically = other.loadsImagesAutomatically; 51 53 pluginsEnabled = other.pluginsEnabled; 54 offlineWebApplicationCacheEnabled = other.offlineWebApplicationCacheEnabled; 55 localStorageEnabled = other.localStorageEnabled; 52 56 minimumFontSize = other.minimumFontSize; 53 57 minimumLogicalFontSize = other.minimumLogicalFontSize; … … 74 78 std::swap(javaScriptEnabled, other.javaScriptEnabled); 75 79 std::swap(loadsImagesAutomatically, other.loadsImagesAutomatically); 80 std::swap(pluginsEnabled, other.pluginsEnabled); 81 std::swap(offlineWebApplicationCacheEnabled, other.offlineWebApplicationCacheEnabled); 82 std::swap(localStorageEnabled, other.localStorageEnabled); 76 83 std::swap(minimumFontSize, other.minimumFontSize); 77 84 std::swap(minimumLogicalFontSize, other.minimumLogicalFontSize); -
trunk/WebKit2/Shared/WebPreferencesStore.h
r63664 r63682 46 46 encoder.encode(pluginsEnabled); 47 47 encoder.encode(offlineWebApplicationCacheEnabled); 48 encoder.encode(localStorageEnabled); 48 49 encoder.encode(minimumFontSize); 49 50 encoder.encode(minimumLogicalFontSize); … … 67 68 return false; 68 69 if (!decoder.decode(s.offlineWebApplicationCacheEnabled)) 70 return false; 71 if (!decoder.decode(s.localStorageEnabled)) 69 72 return false; 70 73 if (!decoder.decode(s.minimumFontSize)) … … 95 98 bool pluginsEnabled; 96 99 bool offlineWebApplicationCacheEnabled; 100 bool localStorageEnabled; 97 101 98 102 uint32_t minimumFontSize; -
trunk/WebKit2/UIProcess/API/C/WKPreferences.cpp
r63664 r63682 75 75 } 76 76 77 void WKPreferencesSetLocalStorageEnabled(WKPreferencesRef preferencesRef, bool localStorageEnabled) 78 { 79 toWK(preferencesRef)->setLocalStorageEnabled(localStorageEnabled); 80 } 81 82 bool WKPreferencesGetLocalStorageEnabled(WKPreferencesRef preferencesRef) 83 { 84 return toWK(preferencesRef)->localStorageEnabled(); 85 } 86 77 87 WKPreferencesRef WKPreferencesRetain(WKPreferencesRef preferencesRef) 78 88 { -
trunk/WebKit2/UIProcess/API/C/WKPreferences.h
r63664 r63682 40 40 WK_EXPORT WKPreferencesRef WKPreferencesCreateCopy(WKPreferencesRef); 41 41 42 // Defaults to true. 42 43 WK_EXPORT void WKPreferencesSetJavaScriptEnabled(WKPreferencesRef preferences, bool javaScriptEnabled); 43 44 WK_EXPORT bool WKPreferencesGetJavaScriptEnabled(WKPreferencesRef preferences); 45 46 // Defaults to true. 44 47 WK_EXPORT void WKPreferencesSetLoadsImagesAutomatically(WKPreferencesRef preferences, bool loadsImagesAutomatically); 45 48 WK_EXPORT bool WKPreferencesGetLoadsImagesAutomatically(WKPreferencesRef preferences); 49 50 // Defaults to false. 46 51 WK_EXPORT void WKPreferencesSetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferences, bool offlineWebApplicationCacheEnabled); 47 52 WK_EXPORT bool WKPreferencesGetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferences); 53 54 // Defaults to true. 55 WK_EXPORT void WKPreferencesSetLocalStorageEnabled(WKPreferencesRef preferences, bool localStorageEnabled); 56 WK_EXPORT bool WKPreferencesGetLocalStorageEnabled(WKPreferencesRef preferences); 48 57 49 58 WK_EXPORT WKPreferencesRef WKPreferencesRetain(WKPreferencesRef preferences); -
trunk/WebKit2/UIProcess/WebPreferences.cpp
r63664 r63682 98 98 } 99 99 100 void WebPreferences::setLocalStorageEnabled(bool b) 101 { 102 m_store.localStorageEnabled = b; 103 update(); 104 } 105 106 bool WebPreferences::localStorageEnabled() const 107 { 108 return m_store.localStorageEnabled; 109 } 110 100 111 } // namespace WebKit -
trunk/WebKit2/UIProcess/WebPreferences.h
r63664 r63682 65 65 bool offlineWebApplicationCacheEnabled() const; 66 66 67 void setLocalStorageEnabled(bool); 68 bool localStorageEnabled() const; 69 67 70 private: 68 71 WebPreferences(); -
trunk/WebKit2/WebProcess/WebPage/WebPage.cpp
r63664 r63682 90 90 m_page->settings()->setLoadsImagesAutomatically(store.loadsImagesAutomatically); 91 91 m_page->settings()->setPluginsEnabled(store.pluginsEnabled); 92 m_page->settings()->setOfflineWebApplicationCacheEnabled(store.offlineWebApplicationCacheEnabled); 93 m_page->settings()->setLocalStorageEnabled(store.localStorageEnabled); 92 94 m_page->settings()->setMinimumFontSize(store.minimumFontSize); 93 95 m_page->settings()->setMinimumLogicalFontSize(store.minimumLogicalFontSize); … … 329 331 m_page->settings()->setLoadsImagesAutomatically(store.loadsImagesAutomatically); 330 332 m_page->settings()->setOfflineWebApplicationCacheEnabled(store.offlineWebApplicationCacheEnabled); 333 m_page->settings()->setLocalStorageEnabled(store.localStorageEnabled); 331 334 } 332 335
Note: See TracChangeset
for help on using the changeset viewer.