Move all style invalidation code into the css/invalidation directory.

Also rename StyleInvalidationAnalysis to StyleSheetInvalidationAnalysis, to distinguish from StyleInvalidator.

BUG=
R=ojan@chromium.org, rune@opera.com

Review URL: https://codereview.chromium.org/199633020

git-svn-id: svn://svn.chromium.org/blink/trunk@169990 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/core.gypi

@@ -834,10 +834,6 @@
             'css/SelectorFilter.h',
             'css/SiblingTraversalStrategies.h',
             'css/StyleColor.h',
-            'css/StyleInvalidationAnalysis.cpp',
-            'css/StyleInvalidationAnalysis.h',
-            'css/invalidation/StyleInvalidator.cpp',
-            'css/invalidation/StyleInvalidator.h',
             'css/StyleMedia.cpp',
             'css/StyleMedia.h',
             'css/StylePropertySerializer.cpp',
@@ -857,8 +853,12 @@
             'css/StyleSheetList.h',
             'css/TreeBoundaryCrossingRules.cpp',
             'css/TreeBoundaryCrossingRules.h',
-            'css/analyzer/DescendantInvalidationSet.h',
-            'css/analyzer/DescendantInvalidationSet.cpp',
+            'css/invalidation/DescendantInvalidationSet.h',
+            'css/invalidation/DescendantInvalidationSet.cpp',
+            'css/invalidation/StyleSheetInvalidationAnalysis.cpp',
+            'css/invalidation/StyleSheetInvalidationAnalysis.h',
+            'css/invalidation/StyleInvalidator.cpp',
+            'css/invalidation/StyleInvalidator.h',
             'css/resolver/AnimatedStyleBuilder.cpp',
             'css/resolver/AnimatedStyleBuilder.h',
             'css/resolver/CSSToStyleMap.cpp',
@@ -3299,7 +3299,7 @@
             'css/HoverUpdateTest.cpp',
             'css/RuleSetTest.cpp',
             'css/MediaQuerySetTest.cpp',
-            'css/analyzer/DescendantInvalidationSetTest.cpp',
+            'css/invalidation/DescendantInvalidationSetTest.cpp',
             'css/resolver/FontBuilderTest.cpp',
             'dom/ActiveDOMObjectTest.cpp',
             'dom/DOMImplementationTest.cpp',

third_party/WebKit/Source/core/css/RuleFeature.h

@@ -22,7 +22,7 @@
 #ifndef RuleFeature_h
 #define RuleFeature_h
 
-#include "core/css/analyzer/DescendantInvalidationSet.h"
+#include "core/css/invalidation/DescendantInvalidationSet.h"
 #include "wtf/Forward.h"
 #include "wtf/HashSet.h"
 #include "wtf/text/AtomicStringHash.h"

third_party/WebKit/Source/core/css/analyzer/DescendantInvalidationSet.cpp → third_party/WebKit/Source/core/css/invalidation/DescendantInvalidationSet.cpp

@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#include "core/css/analyzer/DescendantInvalidationSet.h"
+#include "core/css/invalidation/DescendantInvalidationSet.h"
 
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Element.h"

third_party/WebKit/Source/core/css/analyzer/DescendantInvalidationSetTest.cpp → third_party/WebKit/Source/core/css/invalidation/DescendantInvalidationSetTest.cpp

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "config.h"
-#include "core/css/analyzer/DescendantInvalidationSet.h"
+#include "core/css/invalidation/DescendantInvalidationSet.h"
 
 #include <gtest/gtest.h>
 

third_party/WebKit/Source/core/css/StyleInvalidationAnalysis.cpp → third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "core/css/StyleInvalidationAnalysis.h"
+#include "core/css/invalidation/StyleSheetInvalidationAnalysis.h"
 
 #include "core/css/CSSSelectorList.h"
 #include "core/css/StyleRuleImport.h"
