Title: [202076] trunk/Source/WebCore
- Revision
- 202076
- Author
- [email protected]
- Date
- 2016-06-14 18:25:59 -0700 (Tue, 14 Jun 2016)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202075 => 202076)
--- 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)
@@ -1,3 +1,24 @@
+2016-06-14 Chris Dumez <[email protected]>
+
+ 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.
+
2016-06-14 Antoine Quint <[email protected]>
Inline media controls cut off PiP and fullscreen buttons on cnn.com
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (202075 => 202076)
--- 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)
@@ -475,7 +475,7 @@
0F54DCE11880F901003EEDBB /* DOMGestureEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F54DCDE1880F901003EEDBB /* DOMGestureEvent.mm */; };
0F54DCE21880F901003EEDBB /* DOMGestureEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCDF1880F901003EEDBB /* DOMGestureEventInternal.h */; };
0F54DCE51881051D003EEDBB /* TextAutoSizing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F54DCE31881051D003EEDBB /* TextAutoSizing.cpp */; };
- 0F54DCE61881051D003EEDBB /* TextAutoSizing.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCE41881051D003EEDBB /* TextAutoSizing.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 0F54DCE61881051D003EEDBB /* TextAutoSizing.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCE41881051D003EEDBB /* TextAutoSizing.h */; };
0F54DD081881D5F5003EEDBB /* Touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DD051881D5F5003EEDBB /* Touch.h */; };
0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DD061881D5F5003EEDBB /* TouchEvent.h */; };
0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DD071881D5F5003EEDBB /* TouchList.h */; };
Modified: trunk/Source/WebCore/dom/Document.cpp (202075 => 202076)
--- 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)
@@ -167,6 +167,7 @@
#include "StyleSheetList.h"
#include "StyleTreeResolver.h"
#include "SubresourceLoader.h"
+#include "TextAutoSizing.h"
#include "TextEvent.h"
#include "TextNodeTraversal.h"
#include "TransformSource.h"
@@ -419,6 +420,20 @@
frame->document()->domWindow()->printErrorMessage(message);
}
+#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
+
uint64_t Document::s_globalTreeVersion = 0;
HashSet<Document*>& Document::allDocuments()
Modified: trunk/Source/WebCore/dom/Document.h (202075 => 202076)
--- 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)
@@ -47,7 +47,6 @@
#include "StringWithDirection.h"
#include "StyleChange.h"
#include "Supplementable.h"
-#include "TextAutoSizing.h"
#include "TextResourceDecoder.h"
#include "Timer.h"
#include "TreeScope.h"
@@ -214,6 +213,12 @@
struct TextAutoSizingHash;
class TextAutoSizingKey;
class TextAutoSizingValue;
+
+struct TextAutoSizingTraits : WTF::GenericHashTraits<TextAutoSizingKey> {
+ static const bool emptyValueIsZero = true;
+ static void constructDeletedValue(TextAutoSizingKey& slot);
+ static bool isDeletedValue(const TextAutoSizingKey& value);
+};
#endif
#if ENABLE(MEDIA_SESSION)
Modified: trunk/Source/WebCore/rendering/TextAutoSizing.h (202075 => 202076)
--- 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)
@@ -71,18 +71,6 @@
static const bool safeToCompareToEmptyOrDeleted = true;
};
-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();
- }
-};
-
struct TextAutoSizingHashTranslator {
static unsigned hash(const RenderStyle& style)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
