Title: [105052] trunk/Source/WebCore
- Revision
- 105052
- Author
- [email protected]
- Date
- 2012-01-16 04:05:03 -0800 (Mon, 16 Jan 2012)
Log Message
CSSStyleSelector constructor and appendAuthorStylesheets() contain duplicated code
https://bugs.webkit.org/show_bug.cgi?id=76043
Re-use appendAuthorStylesheets() from within CSSStyleSelector constructor.
Reviewed by Antti Koivisto.
No new tests. (refactoring)
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::CSSStyleSelector):
* css/StyleSheetList.h:
(WebCore::StyleSheetList::vector):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (105051 => 105052)
--- trunk/Source/WebCore/ChangeLog 2012-01-16 11:32:40 UTC (rev 105051)
+++ trunk/Source/WebCore/ChangeLog 2012-01-16 12:05:03 UTC (rev 105052)
@@ -1,3 +1,19 @@
+2012-01-16 Roland Steiner <[email protected]>
+
+ CSSStyleSelector constructor and appendAuthorStylesheets() contain duplicated code
+ https://bugs.webkit.org/show_bug.cgi?id=76043
+
+ Re-use appendAuthorStylesheets() from within CSSStyleSelector constructor.
+
+ Reviewed by Antti Koivisto.
+
+ No new tests. (refactoring)
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::CSSStyleSelector):
+ * css/StyleSheetList.h:
+ (WebCore::StyleSheetList::vector):
+
2012-01-16 Shinya Kawanaka <[email protected]>
[crash] Renderer crashes when spell checking a disabled input field.
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (105051 => 105052)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-01-16 11:32:40 UTC (rev 105051)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-01-16 12:05:03 UTC (rev 105052)
@@ -420,18 +420,7 @@
m_authorStyle->addRulesFromSheet(mappedElementSheet, *m_medium, this);
// add stylesheets from document
- unsigned length = styleSheets->length();
- for (unsigned i = 0; i < length; i++) {
- StyleSheet* sheet = styleSheets->item(i);
- if (sheet->isCSSStyleSheet() && !sheet->disabled())
- m_authorStyle->addRulesFromSheet(static_cast<CSSStyleSheet*>(sheet), *m_medium, this);
- }
- m_authorStyle->shrinkToFit();
-
- collectFeatures();
-
- if (document->renderer() && document->renderer()->style())
- document->renderer()->style()->font().update(fontSelector());
+ appendAuthorStylesheets(0, styleSheets->vector());
}
void CSSStyleSelector::collectFeatures()
Modified: trunk/Source/WebCore/css/StyleSheetList.h (105051 => 105052)
--- trunk/Source/WebCore/css/StyleSheetList.h 2012-01-16 11:32:40 UTC (rev 105051)
+++ trunk/Source/WebCore/css/StyleSheetList.h 2012-01-16 12:05:03 UTC (rev 105052)
@@ -46,6 +46,11 @@
HTMLStyleElement* getNamedItem(const String&) const;
+ const StyleSheetVector& vector() const
+ {
+ return m_sheets;
+ }
+
void swap(StyleSheetVector& sheets)
{
m_sheets.swap(sheets);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
