Title: [115805] trunk/Source/WebCore
- Revision
- 115805
- Author
- [email protected]
- Date
- 2012-05-02 02:02:44 -0700 (Wed, 02 May 2012)
Log Message
StyleSheetInternal::parseUserStyleSheet() should be called parseAuthorStyleSheet().
Rubber-stamped by Nikolas Zimmermann.
* css/CSSImportRule.cpp:
(WebCore::StyleRuleImport::setCSSStyleSheet):
* css/CSSStyleSheet.cpp:
(WebCore::StyleSheetInternal::parseAuthorStyleSheet):
* css/CSSStyleSheet.h:
(StyleSheetInternal):
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::setCSSStyleSheet):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (115804 => 115805)
--- trunk/Source/WebCore/ChangeLog 2012-05-02 08:51:50 UTC (rev 115804)
+++ trunk/Source/WebCore/ChangeLog 2012-05-02 09:02:44 UTC (rev 115805)
@@ -1,3 +1,18 @@
+2012-05-02 Antti Koivisto <[email protected]>
+
+ StyleSheetInternal::parseUserStyleSheet() should be called parseAuthorStyleSheet().
+
+ Rubber-stamped by Nikolas Zimmermann.
+
+ * css/CSSImportRule.cpp:
+ (WebCore::StyleRuleImport::setCSSStyleSheet):
+ * css/CSSStyleSheet.cpp:
+ (WebCore::StyleSheetInternal::parseAuthorStyleSheet):
+ * css/CSSStyleSheet.h:
+ (StyleSheetInternal):
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::setCSSStyleSheet):
+
2012-05-02 Yury Semikhatsky <[email protected]>
REGRESSION: Web Inspector doesn't show cookies anymore
Modified: trunk/Source/WebCore/css/CSSImportRule.cpp (115804 => 115805)
--- trunk/Source/WebCore/css/CSSImportRule.cpp 2012-05-02 08:51:50 UTC (rev 115804)
+++ trunk/Source/WebCore/css/CSSImportRule.cpp 2012-05-02 09:02:44 UTC (rev 115805)
@@ -72,7 +72,7 @@
m_styleSheet = StyleSheetInternal::create(this, href, baseURL, context);
Document* document = m_parentStyleSheet ? m_parentStyleSheet->singleOwnerDocument() : 0;
- m_styleSheet->parseUserStyleSheet(cachedStyleSheet, document ? document->securityOrigin() : 0);
+ m_styleSheet->parseAuthorStyleSheet(cachedStyleSheet, document ? document->securityOrigin() : 0);
m_loading = false;
Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (115804 => 115805)
--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2012-05-02 08:51:50 UTC (rev 115804)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2012-05-02 09:02:44 UTC (rev 115805)
@@ -302,7 +302,7 @@
return it->second;
}
-void StyleSheetInternal::parseUserStyleSheet(const CachedCSSStyleSheet* cachedStyleSheet, const SecurityOrigin* securityOrigin)
+void StyleSheetInternal::parseAuthorStyleSheet(const CachedCSSStyleSheet* cachedStyleSheet, const SecurityOrigin* securityOrigin)
{
// Check to see if we should enforce the MIME type of the CSS resource in strict mode.
// Running in iWeb 2 is one example of where we don't want to - <rdar://problem/6099748>
Modified: trunk/Source/WebCore/css/CSSStyleSheet.h (115804 => 115805)
--- trunk/Source/WebCore/css/CSSStyleSheet.h 2012-05-02 08:51:50 UTC (rev 115804)
+++ trunk/Source/WebCore/css/CSSStyleSheet.h 2012-05-02 09:02:44 UTC (rev 115805)
@@ -67,7 +67,7 @@
void styleSheetChanged();
- void parseUserStyleSheet(const CachedCSSStyleSheet*, const SecurityOrigin*);
+ void parseAuthorStyleSheet(const CachedCSSStyleSheet*, const SecurityOrigin*);
bool parseString(const String&);
bool parseStringAtLine(const String&, int startLineNumber);
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (115804 => 115805)
--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2012-05-02 08:51:50 UTC (rev 115804)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2012-05-02 09:02:44 UTC (rev 115805)
@@ -317,7 +317,7 @@
RefPtr<StyleSheetInternal> styleSheet = StyleSheetInternal::create(href, baseURL, parserContext);
m_sheet = CSSStyleSheet::create(styleSheet, this);
- styleSheet->parseUserStyleSheet(cachedStyleSheet, document()->securityOrigin());
+ styleSheet->parseAuthorStyleSheet(cachedStyleSheet, document()->securityOrigin());
RefPtr<MediaQuerySet> media = MediaQuerySet::createAllowingDescriptionSyntax(m_media);
styleSheet->setMediaQueries(media.release());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
