Title: [259163] trunk/Source/WebCore
- Revision
- 259163
- Author
- wenson_hs...@apple.com
- Date
- 2020-03-28 11:31:21 -0700 (Sat, 28 Mar 2020)
Log Message
Unreviewed, fix the watchOS build after r259151
The declaration of Pasteboard(const String&) in Pasteboard.h is present for all PLATFORM(IOS_FAMILY), but the
implementation is guarded by ENABLE(DRAG_SUPPORT). r259151 added a codepath that calls this constructor in
IOS_FAMILY code, causing a linker error. Fix this by moving the implementation out of the ENABLE(DRAG_SUPPORT)
guard, to match the declaration in the header.
* platform/ios/PasteboardIOS.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (259162 => 259163)
--- trunk/Source/WebCore/ChangeLog 2020-03-28 17:22:50 UTC (rev 259162)
+++ trunk/Source/WebCore/ChangeLog 2020-03-28 18:31:21 UTC (rev 259163)
@@ -1,3 +1,14 @@
+2020-03-28 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Unreviewed, fix the watchOS build after r259151
+
+ The declaration of Pasteboard(const String&) in Pasteboard.h is present for all PLATFORM(IOS_FAMILY), but the
+ implementation is guarded by ENABLE(DRAG_SUPPORT). r259151 added a codepath that calls this constructor in
+ IOS_FAMILY code, causing a linker error. Fix this by moving the implementation out of the ENABLE(DRAG_SUPPORT)
+ guard, to match the declaration in the header.
+
+ * platform/ios/PasteboardIOS.mm:
+
2020-03-27 Simon Fraser <simon.fra...@apple.com>
Sideways jiggles when scrolling the shelves on beta.music.apple.com
Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (259162 => 259163)
--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2020-03-28 17:22:50 UTC (rev 259162)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2020-03-28 18:31:21 UTC (rev 259163)
@@ -52,8 +52,6 @@
namespace WebCore {
-#if ENABLE(DRAG_SUPPORT)
-
Pasteboard::Pasteboard(const String& pasteboardName)
: m_pasteboardName(pasteboardName)
, m_changeCount(platformStrategies()->pasteboardStrategy()->changeCount(pasteboardName))
@@ -60,6 +58,8 @@
{
}
+#if ENABLE(DRAG_SUPPORT)
+
void Pasteboard::setDragImage(DragImage, const IntPoint&)
{
notImplemented();
@@ -80,7 +80,7 @@
return makeUnique<Pasteboard>(dragData.pasteboardName());
}
-#endif
+#endif // ENABLE(DRAG_SUPPORT)
static int64_t changeCountForPasteboard(const String& pasteboardName = { })
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
