<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194584] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194584">194584</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-01-05 08:10:25 -0800 (Tue, 05 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDatacpp">trunk/Source/WebCore/dom/CharacterData.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameOwnerElementcpp">trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLSelectElementcpp">trunk/Source/WebCore/mathml/MathMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreeh">trunk/Source/WebCore/style/StyleResolveTree.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorestyleStyleChangecpp">trunk/Source/WebCore/style/StyleChange.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleChangeh">trunk/Source/WebCore/style/StyleChange.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -2603,6 +2603,7 @@
</span><span class="cx">
</span><span class="cx"> style/InlineTextBoxStyle.cpp
</span><span class="cx"> style/RenderTreePosition.cpp
</span><ins>+ style/StyleChange.cpp
</ins><span class="cx"> style/StyleFontSizeFunctions.cpp
</span><span class="cx"> style/StyleResolveForDocument.cpp
</span><span class="cx"> style/StyleResolveTree.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/ChangeLog 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-01-04 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [PerformanceTiming] Don't expose the restrictedKeyMap() HashMap
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -19199,6 +19199,7 @@
</span><span class="cx"> <ClCompile Include="..\storage\StorageNamespaceProvider.cpp" />
</span><span class="cx"> <ClCompile Include="..\style\InlineTextBoxStyle.cpp" />
</span><span class="cx"> <ClCompile Include="..\style\RenderTreePosition.cpp" />
</span><ins>+ <ClCompile Include="..\style\StyleChange.cpp" />
</ins><span class="cx"> <ClCompile Include="..\style\StyleFontSizeFunctions.cpp" />
</span><span class="cx"> <ClCompile Include="..\style\StyleResolveForDocument.cpp" />
</span><span class="cx"> <ClCompile Include="..\style\StyleResolveTree.cpp" />
</span><span class="lines">@@ -22762,6 +22763,7 @@
</span><span class="cx"> <ClInclude Include="..\storage\StorageNamespaceProvider.h" />
</span><span class="cx"> <ClInclude Include="..\style\InlineTextBoxStyle.h" />
</span><span class="cx"> <ClInclude Include="..\style\RenderTreePosition.h" />
</span><ins>+ <ClInclude Include="..\style\StyleChange.h" />
</ins><span class="cx"> <ClInclude Include="..\style\StyleFontSizeFunctions.h" />
</span><span class="cx"> <ClInclude Include="..\style\StyleResolveForDocument.h" />
</span><span class="cx"> <ClInclude Include="..\style\StyleResolveTree.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -6461,6 +6461,8 @@
</span><span class="cx"> E38838981BAD145F00D62EE3 /* JSModuleLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38838941BAD145F00D62EE3 /* JSModuleLoader.cpp */; };
</span><span class="cx"> E38838991BAD145F00D62EE3 /* JSModuleLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E38838951BAD145F00D62EE3 /* JSModuleLoader.h */; };
</span><span class="cx"> E401C27517CE53EC00C41A35 /* ElementIteratorAssertions.h in Headers */ = {isa = PBXBuildFile; fileRef = E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 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 */; };
</ins><span class="cx"> E424A39E1330DF0100CF6DC9 /* LegacyTileGridTile.h in Headers */ = {isa = PBXBuildFile; fileRef = E424A39D1330DF0100CF6DC9 /* LegacyTileGridTile.h */; };
</span><span class="cx"> E424A3A01330DF1E00CF6DC9 /* LegacyTileGridTile.mm in Sources */ = {isa = PBXBuildFile; fileRef = E424A39F1330DF1E00CF6DC9 /* LegacyTileGridTile.mm */; };
</span><span class="cx"> E425A49A18292B840020CFCF /* CollectionIndexCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E425A49918292B840020CFCF /* CollectionIndexCache.h */; };
</span><span class="lines">@@ -14364,6 +14366,8 @@
</span><span class="cx"> E38838941BAD145F00D62EE3 /* JSModuleLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSModuleLoader.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E38838951BAD145F00D62EE3 /* JSModuleLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSModuleLoader.h; sourceTree = "<group>"; };
</span><span class="cx"> E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementIteratorAssertions.h; sourceTree = "<group>"; };
</span><ins>+ 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>"; };
</ins><span class="cx"> E406F3FB1198307D009D59D6 /* ColorData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSPropertyNames.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSValueKeywords.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -23110,6 +23114,8 @@
</span><span class="cx"> 1C0106FF192594DF008A4201 /* InlineTextBoxStyle.h */,
</span><span class="cx"> 5824ABA81AE849C8009074B7 /* RenderTreePosition.cpp */,
</span><span class="cx"> 5824ABA91AE849C8009074B7 /* RenderTreePosition.h */,
</span><ins>+ E401E0A51C3C0CF700F34D10 /* StyleChange.cpp */,
+ E401E0A31C3C0B8300F34D10 /* StyleChange.h */,
</ins><span class="cx"> E4D58EB617B4ED8900CBDCA8 /* StyleFontSizeFunctions.cpp */,
</span><span class="cx"> E4D58EB717B4ED8900CBDCA8 /* StyleFontSizeFunctions.h */,
</span><span class="cx"> E4D58EB217B4DBDC00CBDCA8 /* StyleResolveForDocument.cpp */,
</span><span class="lines">@@ -28012,6 +28018,7 @@
</span><span class="cx"> A5E616741894581F009ADF50 /* WebDebuggerAgent.h in Headers */,
</span><span class="cx"> FE0D84E910484348001A179E /* WebEvent.h in Headers */,
</span><span class="cx"> 225A16B50D5C11E900090295 /* WebEventRegion.h in Headers */,
</span><ins>+ E401E0A41C3C0B8300F34D10 /* StyleChange.h in Headers */,
</ins><span class="cx"> A19D93471A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h in Headers */,
</span><span class="cx"> D3F3D36E1A69B7E00059FC2B /* WebGL2RenderingContext.h in Headers */,
</span><span class="cx"> A7D20F6D107F438B00A80392 /* WebGLActiveInfo.h in Headers */,
</span><span class="lines">@@ -29051,6 +29058,7 @@
</span><span class="cx"> 85526C380AB0A17E000302EA /* DOMNodeIterator.mm in Sources */,
</span><span class="cx"> 85ACAA8E0A9B759C00671E90 /* DOMNodeList.mm in Sources */,
</span><span class="cx"> 856C8AE50A912649005C687B /* DOMObject.mm in Sources */,
</span><ins>+ E401E0A61C3C0CF700F34D10 /* StyleChange.cpp in Sources */,
</ins><span class="cx"> 85C7F5D10AAFB8D9004014DD /* DOMOverflowEvent.mm in Sources */,
</span><span class="cx"> E1284BD51044A01E00EAEB52 /* DOMPageTransitionEvent.mm in Sources */,
</span><span class="cx"> 1ACE53E70A8D18E70022947D /* DOMParser.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.cpp (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.cpp 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/dom/CharacterData.cpp 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "ProcessingInstruction.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "StyleInheritedData.h"
</span><ins>+#include "StyleResolveTree.h"
</ins><span class="cx"> #include "TextBreakIterator.h"
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SVGNames.h"
</span><span class="cx"> #include "SelectorQuery.h"
</span><ins>+#include "StyleResolveTree.h"
</ins><span class="cx"> #include "TemplateContentDocumentFragment.h"
</span><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -154,6 +154,7 @@
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "StorageEvent.h"
</span><span class="cx"> #include "StyleProperties.h"
</span><ins>+#include "StyleResolveTree.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><span class="cx"> #include "StyleSheetList.h"
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/dom/Document.h 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> #include "RenderPtr.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "StringWithDirection.h"
</span><del>-#include "StyleResolveTree.h"
</del><ins>+#include "StyleChange.h"
</ins><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "TreeScope.h"
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> #include "SelectorQuery.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "StyleProperties.h"
</span><ins>+#include "StyleResolveTree.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "VoidCallback.h"
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/dom/Element.h 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "RegionOversetState.h"
</span><span class="cx"> #include "ScrollTypes.h"
</span><span class="cx"> #include "SimulatedClickOptions.h"
</span><del>-#include "StyleResolveTree.h"
</del><ins>+#include "StyleChange.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "HTMLTextAreaElement.h"
</span><span class="cx"> #include "RenderBox.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><ins>+#include "StyleResolveTree.h"
</ins><span class="cx"> #include "ValidationMessage.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameOwnerElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "RenderWidget.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "SVGDocument.h"
</span><ins>+#include "StyleResolveTree.h"
</ins><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><ins>+#include "StyleResolveTree.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "SubframeLoader.h"
</span><span class="cx"> #include "TypedElementDescendantIterator.h"
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLSelectElement.cpp (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLSelectElement.cpp 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/mathml/MathMLSelectElement.cpp 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "RenderMathMLRow.h"
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SVGNames.h"
</span><ins>+#include "StyleResolveTree.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleChangecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/style/StyleChange.cpp (0 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleChange.cpp (rev 0)
+++ trunk/Source/WebCore/style/StyleChange.cpp 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+/*
+ * Copyright (C) 2013, 2016 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
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "StyleChange.h"
+
+#include "RenderStyle.h"
+
+namespace WebCore {
+namespace Style {
+
+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;
+}
+
+}
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorestyleStyleChangeh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/style/StyleChange.h (0 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleChange.h (rev 0)
+++ trunk/Source/WebCore/style/StyleChange.h 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2013, 2016 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
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef StyleChange_h
+#define StyleChange_h
+
+namespace WebCore {
+
+class RenderStyle;
+
+namespace Style {
+
+enum Change { NoChange, NoInherit, Inherit, Detach, Force };
+
+Change determineChange(const RenderStyle&, const RenderStyle&);
+
+}
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -70,61 +70,6 @@
</span><span class="cx"> static void resolveTextNode(Text&, RenderTreePosition&);
</span><span class="cx"> static void resolveTree(Element&, RenderStyle& inheritedStyle, RenderTreePosition&, Change);
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> static bool shouldCreateRenderer(const Element& element, const RenderElement& parentRenderer)
</span><span class="cx"> {
</span><span class="cx"> if (!element.document().shouldCreateRenderers())
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.h (194583 => 194584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.h 2016-01-05 13:47:55 UTC (rev 194583)
+++ trunk/Source/WebCore/style/StyleResolveTree.h 2016-01-05 16:10:25 UTC (rev 194584)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef StyleResolveTree_h
</span><span class="cx"> #define StyleResolveTree_h
</span><span class="cx">
</span><ins>+#include "StyleChange.h"
</ins><span class="cx"> #include <functional>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -38,8 +39,6 @@
</span><span class="cx">
</span><span class="cx"> namespace Style {
</span><span class="cx">
</span><del>-enum Change { NoChange, NoInherit, Inherit, Detach, Force };
-
</del><span class="cx"> void resolveTree(Document&, Change);
</span><span class="cx">
</span><span class="cx"> void detachRenderTree(Element&);
</span><span class="lines">@@ -47,8 +46,6 @@
</span><span class="cx">
</span><span class="cx"> void updateTextRendererAfterContentChange(Text&, unsigned offsetOfReplacedData, unsigned lengthOfReplacedData);
</span><span class="cx">
</span><del>-Change determineChange(const RenderStyle&, const RenderStyle&);
-
</del><span class="cx"> void queuePostResolutionCallback(std::function<void ()>);
</span><span class="cx"> bool postResolutionCallbacksAreSuspended();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>