Diff
Modified: trunk/Source/WebCore/ChangeLog (97207 => 97208)
--- trunk/Source/WebCore/ChangeLog 2011-10-12 01:12:57 UTC (rev 97207)
+++ trunk/Source/WebCore/ChangeLog 2011-10-12 01:16:36 UTC (rev 97208)
@@ -1,3 +1,32 @@
+2011-10-11 Oliver Hunt <[email protected]>
+
+ Clang build broken
+ https://bugs.webkit.org/show_bug.cgi?id=69891
+
+ Reviewed by Darin Adler.
+
+ Rename CachedResourceClient::type to CachedResourceClient::resourceClientType
+ to avoid conflict in CSSImportRule.
+
+ * loader/cache/CachedCSSStyleSheet.cpp:
+ (WebCore::CachedCSSStyleSheet::didAddClient):
+ * loader/cache/CachedFont.cpp:
+ (WebCore::CachedFont::didAddClient):
+ * loader/cache/CachedFont.h:
+ (WebCore::CachedFontClient::resourceClientType):
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::didAddClient):
+ * loader/cache/CachedImage.h:
+ (WebCore::CachedImageClient::resourceClientType):
+ * loader/cache/CachedResourceClient.h:
+ (WebCore::CachedResourceClient::resourceClientType):
+ * loader/cache/CachedResourceClientWalker.h:
+ (WebCore::CachedResourceClientWalker::next):
+ * loader/cache/CachedStyleSheetClient.h:
+ (WebCore::CachedStyleSheetClient::resourceClientType):
+ * loader/cache/CachedXSLStyleSheet.cpp:
+ (WebCore::CachedXSLStyleSheet::didAddClient):
+
2011-10-11 Ryosuke Niwa <[email protected]>
Dir attribute is converted into direction property when merging paragraphs
Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (97207 => 97208)
--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2011-10-12 01:12:57 UTC (rev 97207)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2011-10-12 01:16:36 UTC (rev 97208)
@@ -52,7 +52,7 @@
void CachedCSSStyleSheet::didAddClient(CachedResourceClient* c)
{
- if (!isLoading() && c->type() == CachedStyleSheetClient::expectedType())
+ if (!isLoading() && c->resourceClientType() == CachedStyleSheetClient::expectedType())
static_cast<CachedStyleSheetClient*>(c)->setCSSStyleSheet(m_resourceRequest.url(), m_response.url(), m_decoder->encoding().name(), this);
}
Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (97207 => 97208)
--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2011-10-12 01:12:57 UTC (rev 97207)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2011-10-12 01:16:36 UTC (rev 97208)
@@ -79,7 +79,7 @@
void CachedFont::didAddClient(CachedResourceClient* c)
{
- if (!isLoading() && c->type() == CachedFontClient::expectedType())
+ if (!isLoading() && c->resourceClientType() == CachedFontClient::expectedType())
static_cast<CachedFontClient*>(c)->fontLoaded(this);
}
Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (97207 => 97208)
--- trunk/Source/WebCore/loader/cache/CachedFont.h 2011-10-12 01:12:57 UTC (rev 97207)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2011-10-12 01:16:36 UTC (rev 97208)
@@ -84,7 +84,7 @@
public:
virtual ~CachedFontClient() { }
static CachedResourceClientType expectedType() { return FontType; }
- virtual CachedResourceClientType type() { return expectedType(); }
+ virtual CachedResourceClientType resourceClientType() { return expectedType(); }
virtual void fontLoaded(CachedFont*) { }
};
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (97207 => 97208)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2011-10-12 01:12:57 UTC (rev 97207)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2011-10-12 01:16:36 UTC (rev 97208)
@@ -99,7 +99,7 @@
m_image->setData(m_data, true);
}
- if (m_image && !m_image->isNull() && c->type() == CachedImageClient::expectedType())
+ if (m_image && !m_image->isNull() && c->resourceClientType() == CachedImageClient::expectedType())
static_cast<CachedImageClient*>(c)->imageChanged(this);
CachedResource::didAddClient(c);
Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (97207 => 97208)
--- trunk/Source/WebCore/loader/cache/CachedImage.h 2011-10-12 01:12:57 UTC (rev 97207)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2011-10-12 01:16:36 UTC (rev 97208)
@@ -108,7 +108,7 @@
public:
virtual ~CachedImageClient() { }
static CachedResourceClientType expectedType() { return ImageType; }
- virtual CachedResourceClientType type() { return expectedType(); }
+ virtual CachedResourceClientType resourceClientType() { return expectedType(); }
// Called whenever a frame of an image changes, either because we got more data from the network or
// because we are animating. If not null, the IntRect is the changed rect of the image.
Modified: trunk/Source/WebCore/loader/cache/CachedResourceClient.h (97207 => 97208)
--- trunk/Source/WebCore/loader/cache/CachedResourceClient.h 2011-10-12 01:12:57 UTC (rev 97207)
+++ trunk/Source/WebCore/loader/cache/CachedResourceClient.h 2011-10-12 01:16:36 UTC (rev 97208)
@@ -45,7 +45,7 @@
virtual void notifyFinished(CachedResource*) { }
static CachedResourceClientType expectedType() { return BaseResourceType; }
- virtual CachedResourceClientType type() { return expectedType(); }
+ virtual CachedResourceClientType resourceClientType() { return expectedType(); }
protected:
CachedResourceClient() { }
Modified: trunk/Source/WebCore/loader/cache/CachedResourceClientWalker.h (97207 => 97208)
--- trunk/Source/WebCore/loader/cache/CachedResourceClientWalker.h 2011-10-12 01:12:57 UTC (rev 97207)
+++ trunk/Source/WebCore/loader/cache/CachedResourceClientWalker.h 2011-10-12 01:16:36 UTC (rev 97208)
@@ -50,7 +50,7 @@
size_t size = m_clientVector.size();
while (m_index < size) {
CachedResourceClient* next = m_clientVector[m_index++];
- if (m_clientSet.contains(next) && (T::expectedType() == CachedResourceClient::expectedType() || next->type() == T::expectedType()))
+ if (m_clientSet.contains(next) && (T::expectedType() == CachedResourceClient::expectedType() || next->resourceClientType() == T::expectedType()))
return static_cast<T*>(next);
}
Modified: trunk/Source/WebCore/loader/cache/CachedStyleSheetClient.h (97207 => 97208)
--- trunk/Source/WebCore/loader/cache/CachedStyleSheetClient.h 2011-10-12 01:12:57 UTC (rev 97207)
+++ trunk/Source/WebCore/loader/cache/CachedStyleSheetClient.h 2011-10-12 01:16:36 UTC (rev 97208)
@@ -38,7 +38,7 @@
public:
virtual ~CachedStyleSheetClient() { }
static CachedResourceClientType expectedType() { return StyleSheetType; }
- virtual CachedResourceClientType type() { return expectedType(); }
+ virtual CachedResourceClientType resourceClientType() { return expectedType(); }
virtual void setCSSStyleSheet(const String& /* href */, const KURL& /* baseURL */, const String& /* charset */, const CachedCSSStyleSheet*) { }
virtual void setXSLStyleSheet(const String& /* href */, const KURL& /* baseURL */, const String& /* sheet */) { }
};
Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp (97207 => 97208)
--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2011-10-12 01:12:57 UTC (rev 97207)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2011-10-12 01:16:36 UTC (rev 97208)
@@ -48,7 +48,7 @@
void CachedXSLStyleSheet::didAddClient(CachedResourceClient* c)
{
- if (!isLoading() && c->type() == CachedStyleSheetClient::expectedType())
+ if (!isLoading() && c->resourceClientType() == CachedStyleSheetClient::expectedType())
static_cast<CachedStyleSheetClient*>(c)->setXSLStyleSheet(m_resourceRequest.url(), m_response.url(), m_sheet);
}
