Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Issue 11412177: Merge 135316 - When calling DocumentStyleSheetCollection::addUserSheet, pass in a user sheet (Closed)

Created:
8 years ago by tony
Modified:
8 years ago
Reviewers:
tony
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Visibility:
Public.

Description

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=tony@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=135774

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+37 lines, -2 lines) Patch
M Source/WebCore/ChangeLog View 1 chunk +18 lines, -0 lines 0 comments Download
M Source/WebCore/dom/DocumentStyleSheetCollection.cpp View 1 chunk +1 line, -0 lines 0 comments Download
M Source/WebKit/chromium/ChangeLog View 1 chunk +15 lines, -0 lines 0 comments Download
M Source/WebKit/chromium/src/WebDocument.cpp View 1 chunk +3 lines, -2 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
tony
8 years ago (2012-11-26 23:00:51 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698