Changeset 31307 in webkit

Timestamp:

Mar 25, 2008 8:41:56 PM (16 years ago)

Author:

Antti Koivisto

Message:

2008-03-25 Antti Koivisto <Antti Koivisto>

Reviewed by Oliver.

Fix ​http://bugs.webkit.org/show_bug.cgi?id=18082
REGRESSION (r31287): GMail does not work if user stylesheet is set

Oops, my cache refactoring patch was missing these rather essential lines for
user stylesheets. They would get reloaded repeatedly.

• loader/Cache.cpp: (WebCore::Cache::requestUserCSSStyleSheet):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/Cache.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-25  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Oliver.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=18082
+        REGRESSION (r31287): GMail does not work if user stylesheet is set
+        
+        Oops, my cache refactoring patch was missing these rather essential lines for
+        user stylesheets. They would get reloaded repeatedly.
+
+        * loader/Cache.cpp:
+        (WebCore::Cache::requestUserCSSStyleSheet):
+
 2008-03-25  Matt Lilek  <webkit@mattlilek.com>
 

trunk/WebCore/loader/Cache.cpp

@@ -160 +160 @@
 CachedCSSStyleSheet* Cache::requestUserCSSStyleSheet(DocLoader* docLoader, const String& url, const String& charset)
 {
+    if (CachedResource* existing = m_resources.get(url))
+        return existing->type() == CachedResource::CSSStyleSheet ? static_cast<CachedCSSStyleSheet*>(existing) : 0;
+
     CachedCSSStyleSheet* userSheet = new CachedCSSStyleSheet(url, charset);