Source/WebCore/ChangeLog

Index: Source/WebCore/ChangeLog
===================================================================
--- Source/WebCore/ChangeLog	(revision 135771)
+++ Source/WebCore/ChangeLog	(working copy)
@@ -1,3 +1,50 @@
+2012-11-18  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r129644): User StyleSheet not applying
+        https://bugs.webkit.org/show_bug.cgi?id=102110
+
+        Reviewed by Andreas Kling.
+
+        Injected stylesheets added as UserStyleAuthorLevel fail to apply. r129644 implicitly assumed that
+        such things don't exists but on Chromium addUserStyleSheet() confusingly uses them.
+        
+        The patch adds injected author stylesheets to DocumentStyleSheetCollection::activeStyleSheets().
+        It also generally cleans up the code around injected and user stylesheets.
+
+        Tests: userscripts/user-script-and-stylesheet.html
+               userscripts/user-stylesheet-invalidate.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::StyleResolver):
+        (WebCore::StyleResolver::collectRulesFromUserStyleSheets):
+        (WebCore::collectCSSOMWrappers):
+        * css/StyleResolver.h:
+        (StyleResolver):
+        * dom/Document.cpp:
+        (WebCore::Document::setCompatibilityMode):
+        * dom/DocumentStyleSheetCollection.cpp:
+        (WebCore::DocumentStyleSheetCollection::DocumentStyleSheetCollection):
+        (WebCore::DocumentStyleSheetCollection::~DocumentStyleSheetCollection):
+        (WebCore::DocumentStyleSheetCollection::injectedUserStyleSheets):
+        (WebCore):
+        (WebCore::DocumentStyleSheetCollection::injectedAuthorStyleSheets):
+        (WebCore::DocumentStyleSheetCollection::updateInjectedStyleSheetCache):
+        (WebCore::DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache):
+        (WebCore::DocumentStyleSheetCollection::addUserSheet):
+        (WebCore::DocumentStyleSheetCollection::updateActiveStyleSheets):
+        (WebCore::DocumentStyleSheetCollection::reportMemoryUsage):
+        * dom/DocumentStyleSheetCollection.h:
+        (WebCore::DocumentStyleSheetCollection::documentUserStyleSheets):
+        (DocumentStyleSheetCollection):
+        * page/PageGroup.cpp:
+        (WebCore::PageGroup::addUserStyleSheetToWorld):
+        (WebCore::PageGroup::removeUserStyleSheetFromWorld):
+        (WebCore::PageGroup::removeUserStyleSheetsFromWorld):
+        (WebCore::PageGroup::removeAllUserContent):
+        (WebCore::PageGroup::invalidatedInjectedStyleSheetCacheInAllFrames):
+        * page/PageGroup.h:
+        (PageGroup):
+
 2012-11-14  Nico Weber  <thakis@chromium.org>
 
         [chromium/mac] Fix drawing of buttons, checkboxes, radio boxes, and steppers when the page is scaled