Title: [135774] branches/chromium/1312/Source
- Revision
- 135774
- Author
- t...@chromium.org
- Date
- 2012-11-26 15:02:49 -0800 (Mon, 26 Nov 2012)
Log Message
Merge 135316 - When calling DocumentStyleSheetCollection::addUserSheet, pass in a user sheet
https://bugs.webkit.org/show_bug.cgi?id=102835
Reviewed by Ojan Vafai.
After r135082, Chromium browser_tests were triggering the ASSERT in
StyleResolver::collectRulesFromUserStyleSheets. Add an ASSERT that will
trigger earlier and make it clear in the Chromium code that we're always
inserting user level styles.
Source/WebCore:
No new tests, no behavior change except no longer triggering the StyleResolver ASSERT
in Chromium browser_tests.
* dom/DocumentStyleSheetCollection.cpp:
(WebCore::DocumentStyleSheetCollection::addUserSheet):
Source/WebKit/chromium:
* src/WebDocument.cpp:
(WebKit::WebDocument::insertUserStyleSheet):
TBR=t...@chromium.org
Review URL: https://codereview.chromium.org/11412177
Modified Paths
Diff
Modified: branches/chromium/1312/Source/WebCore/ChangeLog (135773 => 135774)
--- branches/chromium/1312/Source/WebCore/ChangeLog 2012-11-26 23:01:24 UTC (rev 135773)
+++ branches/chromium/1312/Source/WebCore/ChangeLog 2012-11-26 23:02:49 UTC (rev 135774)
@@ -1,3 +1,21 @@
+2012-11-20 Tony Chang <t...@chromium.org>
+
+ When calling DocumentStyleSheetCollection::addUserSheet, pass in a user sheet
+ https://bugs.webkit.org/show_bug.cgi?id=102835
+
+ Reviewed by Ojan Vafai.
+
+ After r135082, Chromium browser_tests were triggering the ASSERT in
+ StyleResolver::collectRulesFromUserStyleSheets. Add an ASSERT that will
+ trigger earlier and make it clear in the Chromium code that we're always
+ inserting user level styles.
+
+ No new tests, no behavior change except no longer triggering the StyleResolver ASSERT
+ in Chromium browser_tests.
+
+ * dom/DocumentStyleSheetCollection.cpp:
+ (WebCore::DocumentStyleSheetCollection::addUserSheet):
+
2012-11-18 Antti Koivisto <an...@apple.com>
REGRESSION(r129644): User StyleSheet not applying
Modified: branches/chromium/1312/Source/WebCore/dom/DocumentStyleSheetCollection.cpp (135773 => 135774)
--- branches/chromium/1312/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2012-11-26 23:01:24 UTC (rev 135773)
+++ branches/chromium/1312/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2012-11-26 23:02:49 UTC (rev 135774)
@@ -193,6 +193,7 @@
void DocumentStyleSheetCollection::addUserSheet(PassRefPtr<StyleSheetContents> userSheet)
{
+ ASSERT(userSheet->isUserStyleSheet());
m_userStyleSheets.append(CSSStyleSheet::create(userSheet, m_document));
m_document->styleResolverChanged(RecalcStyleImmediately);
}
Modified: branches/chromium/1312/Source/WebKit/chromium/ChangeLog (135773 => 135774)
--- branches/chromium/1312/Source/WebKit/chromium/ChangeLog 2012-11-26 23:01:24 UTC (rev 135773)
+++ branches/chromium/1312/Source/WebKit/chromium/ChangeLog 2012-11-26 23:02:49 UTC (rev 135774)
@@ -1,3 +1,18 @@
+2012-11-20 Tony Chang <t...@chromium.org>
+
+ When calling DocumentStyleSheetCollection::addUserSheet, pass in a user sheet
+ https://bugs.webkit.org/show_bug.cgi?id=102835
+
+ Reviewed by Ojan Vafai.
+
+ After r135082, Chromium browser_tests were triggering the ASSERT in
+ StyleResolver::collectRulesFromUserStyleSheets. Add an ASSERT that will
+ trigger earlier and make it clear in the Chromium code that we're always
+ inserting user level styles.
+
+ * src/WebDocument.cpp:
+ (WebKit::WebDocument::insertUserStyleSheet):
+
2012-11-08 Keishi Hattori <kei...@webkit.org>
WebPagePopupImpl::handleKeyEvent is called after WebPagePopupImpl::close
Modified: branches/chromium/1312/Source/WebKit/chromium/src/WebDocument.cpp (135773 => 135774)
--- branches/chromium/1312/Source/WebKit/chromium/src/WebDocument.cpp 2012-11-26 23:01:24 UTC (rev 135773)
+++ branches/chromium/1312/Source/WebKit/chromium/src/WebDocument.cpp 2012-11-26 23:02:49 UTC (rev 135774)
@@ -194,12 +194,13 @@
return WebDocumentType(constUnwrap<Document>()->doctype());
}
-void WebDocument::insertUserStyleSheet(const WebString& sourceCode, UserStyleLevel level)
+void WebDocument::insertUserStyleSheet(const WebString& sourceCode, UserStyleLevel)
{
RefPtr<Document> document = unwrap<Document>();
+ // FIXME: We currently ignore the passed in UserStyleLevel. http://crbug.com/162096
RefPtr<StyleSheetContents> parsedSheet = StyleSheetContents::create(document.get());
- parsedSheet->setIsUserStyleSheet(level == UserStyleUserLevel);
+ parsedSheet->setIsUserStyleSheet(true);
parsedSheet->parseString(sourceCode);
document->styleSheetCollection()->addUserSheet(parsedSheet.release());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
