Title: [98106] trunk/Source/WebCore
- Revision
- 98106
- Author
- [email protected]
- Date
- 2011-10-21 10:04:39 -0700 (Fri, 21 Oct 2011)
Log Message
Style and Link elements' sheet() should return CSSStyleSheet.
https://bugs.webkit.org/show_bug.cgi?id=70608
Patch by Andreas Kling <[email protected]> on 2011-10-21
Reviewed by Antti Koivisto.
Return a CSSStyleSheet* instead of a StyleSheet* in these functions
since we know they are always CSSStyleSheets.
Also remove some now-unnecessary isCSSStyleSheet() checks.
* dom/StyleElement.h:
(WebCore::StyleElement::sheet):
* html/HTMLLinkElement.cpp:
* html/HTMLLinkElement.h:
(WebCore::HTMLLinkElement::sheet):
* page/PageSerializer.cpp:
(WebCore::PageSerializer::serializeFrame):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98105 => 98106)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 16:58:58 UTC (rev 98105)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 17:04:39 UTC (rev 98106)
@@ -1,3 +1,22 @@
+2011-10-21 Andreas Kling <[email protected]>
+
+ Style and Link elements' sheet() should return CSSStyleSheet.
+ https://bugs.webkit.org/show_bug.cgi?id=70608
+
+ Reviewed by Antti Koivisto.
+
+ Return a CSSStyleSheet* instead of a StyleSheet* in these functions
+ since we know they are always CSSStyleSheets.
+ Also remove some now-unnecessary isCSSStyleSheet() checks.
+
+ * dom/StyleElement.h:
+ (WebCore::StyleElement::sheet):
+ * html/HTMLLinkElement.cpp:
+ * html/HTMLLinkElement.h:
+ (WebCore::HTMLLinkElement::sheet):
+ * page/PageSerializer.cpp:
+ (WebCore::PageSerializer::serializeFrame):
+
2011-10-21 Vsevolod Vlasov <[email protected]>
Web Inspector: Advanced search is working very slowly and does not show searching progress.
Modified: trunk/Source/WebCore/dom/StyleElement.h (98105 => 98106)
--- trunk/Source/WebCore/dom/StyleElement.h 2011-10-21 16:58:58 UTC (rev 98105)
+++ trunk/Source/WebCore/dom/StyleElement.h 2011-10-21 17:04:39 UTC (rev 98106)
@@ -37,7 +37,7 @@
virtual const AtomicString& type() const = 0;
virtual const AtomicString& media() const = 0;
- StyleSheet* sheet() const { return m_sheet.get(); }
+ CSSStyleSheet* sheet() const { return m_sheet.get(); }
bool isLoading() const;
bool sheetLoaded(Document*);
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (98105 => 98106)
--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2011-10-21 16:58:58 UTC (rev 98105)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2011-10-21 17:04:39 UTC (rev 98106)
@@ -119,11 +119,6 @@
}
}
-StyleSheet* HTMLLinkElement::sheet() const
-{
- return m_sheet.get();
-}
-
void HTMLLinkElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == relAttr) {
Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (98105 => 98106)
--- trunk/Source/WebCore/html/HTMLLinkElement.h 2011-10-21 16:58:58 UTC (rev 98105)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h 2011-10-21 17:04:39 UTC (rev 98106)
@@ -51,7 +51,7 @@
String type() const;
- StyleSheet* sheet() const;
+ CSSStyleSheet* sheet() const { return m_sheet.get(); }
// FIXME: This should be renamed isStyleSheetLoading as this is only used for stylesheets.
bool isLoading() const;
Modified: trunk/Source/WebCore/page/PageSerializer.cpp (98105 => 98106)
--- trunk/Source/WebCore/page/PageSerializer.cpp 2011-10-21 16:58:58 UTC (rev 98105)
+++ trunk/Source/WebCore/page/PageSerializer.cpp 2011-10-21 17:04:39 UTC (rev 98106)
@@ -234,17 +234,15 @@
addImageToResources(cachedImage, imageElement->renderer(), url);
} else if (element->hasTagName(HTMLNames::linkTag)) {
HTMLLinkElement* linkElement = static_cast<HTMLLinkElement*>(element);
- StyleSheet* sheet = linkElement->sheet();
- if (sheet && sheet->isCSSStyleSheet()) {
+ if (CSSStyleSheet* sheet = linkElement->sheet()) {
KURL url = ""
- serializeCSSStyleSheet(static_cast<CSSStyleSheet*>(sheet), url);
+ serializeCSSStyleSheet(sheet, url);
ASSERT(m_resourceURLs.contains(url));
}
} else if (element->hasTagName(HTMLNames::styleTag)) {
HTMLStyleElement* styleElement = static_cast<HTMLStyleElement*>(element);
- StyleSheet* sheet = styleElement->sheet();
- if (sheet && sheet->isCSSStyleSheet())
- serializeCSSStyleSheet(static_cast<CSSStyleSheet*>(sheet), KURL());
+ if (CSSStyleSheet* sheet = styleElement->sheet())
+ serializeCSSStyleSheet(sheet, KURL());
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
