Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

3 files changed, 90 insertions, 0 deletions

diff --git a/Source/WebKit2/Shared/API/c/WKBase.h b/Source/WebKit2/Shared/API/c/WKBase.h
index c8656e4a3..28e7aed62 100644
--- a/Source/WebKit2/Shared/API/c/WKBase.h
+++ b/Source/WebKit2/Shared/API/c/WKBase.h
@@ -37,6 +37,10 @@
 #include <WebKit2/WKBaseGtk.h>
 #endif
 
+#if defined(BUILDING_SOUP__)
+#include <WebKit2/WKBaseSoup.h>
+#endif
+
 /* WebKit2 shared types */
 
 typedef uint32_t WKTypeID;
@@ -116,6 +120,7 @@ typedef const struct OpaqueWKBundle* WKBundleRef;
 typedef const struct OpaqueWKBundleBackForwardList* WKBundleBackForwardListRef;
 typedef const struct OpaqueWKBundleBackForwardListItem* WKBundleBackForwardListItemRef;
 typedef const struct OpaqueWKBundleDOMCSSStyleDeclaration* WKBundleCSSStyleDeclarationRef;
+typedef const struct OpaqueWKBundleDOMWindowExtension* WKBundleDOMWindowExtensionRef;
 typedef const struct OpaqueWKBundleFrame* WKBundleFrameRef;
 typedef const struct OpaqueWKBundleHitTestResult* WKBundleHitTestResultRef;
 typedef const struct OpaqueWKBundleInspector* WKBundleInspectorRef;
diff --git a/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp b/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp
index c04aab18f..f38368611 100644
--- a/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp
+++ b/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp
@@ -37,65 +37,115 @@ using namespace WebKit;
 
 WKTypeID WKContextMenuItemGetTypeID()
 {
+#if ENABLE(CONTEXT_MENUS)
     return toAPI(WebContextMenuItem::APIType);
+#else
+    return toAPI(APIObject::TypeNull);
+#endif
 }
 
 WKContextMenuItemRef WKContextMenuItemCreateAsAction(WKContextMenuItemTag tag, WKStringRef title, bool enabled)
 {
+#if ENABLE(CONTEXT_MENUS)
     return toAPI(WebContextMenuItem::create(WebContextMenuItemData(ActionType, toImpl(tag), toImpl(title)->string(), enabled, false)).leakRef());
+#else
+    return 0;
+#endif
 }
 
 WKContextMenuItemRef WKContextMenuItemCreateAsCheckableAction(WKContextMenuItemTag tag, WKStringRef title, bool enabled, bool checked)
 {
+#if ENABLE(CONTEXT_MENUS)
     return toAPI(WebContextMenuItem::create(WebContextMenuItemData(CheckableActionType, toImpl(tag), toImpl(title)->string(), enabled, checked)).leakRef());
+#else
+    return 0;
+#endif
 }
 
 WKContextMenuItemRef WKContextMenuItemCreateAsSubmenu(WKStringRef title, bool enabled, WKArrayRef submenuItems)
 {
+#if ENABLE(CONTEXT_MENUS)
     return toAPI(WebContextMenuItem::create(toImpl(title)->string(), enabled, toImpl(submenuItems)).leakRef());
+#else
+    return 0;
+#endif
 }
 
 WKContextMenuItemRef WKContextMenuItemSeparatorItem()
 {
+#if ENABLE(CONTEXT_MENUS)
     return toAPI(WebContextMenuItem::separatorItem());
+#else
+    return 0;
+#endif
 }
 
 WKContextMenuItemTag WKContextMenuItemGetTag(WKContextMenuItemRef itemRef)
 {
+#if ENABLE(CONTEXT_MENUS)
     return toAPI(toImpl(itemRef)->data()->action());
+#else
+    return toAPI(ContextMenuItemTagNoAction);
+#endif
 }
 
 WKContextMenuItemType WKContextMenuItemGetType(WKContextMenuItemRef itemRef)
 {
+#if ENABLE(CONTEXT_MENUS)
     return toAPI(toImpl(itemRef)->data()->type());
+#else
+    return toAPI(ActionType);
+#endif
 }
 
 WKStringRef WKContextMenuItemCopyTitle(WKContextMenuItemRef itemRef)
 {
+#if ENABLE(CONTEXT_MENUS)
     return toCopiedAPI(toImpl(itemRef)->data()->title().impl());
+#else
+    return 0;
+#endif
 }
 
 bool WKContextMenuItemGetEnabled(WKContextMenuItemRef itemRef)
 {
+#if ENABLE(CONTEXT_MENUS)
     return toImpl(itemRef)->data()->enabled();
+#else
+    return false;
+#endif
 }
 
 bool WKContextMenuItemGetChecked(WKContextMenuItemRef itemRef)
 {
+#if ENABLE(CONTEXT_MENUS)
     return toImpl(itemRef)->data()->checked();
+#else
+    return false;
+#endif
 }
 
 WKArrayRef WKContextMenuCopySubmenuItems(WKContextMenuItemRef itemRef)
 {
+#if ENABLE(CONTEXT_MENUS)
     return toAPI(toImpl(itemRef)->submenuItemsAsImmutableArray().leakRef());
+#else
+    return 0;
+#endif
 }
 
 WKTypeRef WKContextMenuItemGetUserData(WKContextMenuItemRef itemRef)
 {
+#if ENABLE(CONTEXT_MENUS)
     return toAPI(toImpl(itemRef)->userData());
+#else
+    return 0;
+#endif
 }
 
 void WKContextMenuItemSetUserData(WKContextMenuItemRef itemRef, WKTypeRef userDataRef)
 {
+#if ENABLE(CONTEXT_MENUS)
     toImpl(itemRef)->setUserData(toImpl(userDataRef));
+#endif
 }
diff --git a/Source/WebKit2/Shared/API/c/soup/WKBaseSoup.h b/Source/WebKit2/Shared/API/c/soup/WKBaseSoup.h
new file mode 100644
index 000000000..6189e4c97
--- /dev/null
+++ b/Source/WebKit2/Shared/API/c/soup/WKBaseSoup.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2012 Igalia S.L.
+ *
+ * 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 WKBaseSoup_h
+#define WKBaseSoup_h
+
+#ifndef WKBase_h
+#error "Please #include \"WKBase.h\" instead of this file directly."
+#endif
+
+typedef const struct OpaqueWKSoupRequestManager* WKSoupRequestManagerRef;
+
+#endif /* WKBaseSoup_h */