Bug 30358 – [Gtk] ApplicationCacheStorage error while compiling WebKit/gtk/webkit/webkitapplicationcache.cpp

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

File ApplicationCacheStorage.cpp from http://svn.webkit.org/repository/webkit/trunk/WebCore/loader/appcache/ApplicationCacheStorage.cpp

-ApplicationCacheStorage::ApplicationCacheStorage()
-    : m_maximumSize(INT_MAX)
-    , m_isMaximumSizeReached(false)
-{
-}

+ApplicationCacheStorage::ApplicationCacheStorage()
+{
+    m_maximumSize(INT_MAX);
+    m_isMaximumSizeReached(false);
+}

This causes error when net-libs/webkit-gtk-9999 from multilib overlay of gentoo is compiled.

[Alexey Proskuryakov]

If you're seeing errors with trunk, please post compiler output with the errors.

Created attachment 41175 [details]
build.log from command emerge -1v webkit-gtk

Created attachment 41176 [details]
environment

[Alexey Proskuryakov]

WebKit/gtk/webkit/webkitapplicationcache.cpp: In function ‘void webkit_application_cache_set_maximum_size(long long unsigned int)’:
WebKit/gtk/webkit/webkitapplicationcache.cpp:27: error: ‘cacheStorage’ is not a member of ‘WebCore’
WebKit/gtk/webkit/webkitapplicationcache.cpp:28: error: ‘cacheStorage’ is not a member of ‘WebCore’
WebKit/gtk/webkit/webkitapplicationcache.cpp:29: error: ‘cacheStorage’ is not a member of ‘WebCore’

This doesn't look related to contents of ApplicationCacheStorage.cpp.

May be i'm not right. I don't know C++ very good, but after strings I wrote these strings go:
ApplicationCacheStorage& cacheStorage()
{
    DEFINE_STATIC_LOCAL(ApplicationCacheStorage, storage, ());
    
    return storage;
}

On that 'function' it fails to compile:
void webkit_application_cache_set_maximum_size(unsigned long long size)
{
    WebCore::cacheStorage().empty();
    WebCore::cacheStorage().vacuumDatabaseFile();
    WebCore::cacheStorage().setMaximumSize(size);
}

But after changing lines I get an error, which goes after error above.

[Jan Alonzo]

Created attachment 41412 [details]
Patch v1

[Alexey Proskuryakov]

Comment on attachment 41412 [details]
Patch v1

r=me (do you need UNUSED_PARAM(size) to avoid unused argument warnings?)

[Yong Li]

Comment on attachment 41412 [details]
Patch v1

Let commit bot land it

[Jan Alonzo]

Comment on attachment 41412 [details]
Patch v1

Will land it myself to add UNUSED_PARAM as ap suggested.

[Jan Alonzo]

(In reply to comment #9)
> (From update of attachment 41412 [details])
> Will land it myself to add UNUSED_PARAM as ap suggested.

Landed as http://trac.webkit.org/changeset/49801. Thanks!