From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- .../Shared/gtk/WebCoreArgumentCodersGtk.cpp | 29 ++++++++++++++++++++-- Source/WebKit2/Shared/gtk/WebEventFactory.cpp | 3 ++- 2 files changed, 29 insertions(+), 3 deletions(-) (limited to 'Source/WebKit2/Shared/gtk') diff --git a/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp b/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp index 2770a3f..73527ce 100644 --- a/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp +++ b/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp @@ -39,7 +39,12 @@ void encodeResourceRequest(ArgumentEncoder* encoder, const WebCore::ResourceRequ bool decodeResourceRequest(ArgumentDecoder* decoder, WebCore::ResourceRequest& resourceRequest) { notImplemented(); - return false; + + // FIXME: Add real implementation when we want to implement something that + // depends on this like the policy client. + // https://bugs.webkit.org/show_bug.cgi?id=55934 + resourceRequest = WebCore::ResourceRequest(); + return true; } void encodeResourceResponse(ArgumentEncoder* encoder, const WebCore::ResourceResponse& resourceResponse) @@ -50,7 +55,27 @@ void encodeResourceResponse(ArgumentEncoder* encoder, const WebCore::ResourceRes bool decodeResourceResponse(ArgumentDecoder* decoder, WebCore::ResourceResponse& resourceResponse) { notImplemented(); - return false; + + // FIXME: Ditto. + resourceResponse = WebCore::ResourceResponse(); + return true; +} + +void encodeResourceError(ArgumentEncoder* encoder, const WebCore::ResourceError& resourceError) +{ + encoder->encode(CoreIPC::In(resourceError.domain(), resourceError.errorCode(), resourceError.failingURL(), resourceError.localizedDescription())); +} + +bool decodeResourceError(ArgumentDecoder* decoder, WebCore::ResourceError& resourceError) +{ + String domain; + int errorCode; + String failingURL; + String localizedDescription; + if (!decoder->decode(CoreIPC::Out(domain, errorCode, failingURL, localizedDescription))) + return false; + resourceError = WebCore::ResourceError(domain, errorCode, failingURL, localizedDescription); + return true; } } diff --git a/Source/WebKit2/Shared/gtk/WebEventFactory.cpp b/Source/WebKit2/Shared/gtk/WebEventFactory.cpp index a9acbb3..d8f8b46 100644 --- a/Source/WebKit2/Shared/gtk/WebEventFactory.cpp +++ b/Source/WebKit2/Shared/gtk/WebEventFactory.cpp @@ -28,6 +28,7 @@ #include "config.h" #include "WebEventFactory.h" +#include "GtkVersioning.h" #include "PlatformKeyboardEvent.h" #include "Scrollbar.h" #include "WindowsKeyboardCodes.h" @@ -41,7 +42,7 @@ namespace WebKit { static inline bool isGdkKeyCodeFromKeyPad(unsigned keyval) { - return keyval >= GDK_KEY_KP_Space && keyval <= GDK_KEY_KP_9; + return keyval >= GDK_KP_Space && keyval <= GDK_KP_9; } static inline WebEvent::Modifiers modifiersForEvent(const GdkEvent* event) -- cgit v1.1