- Revision
- 284219
- Author
- [email protected]
- Date
- 2021-10-14 17:24:09 -0700 (Thu, 14 Oct 2021)
Log Message
Cherry-pick r284215. rdar://problem/84277677
Fix build failures with newer clang
https://bugs.webkit.org/show_bug.cgi?id=231783
Reviewed by Chris Dumez.
Source/WebKit:
We do not need to define copy constructor and assignment operator if we would like to use the default implementation.
The default copy constructor and assignment operator works well for TouchBarMenuItemData, so let's drop it.
* Shared/TouchBarMenuItemData.h:
Source/WTF:
In Identified case, we make copy constructor and assignment operator protected in IdentifiedBase to hide
the ability to copy Identified / ThreadSafeIdentified to be copied to IdentifiedBase. So, in the derived
classes, we should define both copy constructor and assignment operator.
* wtf/Identified.h:
Tools:
Since this is Objective-C (not Objective-C++), we cannot use `static const uint32_t` value for array size.
Use enum hack instead.
* DumpRenderTree/mac/LayoutTestHelper.m:
(displayUUIDStrings):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284215 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.5-branch/Source/WTF/ChangeLog (284218 => 284219)
--- branches/safari-613.1.5-branch/Source/WTF/ChangeLog 2021-10-15 00:20:21 UTC (rev 284218)
+++ branches/safari-613.1.5-branch/Source/WTF/ChangeLog 2021-10-15 00:24:09 UTC (rev 284219)
@@ -1,5 +1,52 @@
2021-10-14 Alan Coon <[email protected]>
+ Cherry-pick r284215. rdar://problem/84277677
+
+ Fix build failures with newer clang
+ https://bugs.webkit.org/show_bug.cgi?id=231783
+
+ Reviewed by Chris Dumez.
+
+ Source/WebKit:
+
+ We do not need to define copy constructor and assignment operator if we would like to use the default implementation.
+ The default copy constructor and assignment operator works well for TouchBarMenuItemData, so let's drop it.
+
+ * Shared/TouchBarMenuItemData.h:
+
+ Source/WTF:
+
+ In Identified case, we make copy constructor and assignment operator protected in IdentifiedBase to hide
+ the ability to copy Identified / ThreadSafeIdentified to be copied to IdentifiedBase. So, in the derived
+ classes, we should define both copy constructor and assignment operator.
+
+ * wtf/Identified.h:
+
+ Tools:
+
+ Since this is Objective-C (not Objective-C++), we cannot use `static const uint32_t` value for array size.
+ Use enum hack instead.
+
+ * DumpRenderTree/mac/LayoutTestHelper.m:
+ (displayUUIDStrings):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284215 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-14 Yusuke Suzuki <[email protected]>
+
+ Fix build failures with newer clang
+ https://bugs.webkit.org/show_bug.cgi?id=231783
+
+ Reviewed by Chris Dumez.
+
+ In Identified case, we make copy constructor and assignment operator protected in IdentifiedBase to hide
+ the ability to copy Identified / ThreadSafeIdentified to be copied to IdentifiedBase. So, in the derived
+ classes, we should define both copy constructor and assignment operator.
+
+ * wtf/Identified.h:
+
+2021-10-14 Alan Coon <[email protected]>
+
Cherry-pick r284187. rdar://problem/84277677
Unreviewed build fix with recent SDKs.
Modified: branches/safari-613.1.5-branch/Source/WTF/wtf/Identified.h (284218 => 284219)
--- branches/safari-613.1.5-branch/Source/WTF/wtf/Identified.h 2021-10-15 00:20:21 UTC (rev 284218)
+++ branches/safari-613.1.5-branch/Source/WTF/wtf/Identified.h 2021-10-15 00:24:09 UTC (rev 284219)
@@ -61,6 +61,7 @@
}
Identified(const Identified&) = default;
+ Identified& operator=(const Identified&) = default;
explicit Identified(uint64_t identifier)
: IdentifiedBase<uint64_t, T>(identifier)
@@ -84,6 +85,7 @@
}
ThreadSafeIdentified(const ThreadSafeIdentified&) = default;
+ ThreadSafeIdentified& operator=(const ThreadSafeIdentified&) = default;
explicit ThreadSafeIdentified(uint64_t identifier)
: IdentifiedBase<uint64_t, T>(identifier)
Modified: branches/safari-613.1.5-branch/Source/WebKit/ChangeLog (284218 => 284219)
--- branches/safari-613.1.5-branch/Source/WebKit/ChangeLog 2021-10-15 00:20:21 UTC (rev 284218)
+++ branches/safari-613.1.5-branch/Source/WebKit/ChangeLog 2021-10-15 00:24:09 UTC (rev 284219)
@@ -1,3 +1,49 @@
+2021-10-14 Alan Coon <[email protected]>
+
+ Cherry-pick r284215. rdar://problem/84277677
+
+ Fix build failures with newer clang
+ https://bugs.webkit.org/show_bug.cgi?id=231783
+
+ Reviewed by Chris Dumez.
+
+ Source/WebKit:
+
+ We do not need to define copy constructor and assignment operator if we would like to use the default implementation.
+ The default copy constructor and assignment operator works well for TouchBarMenuItemData, so let's drop it.
+
+ * Shared/TouchBarMenuItemData.h:
+
+ Source/WTF:
+
+ In Identified case, we make copy constructor and assignment operator protected in IdentifiedBase to hide
+ the ability to copy Identified / ThreadSafeIdentified to be copied to IdentifiedBase. So, in the derived
+ classes, we should define both copy constructor and assignment operator.
+
+ * wtf/Identified.h:
+
+ Tools:
+
+ Since this is Objective-C (not Objective-C++), we cannot use `static const uint32_t` value for array size.
+ Use enum hack instead.
+
+ * DumpRenderTree/mac/LayoutTestHelper.m:
+ (displayUUIDStrings):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284215 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-14 Yusuke Suzuki <[email protected]>
+
+ Fix build failures with newer clang
+ https://bugs.webkit.org/show_bug.cgi?id=231783
+
+ Reviewed by Chris Dumez.
+
+ We do not need to define copy constructor and assignment operator if we would like to use the default implementation.
+ The default copy constructor and assignment operator works well for TouchBarMenuItemData, so let's drop it.
+
+ * Shared/TouchBarMenuItemData.h:
+
2021-10-14 Russell Epstein <[email protected]>
Cherry-pick r283940. rdar://problem/84158485
Modified: branches/safari-613.1.5-branch/Source/WebKit/Shared/TouchBarMenuItemData.h (284218 => 284219)
--- branches/safari-613.1.5-branch/Source/WebKit/Shared/TouchBarMenuItemData.h 2021-10-15 00:20:21 UTC (rev 284218)
+++ branches/safari-613.1.5-branch/Source/WebKit/Shared/TouchBarMenuItemData.h 2021-10-15 00:24:09 UTC (rev 284219)
@@ -50,7 +50,6 @@
struct TouchBarMenuItemData {
explicit TouchBarMenuItemData() = default;
explicit TouchBarMenuItemData(const WebCore::HTMLMenuItemElement&);
- explicit TouchBarMenuItemData(const TouchBarMenuItemData&) = default;
void encode(IPC::Encoder&) const;
static std::optional<TouchBarMenuItemData> decode(IPC::Decoder&);
Modified: branches/safari-613.1.5-branch/Tools/ChangeLog (284218 => 284219)
--- branches/safari-613.1.5-branch/Tools/ChangeLog 2021-10-15 00:20:21 UTC (rev 284218)
+++ branches/safari-613.1.5-branch/Tools/ChangeLog 2021-10-15 00:24:09 UTC (rev 284219)
@@ -1,3 +1,50 @@
+2021-10-14 Alan Coon <[email protected]>
+
+ Cherry-pick r284215. rdar://problem/84277677
+
+ Fix build failures with newer clang
+ https://bugs.webkit.org/show_bug.cgi?id=231783
+
+ Reviewed by Chris Dumez.
+
+ Source/WebKit:
+
+ We do not need to define copy constructor and assignment operator if we would like to use the default implementation.
+ The default copy constructor and assignment operator works well for TouchBarMenuItemData, so let's drop it.
+
+ * Shared/TouchBarMenuItemData.h:
+
+ Source/WTF:
+
+ In Identified case, we make copy constructor and assignment operator protected in IdentifiedBase to hide
+ the ability to copy Identified / ThreadSafeIdentified to be copied to IdentifiedBase. So, in the derived
+ classes, we should define both copy constructor and assignment operator.
+
+ * wtf/Identified.h:
+
+ Tools:
+
+ Since this is Objective-C (not Objective-C++), we cannot use `static const uint32_t` value for array size.
+ Use enum hack instead.
+
+ * DumpRenderTree/mac/LayoutTestHelper.m:
+ (displayUUIDStrings):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284215 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-14 Yusuke Suzuki <[email protected]>
+
+ Fix build failures with newer clang
+ https://bugs.webkit.org/show_bug.cgi?id=231783
+
+ Reviewed by Chris Dumez.
+
+ Since this is Objective-C (not Objective-C++), we cannot use `static const uint32_t` value for array size.
+ Use enum hack instead.
+
+ * DumpRenderTree/mac/LayoutTestHelper.m:
+ (displayUUIDStrings):
+
2021-10-10 Michael Catanzaro <[email protected]>
[WPE] Expose WKTextCheckerSetContinuousSpellCheckingEnabled and use it from WKTR
Modified: branches/safari-613.1.5-branch/Tools/DumpRenderTree/mac/LayoutTestHelper.m (284218 => 284219)
--- branches/safari-613.1.5-branch/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2021-10-15 00:20:21 UTC (rev 284218)
+++ branches/safari-613.1.5-branch/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2021-10-15 00:24:09 UTC (rev 284219)
@@ -110,7 +110,7 @@
{
NSMutableArray *result = [NSMutableArray array];
- static const uint32_t maxDisplayCount = 10;
+ enum { maxDisplayCount = 10 };
CGDirectDisplayID displayIDs[maxDisplayCount] = { 0 };
uint32_t displayCount = 0;
