Changeset 19524 in webkit

Timestamp:

Feb 9, 2007 12:50:57 AM (17 years ago)

Author:

bdash

Message:

2007-02-09 Mark Rowe <​mrowe@apple.com>

Reviewed by Maciej.

​http://bugs.webkit.org/show_bug.cgi?id=12705
REGRESSION: Crash with user stylesheet set

Allow the Frame::canLoad check to skipped so that user stylesheets can be loaded in remote documents.

• ChangeLog:
• loader/DocLoader.cpp: (WebCore::DocLoader::requestCSSStyleSheet): Skip canLoad check if this is a user stylesheet. (WebCore::DocLoader::requestUserCSSStyleSheet): (WebCore::DocLoader::requestResource): Allow canLoad check to be skipped.
• loader/DocLoader.h:
• page/Frame.cpp: (WebCore::UserStyleSheetLoader::UserStyleSheetLoader):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocLoader.cpp (modified) (3 diffs)
• loader/DocLoader.h (modified) (2 diffs)
• page/Frame.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-09  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Maciej.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12705
+        REGRESSION: Crash with user stylesheet set
+
+        Allow the Frame::canLoad check to skipped so that user stylesheets can be loaded in remote documents.
+
+        * ChangeLog:
+        * loader/DocLoader.cpp:
+        (WebCore::DocLoader::requestCSSStyleSheet): Skip canLoad check if this is a user stylesheet.
+        (WebCore::DocLoader::requestUserCSSStyleSheet):
+        (WebCore::DocLoader::requestResource): Allow canLoad check to be skipped.
+        * loader/DocLoader.h:
+        * page/Frame.cpp:
+        (WebCore::UserStyleSheetLoader::UserStyleSheetLoader):
+
 2007-02-08  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>
 

trunk/WebCore/loader/DocLoader.cpp

@@ -94 +94 @@
 }
 
-CachedCSSStyleSheet* DocLoader::requestCSSStyleSheet(const String& url, const String& charset)
-{
-    return static_cast<CachedCSSStyleSheet*>(requestResource(CachedResource::CSSStyleSheet, url, &charset));
+CachedCSSStyleSheet* DocLoader::requestCSSStyleSheet(const String& url, const String& charset, bool isUserStyleSheet)
+{
+    return static_cast<CachedCSSStyleSheet*>(requestResource(CachedResource::CSSStyleSheet, url, &charset, isUserStyleSheet));
+}
+
+CachedCSSStyleSheet* DocLoader::requestUserCSSStyleSheet(const String& url, const String& charset)
+{
+    return requestCSSStyleSheet(url, charset, true);
 }
 
@@ -118 +123 @@
 #endif
 
-CachedResource* DocLoader::requestResource(CachedResource::Type type, const String& url, const String* charset)
+CachedResource* DocLoader::requestResource(CachedResource::Type type, const String& url, const String* charset, bool skipCanLoadCheck)
 {
     KURL fullURL = m_doc->completeURL(url.deprecatedString());
@@ -133 +138 @@
     CachedResource* resource = 0;
     //If you are not allowed to load you may not get from the cache either.
-    if (fl && fl->canLoad(fullURL, fl->outgoingReferrer(), hideReferrer)) {
+    if (skipCanLoadCheck || (fl && fl->canLoad(fullURL, fl->outgoingReferrer(), hideReferrer))) {
         resource = cache()->requestResource(this, type, fullURL, m_expireDate, charset);
         if (resource) {

trunk/WebCore/loader/DocLoader.h

@@ -57 +57 @@
 
     CachedImage* requestImage(const String& url);
-    CachedCSSStyleSheet* requestCSSStyleSheet(const String& url, const String& charset);
+    CachedCSSStyleSheet* requestCSSStyleSheet(const String& url, const String& charset, bool isUserStyleSheet = false);
+    CachedCSSStyleSheet* requestUserCSSStyleSheet(const String& url, const String& charset);
     CachedScript* requestScript(const String& url, const String& charset);
 
@@ -88 +89 @@
 
 private:
-    CachedResource* requestResource(CachedResource::Type, const String& url, const String* charset = 0);
+    CachedResource* requestResource(CachedResource::Type, const String& url, const String* charset = 0, bool skipCanLoadCheck = false);
 
     void checkForReload(const KURL&);

trunk/WebCore/page/Frame.cpp

@@ -130 +130 @@
     UserStyleSheetLoader(Frame* frame, const String& url, DocLoader* docLoader)
         : m_frame(frame)
-        , m_cachedSheet(docLoader->requestCSSStyleSheet(url, ""))
+        , m_cachedSheet(docLoader->requestUserCSSStyleSheet(url, ""))
     {
         m_cachedSheet->ref(this);