Merge 135082 - REGRESSION(r129644): User StyleSheet not applying

Source/WebCore/page/PageGroup.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 283 matching lines @@
 
     OwnPtr<UserStyleSheet> userStyleSheet = adoptPtr(new UserStyleSheet(source, url, whitelist, blacklist, injectedFrames, level));
     if (!m_userStyleSheets)
         m_userStyleSheets = adoptPtr(new UserStyleSheetMap);
     OwnPtr<UserStyleSheetVector>& styleSheetsInWorld = m_userStyleSheets->add(world, nullptr).iterator->value;
     if (!styleSheetsInWorld)
         styleSheetsInWorld = adoptPtr(new UserStyleSheetVector);
     styleSheetsInWorld->append(userStyleSheet.release());
 
     if (injectionTime == InjectInExistingDocuments)
-        resetUserStyleCacheInAllFrames();
+        invalidatedInjectedStyleSheetCacheInAllFrames();
 }
 
 void PageGroup::removeUserScriptFromWorld(DOMWrapperWorld* world, const KURL& url)
 {
     ASSERT_ARG(world, world);
 
     if (!m_userScripts)
         return;
 
     UserScriptMap::iterator it = m_userScripts->find(world);
@@ skipping 29 matching lines @@
             sheetsChanged = true;
         }
     }
         
     if (!sheetsChanged)
         return;
 
     if (stylesheets->isEmpty())
         m_userStyleSheets->remove(it);
 
-    resetUserStyleCacheInAllFrames();
+    invalidatedInjectedStyleSheetCacheInAllFrames();
 }
 
 void PageGroup::removeUserScriptsFromWorld(DOMWrapperWorld* world)
 {
     ASSERT_ARG(world, world);
 
     if (!m_userScripts)
         return;
 
     UserScriptMap::iterator it = m_userScripts->find(world);
     if (it == m_userScripts->end())
         return;
        
     m_userScripts->remove(it);
 }
 
 void PageGroup::removeUserStyleSheetsFromWorld(DOMWrapperWorld* world)
 {
     ASSERT_ARG(world, world);
 
     if (!m_userStyleSheets)
         return;
     
     UserStyleSheetMap::iterator it = m_userStyleSheets->find(world);
     if (it == m_userStyleSheets->end())
         return;
     
     m_userStyleSheets->remove(it);
 
-    resetUserStyleCacheInAllFrames();
+    invalidatedInjectedStyleSheetCacheInAllFrames();
 }
 
 void PageGroup::removeAllUserContent()
 {
     m_userScripts.clear();
 
     if (m_userStyleSheets) {
         m_userStyleSheets.clear();
-        resetUserStyleCacheInAllFrames();
+        invalidatedInjectedStyleSheetCacheInAllFrames();
     }
 }
 
-void PageGroup::resetUserStyleCacheInAllFrames()
+void PageGroup::invalidatedInjectedStyleSheetCacheInAllFrames()
 {
     // Clear our cached sheets and have them just reparse.
     HashSet<Page*>::const_iterator end = m_pages.end();
     for (HashSet<Page*>::const_iterator it = m_pages.begin(); it != end; ++it) {
         for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext())
-            frame->document()->styleSheetCollection()->updatePageGroupUserSheets();
+            frame->document()->styleSheetCollection()->invalidateInjectedStyleSheetCache();
     }
 }
 
 #if ENABLE(VIDEO_TRACK)
 CaptionUserPreferences* PageGroup::captionPreferences()
 {
     if (!m_captionPreferences)
 #if PLATFORM(MAC)
         m_captionPreferences = CaptionUserPreferencesMac::create(this);
 #else
@@ skipping 26 matching lines @@
 }
 
 float PageGroup::captionFontSizeScale()
 {
     return captionPreferences()->captionFontSizeScale();
 }
 
 #endif
 
 } // namespace WebCore