Title: [262067] branches/safari-610.1.14-branch/Source/WebCore
- Revision
- 262067
- Author
- [email protected]
- Date
- 2020-05-22 11:55:41 -0700 (Fri, 22 May 2020)
Log Message
Cherry-pick r261823. rdar://problem/63548563
[Win] Fix AppleWin build
https://bugs.webkit.org/show_bug.cgi?id=212030
Reviewed by Brent Fulgham.
The build fails because the number of bitfields in GreaterThanOrSameSizeAsStyleRareInheritedData does not match the
actual number of bitfields in StyleRareInheritedData.
* rendering/style/StyleRareInheritedData.cpp:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261823 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.14-branch/Source/WebCore/ChangeLog (262066 => 262067)
--- branches/safari-610.1.14-branch/Source/WebCore/ChangeLog 2020-05-22 18:27:14 UTC (rev 262066)
+++ branches/safari-610.1.14-branch/Source/WebCore/ChangeLog 2020-05-22 18:55:41 UTC (rev 262067)
@@ -1,3 +1,32 @@
+2020-05-22 Alan Coon <[email protected]>
+
+ Cherry-pick r261823. rdar://problem/63548563
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=212030
+
+ Reviewed by Brent Fulgham.
+
+ The build fails because the number of bitfields in GreaterThanOrSameSizeAsStyleRareInheritedData does not match the
+ actual number of bitfields in StyleRareInheritedData.
+
+ * rendering/style/StyleRareInheritedData.cpp:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261823 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-05-18 Per Arne Vollan <[email protected]>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=212030
+
+ Reviewed by Brent Fulgham.
+
+ The build fails because the number of bitfields in GreaterThanOrSameSizeAsStyleRareInheritedData does not match the
+ actual number of bitfields in StyleRareInheritedData.
+
+ * rendering/style/StyleRareInheritedData.cpp:
+
2020-05-17 Simon Fraser <[email protected]>
Fix operator== and hash() for ExtendedColor
Modified: branches/safari-610.1.14-branch/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (262066 => 262067)
--- branches/safari-610.1.14-branch/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2020-05-22 18:27:14 UTC (rev 262066)
+++ branches/safari-610.1.14-branch/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2020-05-22 18:55:41 UTC (rev 262067)
@@ -49,7 +49,7 @@
TextUnderlineOffset offset;
TextDecorationThickness thickness;
void* customPropertyDataRefs[1];
- unsigned bitfields[4];
+ unsigned bitfields[6];
short pagedMediaShorts[2];
TabSize tabSize;
short hyphenationShorts[3];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
