<!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>[202076] 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/202076">202076</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-14 18:25:59 -0700 (Tue, 14 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/201534">r201534</a>): Compile time greatly regressed
https://bugs.webkit.org/show_bug.cgi?id=158765
<rdar://problem/26587342>
Reviewed by Darin Adler.
Compile time greatly regressed by <a href="http://trac.webkit.org/projects/webkit/changeset/201534">r201534</a> due to Document.h now including
TextAutoSizing.h. Move the TextAutoSizingTraits back to Document.h to
restore pre-<a href="http://trac.webkit.org/projects/webkit/changeset/201534">r201534</a> behavior.
* WebCore.xcodeproj/project.pbxproj:
* dom/Document.cpp:
(WebCore::TextAutoSizingTraits::constructDeletedValue):
(WebCore::TextAutoSizingTraits::isDeletedValue):
* dom/Document.h:
* rendering/TextAutoSizing.h:
(WebCore::TextAutoSizingTraits::constructDeletedValue): Deleted.
(WebCore::TextAutoSizingTraits::isDeletedValue): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</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="#trunkSourceWebCorerenderingTextAutoSizingh">trunk/Source/WebCore/rendering/TextAutoSizing.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202075 => 202076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-15 01:03:30 UTC (rev 202075)
+++ trunk/Source/WebCore/ChangeLog 2016-06-15 01:25:59 UTC (rev 202076)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-06-14 Chris Dumez <cdumez@apple.com>
+
+ Regression(r201534): Compile time greatly regressed
+ https://bugs.webkit.org/show_bug.cgi?id=158765
+ <rdar://problem/26587342>
+
+ Reviewed by Darin Adler.
+
+ Compile time greatly regressed by r201534 due to Document.h now including
+ TextAutoSizing.h. Move the TextAutoSizingTraits back to Document.h to
+ restore pre-r201534 behavior.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/Document.cpp:
+ (WebCore::TextAutoSizingTraits::constructDeletedValue):
+ (WebCore::TextAutoSizingTraits::isDeletedValue):
+ * dom/Document.h:
+ * rendering/TextAutoSizing.h:
+ (WebCore::TextAutoSizingTraits::constructDeletedValue): Deleted.
+ (WebCore::TextAutoSizingTraits::isDeletedValue): Deleted.
+
</ins><span class="cx"> 2016-06-14 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Inline media controls cut off PiP and fullscreen buttons on cnn.com
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (202075 => 202076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-06-15 01:03:30 UTC (rev 202075)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-06-15 01:25:59 UTC (rev 202076)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> 0F54DCE11880F901003EEDBB /* DOMGestureEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F54DCDE1880F901003EEDBB /* DOMGestureEvent.mm */; };
</span><span class="cx"> 0F54DCE21880F901003EEDBB /* DOMGestureEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCDF1880F901003EEDBB /* DOMGestureEventInternal.h */; };
</span><span class="cx"> 0F54DCE51881051D003EEDBB /* TextAutoSizing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F54DCE31881051D003EEDBB /* TextAutoSizing.cpp */; };
</span><del>- 0F54DCE61881051D003EEDBB /* TextAutoSizing.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCE41881051D003EEDBB /* TextAutoSizing.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 0F54DCE61881051D003EEDBB /* TextAutoSizing.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCE41881051D003EEDBB /* TextAutoSizing.h */; };
</ins><span class="cx"> 0F54DD081881D5F5003EEDBB /* Touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DD051881D5F5003EEDBB /* Touch.h */; };
</span><span class="cx"> 0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DD061881D5F5003EEDBB /* TouchEvent.h */; };
</span><span class="cx"> 0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DD071881D5F5003EEDBB /* TouchList.h */; };
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (202075 => 202076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-06-15 01:03:30 UTC (rev 202075)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-06-15 01:25:59 UTC (rev 202076)
</span><span class="lines">@@ -167,6 +167,7 @@
</span><span class="cx"> #include "StyleSheetList.h"
</span><span class="cx"> #include "StyleTreeResolver.h"
</span><span class="cx"> #include "SubresourceLoader.h"
</span><ins>+#include "TextAutoSizing.h"
</ins><span class="cx"> #include "TextEvent.h"
</span><span class="cx"> #include "TextNodeTraversal.h"
</span><span class="cx"> #include "TransformSource.h"
</span><span class="lines">@@ -419,6 +420,20 @@
</span><span class="cx"> frame->document()->domWindow()->printErrorMessage(message);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+
+void TextAutoSizingTraits::constructDeletedValue(TextAutoSizingKey& slot)
+{
+ new (NotNull, &slot) TextAutoSizingKey(TextAutoSizingKey::Deleted);
+}
+
+bool TextAutoSizingTraits::isDeletedValue(const TextAutoSizingKey& value)
+{
+ return value.isDeleted();
+}
+
+#endif
+
</ins><span class="cx"> uint64_t Document::s_globalTreeVersion = 0;
</span><span class="cx">
</span><span class="cx"> HashSet<Document*>& Document::allDocuments()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (202075 => 202076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2016-06-15 01:03:30 UTC (rev 202075)
+++ trunk/Source/WebCore/dom/Document.h 2016-06-15 01:25:59 UTC (rev 202076)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> #include "StringWithDirection.h"
</span><span class="cx"> #include "StyleChange.h"
</span><span class="cx"> #include "Supplementable.h"
</span><del>-#include "TextAutoSizing.h"
</del><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "TreeScope.h"
</span><span class="lines">@@ -214,6 +213,12 @@
</span><span class="cx"> struct TextAutoSizingHash;
</span><span class="cx"> class TextAutoSizingKey;
</span><span class="cx"> class TextAutoSizingValue;
</span><ins>+
+struct TextAutoSizingTraits : WTF::GenericHashTraits<TextAutoSizingKey> {
+ static const bool emptyValueIsZero = true;
+ static void constructDeletedValue(TextAutoSizingKey& slot);
+ static bool isDeletedValue(const TextAutoSizingKey& value);
+};
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextAutoSizingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextAutoSizing.h (202075 => 202076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextAutoSizing.h 2016-06-15 01:03:30 UTC (rev 202075)
+++ trunk/Source/WebCore/rendering/TextAutoSizing.h 2016-06-15 01:25:59 UTC (rev 202076)
</span><span class="lines">@@ -71,18 +71,6 @@
</span><span class="cx"> static const bool safeToCompareToEmptyOrDeleted = true;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-struct TextAutoSizingTraits : WTF::GenericHashTraits<TextAutoSizingKey> {
- static const bool emptyValueIsZero = true;
- static void constructDeletedValue(TextAutoSizingKey& slot)
- {
- new (NotNull, &slot) TextAutoSizingKey(TextAutoSizingKey::Deleted);
- }
- static bool isDeletedValue(const TextAutoSizingKey& value)
- {
- return value.isDeleted();
- }
-};
-
</del><span class="cx"> struct TextAutoSizingHashTranslator {
</span><span class="cx"> static unsigned hash(const RenderStyle& style)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>