Title: [274238] branches/safari-612.1.5-branch/Source
- Revision
- 274238
- Author
- [email protected]
- Date
- 2021-03-10 13:58:18 -0800 (Wed, 10 Mar 2021)
Log Message
Cherry-pick r273453. rdar://problem/75280351
Unreviewed, fix build with the latest iOS SDK.
Source/WebCore:
* platform/DragData.h:
(WebCore::DragData::operator=): Deleted.
Source/WebKit:
* Shared/FocusedElementInformation.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273453 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.5-branch/Source/WebCore/ChangeLog (274237 => 274238)
--- branches/safari-612.1.5-branch/Source/WebCore/ChangeLog 2021-03-10 21:56:42 UTC (rev 274237)
+++ branches/safari-612.1.5-branch/Source/WebCore/ChangeLog 2021-03-10 21:58:18 UTC (rev 274238)
@@ -1,3 +1,27 @@
+2021-03-10 Russell Epstein <[email protected]>
+
+ Cherry-pick r273453. rdar://problem/75280351
+
+ Unreviewed, fix build with the latest iOS SDK.
+
+ Source/WebCore:
+
+ * platform/DragData.h:
+ (WebCore::DragData::operator=): Deleted.
+
+ Source/WebKit:
+
+ * Shared/FocusedElementInformation.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273453 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-02-24 Chris Dumez <[email protected]>
+
+ Unreviewed, fix build with the latest iOS SDK.
+
+ * platform/DragData.h:
+ (WebCore::DragData::operator=): Deleted.
+
2021-03-09 Russell Epstein <[email protected]>
Cherry-pick r273654. rdar://problem/75252578
Modified: branches/safari-612.1.5-branch/Source/WebCore/platform/DragData.h (274237 => 274238)
--- branches/safari-612.1.5-branch/Source/WebCore/platform/DragData.h 2021-03-10 21:56:42 UTC (rev 274237)
+++ branches/safari-612.1.5-branch/Source/WebCore/platform/DragData.h 2021-03-10 21:58:18 UTC (rev 274238)
@@ -116,25 +116,6 @@
Optional<PageIdentifier> pageID() const { return m_pageID; }
- DragData& operator=(const DragData& data)
- {
- m_clientPosition = data.m_clientPosition;
- m_globalPosition = data.m_globalPosition;
- m_platformDragData = data.m_platformDragData;
- m_draggingSourceOperationMask = data.m_draggingSourceOperationMask;
- m_applicationFlags = data.m_applicationFlags;
- m_fileNames = data.m_fileNames;
- m_dragDestinationActionMask = data.m_dragDestinationActionMask;
- m_pageID = data.m_pageID;
-#if PLATFORM(COCOA)
- m_pasteboardName = data.m_pasteboardName;
-#endif
-#if PLATFORM(WIN)
- m_dragDataMap = data.m_dragDataMap;
-#endif
- return *this;
- }
-
std::unique_ptr<PasteboardContext> createPasteboardContext() const;
private:
Modified: branches/safari-612.1.5-branch/Source/WebKit/ChangeLog (274237 => 274238)
--- branches/safari-612.1.5-branch/Source/WebKit/ChangeLog 2021-03-10 21:56:42 UTC (rev 274237)
+++ branches/safari-612.1.5-branch/Source/WebKit/ChangeLog 2021-03-10 21:58:18 UTC (rev 274238)
@@ -1,3 +1,26 @@
+2021-03-10 Russell Epstein <[email protected]>
+
+ Cherry-pick r273453. rdar://problem/75280351
+
+ Unreviewed, fix build with the latest iOS SDK.
+
+ Source/WebCore:
+
+ * platform/DragData.h:
+ (WebCore::DragData::operator=): Deleted.
+
+ Source/WebKit:
+
+ * Shared/FocusedElementInformation.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273453 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-02-24 Chris Dumez <[email protected]>
+
+ Unreviewed, fix build with the latest iOS SDK.
+
+ * Shared/FocusedElementInformation.h:
+
2021-03-05 Russell Epstein <[email protected]>
Cherry-pick r273997. rdar://problem/75115235
Modified: branches/safari-612.1.5-branch/Source/WebKit/Shared/FocusedElementInformation.h (274237 => 274238)
--- branches/safari-612.1.5-branch/Source/WebKit/Shared/FocusedElementInformation.h 2021-03-10 21:56:42 UTC (rev 274237)
+++ branches/safari-612.1.5-branch/Source/WebKit/Shared/FocusedElementInformation.h 2021-03-10 21:58:18 UTC (rev 274238)
@@ -66,17 +66,8 @@
#if PLATFORM(IOS_FAMILY)
struct OptionItem {
- OptionItem() { }
+ OptionItem() = default;
- OptionItem(const OptionItem& item)
- : text(item.text)
- , isGroup(item.isGroup)
- , isSelected(item.isSelected)
- , disabled(item.disabled)
- , parentGroupID(item.parentGroupID)
- {
- }
-
OptionItem(const String& text, bool isGroup, int parentID, bool selected, bool disabled)
: text(text)
, isGroup(isGroup)
@@ -85,6 +76,7 @@
, parentGroupID(parentID)
{
}
+
String text;
bool isGroup { false };
bool isSelected { false };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
