Attachment 346048 Details for Bug 188153 – Patch

[patch] Patch

bug-188153-20180729185729.patch (text/plain), 2.27 KB, created by Wenson Hsieh on 2018-07-29 18:57:29 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-07-29 18:57:29 PDT

Size: 2.27 KB

patch

obsolete

>Subversion Revision: 234345
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 6c8755f2f0cc92c99667673fb7b541d166acdea6..6591202efc95ca29b6af887f85704005dd421a5b 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-07-29  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Fix incorrect guards around a method declaration in PageClient.h
>+        https://bugs.webkit.org/show_bug.cgi?id=188153
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        `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-29  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         REGRESSION (r230817): Terrible performance when selecting text on Stash code review
>diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
>index 52c8b9d6ce3e0a102808cf0f4c48c565f8c68c67..7ea82baf0d797c02e536c40a954585f5dd0c02a6 100644
>--- a/Source/WebKit/UIProcess/PageClient.h
>+++ b/Source/WebKit/UIProcess/PageClient.h
>@@ -203,9 +203,13 @@ public:
> 
>     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 @@ public:
> #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;

Actions: View | Formatted Diff | Diff

Attachments on bug 188153: 346048