--- a/webengine/osswebengine/WebCore/loader/DocLoader.h Fri May 08 08:25:06 2009 +0300
+++ b/webengine/osswebengine/WebCore/loader/DocLoader.h Fri Jul 03 15:54:40 2009 +0100
@@ -56,7 +56,7 @@
~DocLoader();
CachedImage* requestImage(const String& url);
- CachedCSSStyleSheet* requestCSSStyleSheet(const String& url, const String& charset, bool isUserStyleSheet = false);
+ CachedCSSStyleSheet* requestCSSStyleSheet(const String& url, const String& charset);
CachedCSSStyleSheet* requestUserCSSStyleSheet(const String& url, const String& charset);
CachedScript* requestScript(const String& url, const String& charset);
@@ -102,9 +102,9 @@
private:
#if PRELOAD_SCANNER_ENABLED
- CachedResource* requestResource(CachedResource::Type, const String& url, const String* charset = 0, bool skipCanLoadCheck = false, bool sendResourceLoadCallbacks = true, bool isPreload = false);
+ CachedResource* requestResource(CachedResource::Type, const String& url, const String& charset, bool isPreload = false);
#else
- CachedResource* requestResource(CachedResource::Type, const String& url, const String* charset = 0, bool skipCanLoadCheck = false, bool sendResourceLoadCallbacks = true);
+ CachedResource* requestResource(CachedResource::Type, const String& url, const String& charset);
#endif
void checkForReload(const KURL&);