@@ -37,7 +37,7 @@
 
 namespace WebCore {
 
-StyleInvalidationAnalysis::StyleInvalidationAnalysis(const WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents> >& sheets)
+StyleSheetInvalidationAnalysis::StyleSheetInvalidationAnalysis(const WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents> >& sheets)
     : m_dirtiesAllStyle(false)
 {
     for (unsigned i = 0; i < sheets.size() && !m_dirtiesAllStyle; ++i)
@@ -141,7 +141,7 @@ static bool ruleAdditionMightRequireDocumentStyleRecalc(StyleRuleBase* rule)
     return true;
 }
 
-void StyleInvalidationAnalysis::analyzeStyleSheet(StyleSheetContents* styleSheetContents)
+void StyleSheetInvalidationAnalysis::analyzeStyleSheet(StyleSheetContents* styleSheetContents)
 {
     ASSERT(!styleSheetContents->isLoading());
 
@@ -195,7 +195,7 @@ static bool elementMatchesSelectorScopes(const Element* element, const HashSet<S
     return false;
 }
 
-void StyleInvalidationAnalysis::invalidateStyle(Document& document)
+void StyleSheetInvalidationAnalysis::invalidateStyle(Document& document)
 {
     ASSERT(!m_dirtiesAllStyle);
 

third_party/WebKit/Source/core/css/StyleInvalidationAnalysis.h → third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.h

@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef StyleInvalidationAnalysis_h
-#define StyleInvalidationAnalysis_h
+#ifndef StyleSheetInvalidationAnalysis_h
+#define StyleSheetInvalidationAnalysis_h
 
 #include "heap/Handle.h"
 #include "wtf/HashSet.h"
@@ -37,9 +37,9 @@ class Document;
 class Node;
 class StyleSheetContents;
 
-class StyleInvalidationAnalysis {
+class StyleSheetInvalidationAnalysis {
 public:
-    StyleInvalidationAnalysis(const WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents> >&);
+    StyleSheetInvalidationAnalysis(const WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents> >&);
 
     bool dirtiesAllStyle() const { return m_dirtiesAllStyle; }
     void invalidateStyle(Document&);

third_party/WebKit/Source/core/dom/StyleEngine.cpp

@@ -33,7 +33,6 @@
 #include "core/css/CSSFontSelector.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/FontFaceCache.h"
-#include "core/css/StyleInvalidationAnalysis.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/DocumentStyleSheetCollector.h"
 #include "core/dom/Element.h"

third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp

@@ -28,9 +28,9 @@
 #include "core/dom/TreeScopeStyleSheetCollection.h"
 
 #include "core/css/CSSStyleSheet.h"
-#include "core/css/StyleInvalidationAnalysis.h"
 #include "core/css/StyleRuleImport.h"
 #include "core/css/StyleSheetContents.h"
+#include "core/css/invalidation/StyleSheetInvalidationAnalysis.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Element.h"
 #include "core/dom/StyleEngine.h"
@@ -161,7 +161,7 @@ void TreeScopeStyleSheetCollection::analyzeStyleSheetChange(StyleResolverUpdateM
     }
 
     // FIXME: If styleResolverUpdateType is Reconstruct, we should return early here since
-    // we need to recalc the whole document. It's wrong to use StyleInvalidationAnalysis since
+    // we need to recalc the whole document. It's wrong to use StyleSheetInvalidationAnalysis since
     // it only looks at the addedSheets.
 
     // No point in doing the analysis work if we're just going to recalc the whole document anyways.
@@ -173,7 +173,7 @@ void TreeScopeStyleSheetCollection::analyzeStyleSheetChange(StyleResolverUpdateM
     // If we are already parsing the body and so may have significant amount of elements, put some effort into trying to avoid style recalcs.
     if (!document().body() || document().hasNodesWithPlaceholderStyle())
         return;
-    StyleInvalidationAnalysis invalidationAnalysis(addedSheets);
+    StyleSheetInvalidationAnalysis invalidationAnalysis(addedSheets);
     if (invalidationAnalysis.dirtiesAllStyle())
         return;
     invalidationAnalysis.invalidateStyle(document());