Title: [218176] trunk/Source/WebKit2
- Revision
- 218176
- Author
- carlo...@webkit.org
- Date
- 2017-06-13 05:39:55 -0700 (Tue, 13 Jun 2017)
Log Message
Unreviewed. Remove unused code from GTK+ WebKitPrivate.
* UIProcess/API/gtk/WebKitPrivate.cpp:
(wkEventModifiersToGdkModifiers): Deleted.
(wkEventMouseButtonToWebKitMouseButton): Deleted.
* UIProcess/API/gtk/WebKitPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (218175 => 218176)
--- trunk/Source/WebKit2/ChangeLog 2017-06-13 12:19:29 UTC (rev 218175)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-13 12:39:55 UTC (rev 218176)
@@ -1,5 +1,14 @@
2017-06-13 Carlos Garcia Campos <cgar...@igalia.com>
+ Unreviewed. Remove unused code from GTK+ WebKitPrivate.
+
+ * UIProcess/API/gtk/WebKitPrivate.cpp:
+ (wkEventModifiersToGdkModifiers): Deleted.
+ (wkEventMouseButtonToWebKitMouseButton): Deleted.
+ * UIProcess/API/gtk/WebKitPrivate.h:
+
+2017-06-13 Carlos Garcia Campos <cgar...@igalia.com>
+
Unreviewed. Fix return value of PageLoaderClient::shouldGoToBackForwardListItem after r218164.
It should return true as InjectedBundlePageLoaderClient does. This caused several timeouts in GTK+ unit tests
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp (218175 => 218176)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp 2017-06-13 12:19:29 UTC (rev 218175)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp 2017-06-13 12:39:55 UTC (rev 218176)
@@ -26,22 +26,6 @@
#include "WebKitError.h"
#include <gdk/gdk.h>
-unsigned wkEventModifiersToGdkModifiers(WKEventModifiers wkModifiers)
-{
- unsigned modifiers = 0;
- if (wkModifiers & kWKEventModifiersShiftKey)
- modifiers |= GDK_SHIFT_MASK;
- if (wkModifiers & kWKEventModifiersControlKey)
- modifiers |= GDK_CONTROL_MASK;
- if (wkModifiers & kWKEventModifiersAltKey)
- modifiers |= GDK_MOD1_MASK;
- if (wkModifiers & kWKEventModifiersMetaKey)
- modifiers |= GDK_META_MASK;
- if (wkModifiers & kWKEventModifiersCapsLockKey)
- modifiers |= GDK_LOCK_MASK;
- return modifiers;
-}
-
unsigned toGdkModifiers(WebKit::WebEvent::Modifiers wkModifiers)
{
unsigned modifiers = 0;
@@ -95,22 +79,6 @@
return 0;
}
-unsigned wkEventMouseButtonToWebKitMouseButton(WKEventMouseButton wkButton)
-{
- switch (wkButton) {
- case kWKEventMouseButtonNoButton:
- return 0;
- case kWKEventMouseButtonLeftButton:
- return 1;
- case kWKEventMouseButtonMiddleButton:
- return 2;
- case kWKEventMouseButtonRightButton:
- return 3;
- }
- ASSERT_NOT_REACHED();
- return 0;
-}
-
unsigned toWebKitError(unsigned webCoreError)
{
switch (webCoreError) {
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h (218175 => 218176)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2017-06-13 12:19:29 UTC (rev 218175)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2017-06-13 12:39:55 UTC (rev 218176)
@@ -43,8 +43,6 @@
#include <wtf/Assertions.h>
#include <wtf/glib/WTFGType.h>
-unsigned wkEventModifiersToGdkModifiers(WKEventModifiers);
-unsigned wkEventMouseButtonToWebKitMouseButton(WKEventMouseButton);
unsigned toGdkModifiers(WebKit::WebEvent::Modifiers);
WebKitNavigationType toWebKitNavigationType(WebCore::NavigationType);
unsigned toWebKitMouseButton(WebKit::WebMouseEvent::Button);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
