Changeset 194584 in webkit

Timestamp:

Jan 5, 2016 8:10:25 AM (8 years ago)

Author:

Antti Koivisto

Message:

Move StyleChange enum into a separate file
​https://bugs.webkit.org/show_bug.cgi?id=152730

Reviewed by Andreas Kling.

Fewer whole-world rebuilds.

• CMakeLists.txt:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.xcodeproj/project.pbxproj:
• dom/CharacterData.cpp:
• dom/ContainerNode.cpp:
• dom/Document.cpp:
• dom/Document.h:
• dom/Element.cpp:
• dom/Element.h:
• style/StyleChange.h: Added.
• style/StyleResolveTree.cpp:

(WebCore::Style::shouldCreateRenderer):
(WebCore::Style::determineChange): Deleted.

• style/StyleResolveTree.h:

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCore.vcxproj/WebCore.vcxproj (modified) (2 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• dom/CharacterData.cpp (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• html/HTMLFormControlElement.cpp (modified) (1 diff)
• html/HTMLFrameOwnerElement.cpp (modified) (1 diff)
• html/HTMLPlugInImageElement.cpp (modified) (1 diff)
• mathml/MathMLSelectElement.cpp (modified) (1 diff)
• style/StyleChange.cpp (added)
• style/StyleChange.h (added)
• style/StyleResolveTree.cpp (modified) (1 diff)
• style/StyleResolveTree.h (modified) (3 diffs)

trunk/Source/WebCore/CMakeLists.txt

@@ -2604 +2604 @@
     style/InlineTextBoxStyle.cpp
     style/RenderTreePosition.cpp
+    style/StyleChange.cpp
     style/StyleFontSizeFunctions.cpp
     style/StyleResolveForDocument.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-05  Antti Koivisto  <antti@apple.com>
+
+        Move StyleChange enum into a separate file
+        https://bugs.webkit.org/show_bug.cgi?id=152730
+
+        Reviewed by Andreas Kling.
+
+        Fewer whole-world rebuilds.
+
+        * CMakeLists.txt:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/CharacterData.cpp:
+        * dom/ContainerNode.cpp:
+        * dom/Document.cpp:
+        * dom/Document.h:
+        * dom/Element.cpp:
+        * dom/Element.h:
+        * style/StyleChange.h: Added.
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::shouldCreateRenderer):
+        (WebCore::Style::determineChange): Deleted.
+        * style/StyleResolveTree.h:
+
 2016-01-04  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -19200 +19200 @@
     <ClCompile Include="..\style\InlineTextBoxStyle.cpp" />
     <ClCompile Include="..\style\RenderTreePosition.cpp" />
+    <ClCompile Include="..\style\StyleChange.cpp" />
     <ClCompile Include="..\style\StyleFontSizeFunctions.cpp" />
     <ClCompile Include="..\style\StyleResolveForDocument.cpp" />
@@ -22763 +22764 @@
     <ClInclude Include="..\style\InlineTextBoxStyle.h" />
     <ClInclude Include="..\style\RenderTreePosition.h" />
+    <ClInclude Include="..\style\StyleChange.h" />
     <ClInclude Include="..\style\StyleFontSizeFunctions.h" />
     <ClInclude Include="..\style\StyleResolveForDocument.h" />

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -6462 +6462 @@
                 E38838991BAD145F00D62EE3 /* JSModuleLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E38838951BAD145F00D62EE3 /* JSModuleLoader.h */; };
                 E401C27517CE53EC00C41A35 /* ElementIteratorAssertions.h in Headers */ = {isa = PBXBuildFile; fileRef = E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                E401E0A41C3C0B8300F34D10 /* StyleChange.h in Headers */ = {isa = PBXBuildFile; fileRef = E401E0A31C3C0B8300F34D10 /* StyleChange.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                E401E0A61C3C0CF700F34D10 /* StyleChange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E401E0A51C3C0CF700F34D10 /* StyleChange.cpp */; };
                 E424A39E1330DF0100CF6DC9 /* LegacyTileGridTile.h in Headers */ = {isa = PBXBuildFile; fileRef = E424A39D1330DF0100CF6DC9 /* LegacyTileGridTile.h */; };
                 E424A3A01330DF1E00CF6DC9 /* LegacyTileGridTile.mm in Sources */ = {isa = PBXBuildFile; fileRef = E424A39F1330DF1E00CF6DC9 /* LegacyTileGridTile.mm */; };
@@ -14365 +14367 @@
                 E38838951BAD145F00D62EE3 /* JSModuleLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSModuleLoader.h; sourceTree = "<group>"; };
                 E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementIteratorAssertions.h; sourceTree = "<group>"; };
+                E401E0A31C3C0B8300F34D10 /* StyleChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleChange.h; sourceTree = "<group>"; };
+                E401E0A51C3C0CF700F34D10 /* StyleChange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleChange.cpp; sourceTree = "<group>"; };
                 E406F3FB1198307D009D59D6 /* ColorData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorData.cpp; sourceTree = "<group>"; };
                 E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSPropertyNames.cpp; sourceTree = "<group>"; };
@@ -23111 +23115 @@
                                 5824ABA81AE849C8009074B7 /* RenderTreePosition.cpp */,
                                 5824ABA91AE849C8009074B7 /* RenderTreePosition.h */,
+                                E401E0A51C3C0CF700F34D10 /* StyleChange.cpp */,
+                                E401E0A31C3C0B8300F34D10 /* StyleChange.h */,
                                 E4D58EB617B4ED8900CBDCA8 /* StyleFontSizeFunctions.cpp */,
                                 E4D58EB717B4ED8900CBDCA8 /* StyleFontSizeFunctions.h */,
@@ -28013 +28019 @@
                                 FE0D84E910484348001A179E /* WebEvent.h in Headers */,
                                 225A16B50D5C11E900090295 /* WebEventRegion.h in Headers */,
+                                E401E0A41C3C0B8300F34D10 /* StyleChange.h in Headers */,
                                 A19D93471A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h in Headers */,
                                 D3F3D36E1A69B7E00059FC2B /* WebGL2RenderingContext.h in Headers */,
@@ -29052 +29059 @@
                                 85ACAA8E0A9B759C00671E90 /* DOMNodeList.mm in Sources */,
                                 856C8AE50A912649005C687B /* DOMObject.mm in Sources */,
+                                E401E0A61C3C0CF700F34D10 /* StyleChange.cpp in Sources */,
                                 85C7F5D10AAFB8D9004014DD /* DOMOverflowEvent.mm in Sources */,
                                 E1284BD51044A01E00EAEB52 /* DOMPageTransitionEvent.mm in Sources */,

trunk/Source/WebCore/dom/CharacterData.cpp

@@ -33 +33 @@
 #include "RenderText.h"
 #include "StyleInheritedData.h"
+#include "StyleResolveTree.h"
 #include "TextBreakIterator.h"
 #include <wtf/Ref.h>

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -55 +55 @@
 #include "SVGNames.h"
 #include "SelectorQuery.h"
+#include "StyleResolveTree.h"
 #include "TemplateContentDocumentFragment.h"
 #include <algorithm>

trunk/Source/WebCore/dom/Document.cpp

@@ -155 +155 @@
 #include "StorageEvent.h"
 #include "StyleProperties.h"
+#include "StyleResolveTree.h"
 #include "StyleResolver.h"
 #include "StyleSheetContents.h"

trunk/Source/WebCore/dom/Document.h

@@ -46 +46 @@
 #include "ScriptExecutionContext.h"
 #include "StringWithDirection.h"
-#include "StyleResolveTree.h"
+#include "StyleChange.h"
 #include "TextResourceDecoder.h"
 #include "Timer.h"

trunk/Source/WebCore/dom/Element.cpp

@@ -78 +78 @@
 #include "Settings.h"
 #include "StyleProperties.h"
+#include "StyleResolveTree.h"
 #include "StyleResolver.h"
 #include "TextIterator.h"

trunk/Source/WebCore/dom/Element.h

@@ -33 +33 @@
 #include "ScrollTypes.h"
 #include "SimulatedClickOptions.h"
-#include "StyleResolveTree.h"
+#include "StyleChange.h"
 
 namespace WebCore {

trunk/Source/WebCore/html/HTMLFormControlElement.cpp

@@ -39 +39 @@
 #include "RenderBox.h"
 #include "RenderTheme.h"
+#include "StyleResolveTree.h"
 #include "ValidationMessage.h"
 #include <wtf/NeverDestroyed.h>

trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp

@@ -29 +29 @@
 #include "ShadowRoot.h"
 #include "SVGDocument.h"
+#include "StyleResolveTree.h"
 #include <wtf/Ref.h>
 

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -49 +49 @@
 #include "Settings.h"
 #include "ShadowRoot.h"
+#include "StyleResolveTree.h"
 #include "StyleResolver.h"
 #include "SubframeLoader.h"

trunk/Source/WebCore/mathml/MathMLSelectElement.cpp

@@ -36 +36 @@
 #include "SVGElement.h"
 #include "SVGNames.h"
+#include "StyleResolveTree.h"
 
 namespace WebCore {

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -71 +71 @@
 static void resolveTree(Element&, RenderStyle& inheritedStyle, RenderTreePosition&, Change);
 
-Change determineChange(const RenderStyle& s1, const RenderStyle& s2)
-{
-    if (s1.display() != s2.display())
-        return Detach;
-    if (s1.hasPseudoStyle(FIRST_LETTER) != s2.hasPseudoStyle(FIRST_LETTER))
-        return Detach;
-    // We just detach if a renderer acquires or loses a column-span, since spanning elements
-    // typically won't contain much content.
-    if (s1.columnSpan() != s2.columnSpan())
-        return Detach;
-    if (!s1.contentDataEquivalent(&s2))
-        return Detach;
-    // When text-combine property has been changed, we need to prepare a separate renderer object.
-    // When text-combine is on, we use RenderCombineText, otherwise RenderText.
-    // https://bugs.webkit.org/show_bug.cgi?id=55069
-    if (s1.hasTextCombine() != s2.hasTextCombine())
-        return Detach;
-    // We need to reattach the node, so that it is moved to the correct RenderFlowThread.
-    if (s1.flowThread() != s2.flowThread())
-        return Detach;
-    // When the region thread has changed, we need to prepare a separate render region object.
-    if (s1.regionThread() != s2.regionThread())
-        return Detach;
-    // FIXME: Multicolumn regions not yet supported (http://dev.w3.org/csswg/css-regions/#multi-column-regions)
-    // When the node has region style and changed its multicol style, we have to prepare
-    // a separate render region object.
-    if (s1.hasFlowFrom() && (s1.specifiesColumns() != s2.specifiesColumns()))
-        return Detach;
-
-    if (s1 != s2) {
-        if (s1.inheritedNotEqual(&s2))
-            return Inherit;
-        if (s1.hasExplicitlyInheritedProperties() || s2.hasExplicitlyInheritedProperties())
-            return Inherit;
-
-        return NoInherit;
-    }
-    // If the pseudoStyles have changed, we want any StyleChange that is not NoChange
-    // because setStyle will do the right thing with anything else.
-    if (s1.hasAnyPublicPseudoStyles()) {
-        for (PseudoId pseudoId = FIRST_PUBLIC_PSEUDOID; pseudoId < FIRST_INTERNAL_PSEUDOID; pseudoId = static_cast<PseudoId>(pseudoId + 1)) {
-            if (s1.hasPseudoStyle(pseudoId)) {
-                RenderStyle* ps2 = s2.getCachedPseudoStyle(pseudoId);
-                if (!ps2)
-                    return NoInherit;
-                RenderStyle* ps1 = s1.getCachedPseudoStyle(pseudoId);
-                if (!ps1 || *ps1 != *ps2)
-                    return NoInherit;
-            }
-        }
-    }
-
-    return NoChange;
-}
-
 static bool shouldCreateRenderer(const Element& element, const RenderElement& parentRenderer)
 {

trunk/Source/WebCore/style/StyleResolveTree.h

@@ -27 +27 @@
 #define StyleResolveTree_h
 
+#include "StyleChange.h"
 #include <functional>
 
@@ -39 +40 @@
 namespace Style {
 
-enum Change { NoChange, NoInherit, Inherit, Detach, Force };
-
 void resolveTree(Document&, Change);
 
@@ -47 +46 @@
 
 void updateTextRendererAfterContentChange(Text&, unsigned offsetOfReplacedData, unsigned lengthOfReplacedData);
-
-Change determineChange(const RenderStyle&, const RenderStyle&);
 
 void queuePostResolutionCallback(std::function<void ()>);