Title: [234350] trunk/Source/WebKit
- Revision
- 234350
- Author
- wenson_hs...@apple.com
- Date
- 2018-07-29 22:39:49 -0700 (Sun, 29 Jul 2018)
Log Message
Fix incorrect guards around a method declaration in PageClient.h
https://bugs.webkit.org/show_bug.cgi?id=188153
Reviewed by Tim Horton.
`WebCore::DragItem` is forward declared under `ENABLE(DRAG_SUPPORT)`, but `startDrag` is declared under
`PLATFORM(COCOA)`. If `ENABLE(DRAG_SUPPORT)` is off but `PLATFORM(COCOA)` is on, the build breaks.
We fix this by moving `startDrag` under `ENABLE(DRAG_SUPPORT)`.
* UIProcess/PageClient.h:
(WebKit::PageClient::startDrag):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (234349 => 234350)
--- trunk/Source/WebKit/ChangeLog 2018-07-29 22:13:19 UTC (rev 234349)
+++ trunk/Source/WebKit/ChangeLog 2018-07-30 05:39:49 UTC (rev 234350)
@@ -1,3 +1,18 @@
+2018-07-29 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Fix incorrect guards around a method declaration in PageClient.h
+ https://bugs.webkit.org/show_bug.cgi?id=188153
+
+ Reviewed by Tim Horton.
+
+ `WebCore::DragItem` is forward declared under `ENABLE(DRAG_SUPPORT)`, but `startDrag` is declared under
+ `PLATFORM(COCOA)`. If `ENABLE(DRAG_SUPPORT)` is off but `PLATFORM(COCOA)` is on, the build breaks.
+
+ We fix this by moving `startDrag` under `ENABLE(DRAG_SUPPORT)`.
+
+ * UIProcess/PageClient.h:
+ (WebKit::PageClient::startDrag):
+
2018-07-28 Andy Estes <aes...@apple.com>
[Wi-Fi Assertions] Pass a ResumptionReason to resumeWiFiAssertions
Modified: trunk/Source/WebKit/UIProcess/PageClient.h (234349 => 234350)
--- trunk/Source/WebKit/UIProcess/PageClient.h 2018-07-29 22:13:19 UTC (rev 234349)
+++ trunk/Source/WebKit/UIProcess/PageClient.h 2018-07-30 05:39:49 UTC (rev 234350)
@@ -203,9 +203,13 @@
virtual void didChangeContentSize(const WebCore::IntSize&) = 0;
-#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
+#if ENABLE(DRAG_SUPPORT)
+#if PLATFORM(GTK)
virtual void startDrag(Ref<WebCore::SelectionData>&&, WebCore::DragOperation, RefPtr<ShareableBitmap>&& dragImage) = 0;
+#else
+ virtual void startDrag(const WebCore::DragItem&, const ShareableBitmap::Handle&) { }
#endif
+#endif // ENABLE(DRAG_SUPPORT)
virtual void setCursor(const WebCore::Cursor&) = 0;
virtual void setCursorHiddenUntilMouseMoves(bool) = 0;
@@ -219,7 +223,6 @@
#if PLATFORM(COCOA)
virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&) = 0;
virtual bool executeSavedCommandBySelector(const String& selector) = 0;
- virtual void startDrag(const WebCore::DragItem&, const ShareableBitmap::Handle&) { }
virtual void updateSecureInputState() = 0;
virtual void resetSecureInputState() = 0;
virtual void notifyInputContextAboutDiscardedComposition() = 0;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
