Attachment 149040 Details for Bug 89276 – Patch

[patch] Patch

89276_wkintentservice.patch (text/plain), 8.63 KB, created by Chris Dumez on 2012-06-22 09:31:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2012-06-22 09:31:33 PDT

Size: 8.63 KB

patch

obsolete

>diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
>index 51f7ec1..b9b9a8d 100644
>--- a/Source/WebKit2/CMakeLists.txt
>+++ b/Source/WebKit2/CMakeLists.txt
>@@ -280,6 +280,7 @@ SET(WebKit2_SOURCES
>     UIProcess/API/C/WKIconDatabase.cpp
>     UIProcess/API/C/WKInspector.cpp
>     UIProcess/API/C/WKIntentData.cpp
>+    UIProcess/API/C/WKIntentServiceInfo.cpp
>     UIProcess/API/C/WKKeyValueStorageManager.cpp
>     UIProcess/API/C/WKMediaCacheManager.cpp
>     UIProcess/API/C/WKNavigationData.cpp
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index f218e11..e14dc4f 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,25 @@
>+2012-06-22  Christophe Dumez  <christophe.dumez@intel.com>
>+
>+        [WK2] Add C API to inspect a Web Intent service
>+        https://bugs.webkit.org/show_bug.cgi?id=89276
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add C API for Web intent service so that it can be queried
>+        on client side.
>+
>+        * CMakeLists.txt:
>+        * GNUmakefile.list.am:
>+        * Target.pri:
>+        * UIProcess/API/C/WKIntentServiceInfo.cpp: Added.
>+        (WKIntentServiceInfoGetTypeID):
>+        (WKIntentServiceInfoCopyAction):
>+        (WKIntentServiceInfoCopyType):
>+        (WKIntentServiceInfoCopyHref):
>+        (WKIntentServiceInfoCopyTitle):
>+        (WKIntentServiceInfoCopyDisposition):
>+        * UIProcess/API/C/WKIntentServiceInfo.h: Added.
>+
> 2012-06-22  Jocelyn Turcotte  <turcotte.j@gmail.com>
> 
>         [Qt] Fix the remote inspector loading problems on Mac
>diff --git a/Source/WebKit2/GNUmakefile.list.am b/Source/WebKit2/GNUmakefile.list.am
>index a061f36..f44eb83 100644
>--- a/Source/WebKit2/GNUmakefile.list.am
>+++ b/Source/WebKit2/GNUmakefile.list.am
>@@ -64,6 +64,7 @@ webkit2_h_api += \
> 	$(WebKit2)/UIProcess/API/C/WKHitTestResult.h \
> 	$(WebKit2)/UIProcess/API/C/WKInspector.h \
> 	$(WebKit2)/UIProcess/API/C/WKIntentData.h \
>+	$(WebKit2)/UIProcess/API/C/WKIntentServiceInfo.h \
> 	$(WebKit2)/UIProcess/API/C/WKKeyValueStorageManager.h \
> 	$(WebKit2)/UIProcess/API/C/WKMediaCacheManager.h \
> 	$(WebKit2)/UIProcess/API/C/WKNativeEvent.h \
>@@ -535,6 +536,8 @@ webkit2_sources += \
> 	Source/WebKit2/UIProcess/API/C/WKInspector.h \
> 	Source/WebKit2/UIProcess/API/C/WKIntentData.cpp \
> 	Source/WebKit2/UIProcess/API/C/WKIntentData.h \
>+	Source/WebKit2/UIProcess/API/C/WKIntentServiceInfo.cpp \
>+	Source/WebKit2/UIProcess/API/C/WKIntentServiceInfo.h \
> 	Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp \
> 	Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h \
> 	Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp \
>diff --git a/Source/WebKit2/Target.pri b/Source/WebKit2/Target.pri
>index 7b9ab99..3163220 100644
>--- a/Source/WebKit2/Target.pri
>+++ b/Source/WebKit2/Target.pri
>@@ -162,6 +162,7 @@ HEADERS += \
>     UIProcess/API/C/WKIconDatabase.h \
>     UIProcess/API/C/WKInspector.h \
>     UIProcess/API/C/WKIntentData.h \
>+    UIProcess/API/C/WKIntentServiceInfo.h \
>     UIProcess/API/C/WKOpenPanelParameters.h \
>     UIProcess/API/C/WKOpenPanelResultListener.h \
>     UIProcess/API/C/WKNavigationData.h \
>@@ -521,6 +522,7 @@ SOURCES += \
>     UIProcess/API/C/WKIconDatabase.cpp \
>     UIProcess/API/C/WKInspector.cpp \
>     UIProcess/API/C/WKIntentData.cpp \
>+    UIProcess/API/C/WKIntentServiceInfo.cpp \
>     UIProcess/API/C/WKNotification.cpp \
>     UIProcess/API/C/WKNotificationManager.cpp \
>     UIProcess/API/C/WKNotificationPermissionRequest.cpp \
>diff --git a/Source/WebKit2/UIProcess/API/C/WKIntentServiceInfo.cpp b/Source/WebKit2/UIProcess/API/C/WKIntentServiceInfo.cpp
>new file mode 100644
>index 0000000..5a30fb7
>--- /dev/null
>+++ b/Source/WebKit2/UIProcess/API/C/WKIntentServiceInfo.cpp
>@@ -0,0 +1,89 @@
>+/*
>+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "WKIntentServiceInfo.h"
>+
>+#include "WKAPICast.h"
>+
>+#if ENABLE(WEB_INTENTS_TAG)
>+#include "WebIntentServiceInfo.h"
>+#endif
>+
>+using namespace WebKit;
>+
>+WKTypeID WKIntentServiceInfoGetTypeID()
>+{
>+#if ENABLE(WEB_INTENTS_TAG)
>+    return toAPI(WebIntentServiceInfo::APIType);
>+#else
>+    return 0;
>+#endif
>+}
>+
>+WKStringRef WKIntentServiceInfoCopyAction(WKIntentServiceInfoRef serviceRef)
>+{
>+#if ENABLE(WEB_INTENTS_TAG)
>+    return toCopiedAPI(toImpl(serviceRef)->action());
>+#else
>+    return 0;
>+#endif
>+}
>+
>+WKStringRef WKIntentServiceInfoCopyType(WKIntentServiceInfoRef serviceRef)
>+{
>+#if ENABLE(WEB_INTENTS_TAG)
>+    return toCopiedAPI(toImpl(serviceRef)->payloadType());
>+#else
>+    return 0;
>+#endif
>+}
>+
>+WKURLRef WKIntentServiceInfoCopyHref(WKIntentServiceInfoRef serviceRef)
>+{
>+#if ENABLE(WEB_INTENTS_TAG)
>+    return toCopiedURLAPI(toImpl(serviceRef)->href());
>+#else
>+    return 0;
>+#endif
>+}
>+
>+WKStringRef WKIntentServiceInfoCopyTitle(WKIntentServiceInfoRef serviceRef)
>+{
>+#if ENABLE(WEB_INTENTS_TAG)
>+    return toCopiedAPI(toImpl(serviceRef)->title());
>+#else
>+    return 0;
>+#endif
>+}
>+
>+WKStringRef WKIntentServiceInfoCopyDisposition(WKIntentServiceInfoRef serviceRef)
>+{
>+#if ENABLE(WEB_INTENTS_TAG)
>+    return toCopiedAPI(toImpl(serviceRef)->disposition());
>+#else
>+    return 0;
>+#endif
>+}
>diff --git a/Source/WebKit2/UIProcess/API/C/WKIntentServiceInfo.h b/Source/WebKit2/UIProcess/API/C/WKIntentServiceInfo.h
>new file mode 100644
>index 0000000..121cffd
>--- /dev/null
>+++ b/Source/WebKit2/UIProcess/API/C/WKIntentServiceInfo.h
>@@ -0,0 +1,46 @@
>+/*
>+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef WKIntentServiceInfo_h
>+#define WKIntentServiceInfo_h
>+
>+#include <WebKit2/WKBase.h>
>+
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+
>+WK_EXPORT WKTypeID WKIntentServiceInfoGetTypeID();
>+WK_EXPORT WKStringRef WKIntentServiceInfoCopyAction(WKIntentServiceInfoRef serviceRef);
>+WK_EXPORT WKStringRef WKIntentServiceInfoCopyType(WKIntentServiceInfoRef serviceRef);
>+WK_EXPORT WKURLRef WKIntentServiceInfoCopyHref(WKIntentServiceInfoRef serviceRef);
>+WK_EXPORT WKStringRef WKIntentServiceInfoCopyTitle(WKIntentServiceInfoRef serviceRef);
>+WK_EXPORT WKStringRef WKIntentServiceInfoCopyDisposition(WKIntentServiceInfoRef serviceRef);
>+
>+#ifdef __cplusplus
>+}
>+#endif
>+
>+#endif // WKIntentServiceInfo_h

Actions: View | Formatted Diff | Diff

Attachments on bug 89276: 148068 | 149040