Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (120214 => 120215)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-06-13 16:13:19 UTC (rev 120215)
@@ -122,7 +122,6 @@
Shared/FontInfo.cpp
Shared/ImmutableArray.cpp
Shared/ImmutableDictionary.cpp
- Shared/IntentData.cpp
Shared/MutableArray.cpp
Shared/MutableDictionary.cpp
Shared/OriginAndDatabases.cpp
@@ -237,7 +236,6 @@
UIProcess/WebIconDatabase.cpp
UIProcess/WebIconDatabaseClient.cpp
UIProcess/WebInspectorProxy.cpp
- UIProcess/WebIntentData.cpp
UIProcess/WebKeyValueStorageManagerProxy.cpp
UIProcess/WebLayerTreeRenderer.cpp
UIProcess/WebLoaderClient.cpp
Modified: trunk/Source/WebKit2/ChangeLog (120214 => 120215)
--- trunk/Source/WebKit2/ChangeLog 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-13 16:13:19 UTC (rev 120215)
@@ -1,3 +1,39 @@
+2012-06-13 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r120209.
+ http://trac.webkit.org/changeset/120209
+ https://bugs.webkit.org/show_bug.cgi?id=89007
+
+ Broke the WebKit2 mac build. (Requested by andersca on
+ #webkit).
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Shared/API/c/WKBase.h:
+ * Shared/APIClientTraits.h:
+ * Shared/APIObject.h:
+ * Shared/IntentData.cpp: Removed.
+ * Shared/IntentData.h: Removed.
+ * Target.pri:
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit):
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/gtk/WebKitLoaderClient.cpp:
+ (attachLoaderClientToView):
+ * UIProcess/WebIntentData.cpp: Removed.
+ * UIProcess/WebIntentData.h: Removed.
+ * UIProcess/WebLoaderClient.cpp:
+ * UIProcess/WebLoaderClient.h:
+ (WebKit):
+ (WebLoaderClient):
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ (WebKit):
+ (WebPageProxy):
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchIntent):
+
2012-06-13 Alexis Menard <[email protected]>
Web Inspector: add a way to get the remote inspector url for a given page.
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (120214 => 120215)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2012-06-13 16:13:19 UTC (rev 120215)
@@ -362,8 +362,6 @@
Source/WebKit2/Shared/ImmutableArray.h \
Source/WebKit2/Shared/ImmutableDictionary.cpp \
Source/WebKit2/Shared/ImmutableDictionary.h \
- Source/WebKit2/Shared/IntentData.cpp \
- Source/WebKit2/Shared/IntentData.h \
Source/WebKit2/Shared/LayerTreeContext.h \
Source/WebKit2/Shared/MutableArray.cpp \
Source/WebKit2/Shared/MutableArray.h \
@@ -803,8 +801,6 @@
Source/WebKit2/UIProcess/WebIconDatabaseClient.h \
Source/WebKit2/UIProcess/WebInspectorProxy.cpp \
Source/WebKit2/UIProcess/WebInspectorProxy.h \
- Source/WebKit2/UIProcess/WebIntentData.cpp \
- Source/WebKit2/UIProcess/WebIntentData.h \
Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp \
Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.h \
Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp \
Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (120214 => 120215)
--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2012-06-13 16:13:19 UTC (rev 120215)
@@ -98,7 +98,6 @@
typedef const struct OpaqueWKHitTestResult* WKHitTestResultRef;
typedef const struct OpaqueWKIconDatabase* WKIconDatabaseRef;
typedef const struct OpaqueWKInspector* WKInspectorRef;
-typedef const struct OpaqueWKIntentData* WKIntentDataRef;
typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef;
typedef const struct OpaqueWKNavigationData* WKNavigationDataRef;
Modified: trunk/Source/WebKit2/Shared/APIClientTraits.h (120214 => 120215)
--- trunk/Source/WebKit2/Shared/APIClientTraits.h 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.h 2012-06-13 16:13:19 UTC (rev 120215)
@@ -53,7 +53,7 @@
};
template<> struct APIClientTraits<WKPageLoaderClient> {
- static const size_t interfaceSizesByVersion[3];
+ static const size_t interfaceSizesByVersion[2];
};
template<> struct APIClientTraits<WKPageUIClient> {
Modified: trunk/Source/WebKit2/Shared/APIObject.h (120214 => 120215)
--- trunk/Source/WebKit2/Shared/APIObject.h 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/Shared/APIObject.h 2012-06-13 16:13:19 UTC (rev 120215)
@@ -88,7 +88,6 @@
TypeGrammarDetail,
TypeIconDatabase,
TypeInspector,
- TypeIntentData,
TypeKeyValueStorageManager,
TypeMediaCacheManager,
TypeNavigationData,
Deleted: trunk/Source/WebKit2/Shared/IntentData.cpp (120214 => 120215)
--- trunk/Source/WebKit2/Shared/IntentData.cpp 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/Shared/IntentData.cpp 2012-06-13 16:13:19 UTC (rev 120215)
@@ -1,69 +0,0 @@
-/*
- * 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 "IntentData.h"
-
-#if ENABLE(WEB_INTENTS)
-
-#include "APIObject.h"
-#include "DataReference.h"
-#include "WebCoreArgumentCoders.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void IntentData::encode(CoreIPC::ArgumentEncoder* encoder) const
-{
- encoder->encode(action);
- encoder->encode(type);
- encoder->encode(CoreIPC::DataReference(data));
- encoder->encode(extras);
- encoder->encode(suggestions);
-}
-
-bool IntentData::decode(CoreIPC::ArgumentDecoder* decoder, IntentData& intentData)
-{
- if (!decoder->decode(intentData.action))
- return false;
- if (!decoder->decode(intentData.type))
- return false;
- CoreIPC::DataReference data;
- if (!decoder->decode(data))
- return false;
- intentData.data.append(data.data(), data.size());
- if (!decoder->decode(intentData.extras))
- return false;
- if (!decoder->decode(intentData.suggestions))
- return false;
-
- return true;
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(WEB_INTENTS)
-
Deleted: trunk/Source/WebKit2/Shared/IntentData.h (120214 => 120215)
--- trunk/Source/WebKit2/Shared/IntentData.h 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/Shared/IntentData.h 2012-06-13 16:13:19 UTC (rev 120215)
@@ -1,57 +0,0 @@
-/*
- * 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 IntentData_h
-#define IntentData_h
-
-#if ENABLE(WEB_INTENTS)
-
-#include "APIObject.h"
-#include "GenericCallback.h"
-#include <wtf/text/WTFString.h>
-
-namespace CoreIPC {
-class ArgumentDecoder;
-class ArgumentEncoder;
-}
-
-namespace WebKit {
-
-struct IntentData {
- void encode(CoreIPC::ArgumentEncoder*) const;
- static bool decode(CoreIPC::ArgumentDecoder*, IntentData&);
-
- String action;
- String type;
- Vector<uint8_t> data;
- HashMap<String, String> extras;
- Vector<WebCore::KURL> suggestions;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(WEB_INTENTS)
-
-#endif // IntentData_h
Modified: trunk/Source/WebKit2/Target.pri (120214 => 120215)
--- trunk/Source/WebKit2/Target.pri 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/Target.pri 2012-06-13 16:13:19 UTC (rev 120215)
@@ -76,7 +76,6 @@
Shared/ImageOptions.h \
Shared/ImmutableArray.h \
Shared/ImmutableDictionary.h \
- Shared/IntentData.h \
Shared/LayerTreeContext.h \
Shared/MutableArray.h \
Shared/MutableDictionary.h \
@@ -253,7 +252,6 @@
UIProcess/WebIconDatabase.h \
UIProcess/WebIconDatabaseClient.h \
UIProcess/WebInspectorProxy.h \
- UIProcess/WebIntentData.h \
UIProcess/WebKeyValueStorageManagerProxy.h \
UIProcess/WebLayerTreeRenderer.h \
UIProcess/WebLoaderClient.h \
@@ -442,7 +440,6 @@
Shared/FontInfo.cpp \
Shared/ImmutableArray.cpp \
Shared/ImmutableDictionary.cpp \
- Shared/IntentData.cpp \
Shared/MutableArray.cpp \
Shared/MutableDictionary.cpp \
Shared/OriginAndDatabases.cpp \
@@ -599,7 +596,6 @@
UIProcess/WebIconDatabase.cpp \
UIProcess/WebIconDatabaseClient.cpp \
UIProcess/WebInspectorProxy.cpp \
- UIProcess/WebIntentData.cpp \
UIProcess/WebKeyValueStorageManagerProxy.cpp \
UIProcess/WebLayerTreeRenderer.cpp \
UIProcess/WebLoaderClient.cpp \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (120214 => 120215)
--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2012-06-13 16:13:19 UTC (rev 120215)
@@ -70,7 +70,6 @@
class WebHitTestResult;
class WebIconDatabase;
class WebInspectorProxy;
-class WebIntentData;
class WebKeyValueStorageManagerProxy;
class WebMediaCacheManagerProxy;
class WebNavigationData;
@@ -108,7 +107,6 @@
WK_ADD_API_MAPPING(WKGrammarDetailRef, WebGrammarDetail)
WK_ADD_API_MAPPING(WKHitTestResultRef, WebHitTestResult)
WK_ADD_API_MAPPING(WKIconDatabaseRef, WebIconDatabase)
-WK_ADD_API_MAPPING(WKIntentDataRef, WebIntentData)
WK_ADD_API_MAPPING(WKKeyValueStorageManagerRef, WebKeyValueStorageManagerProxy)
WK_ADD_API_MAPPING(WKMediaCacheManagerRef, WebMediaCacheManagerProxy)
WK_ADD_API_MAPPING(WKNavigationDataRef, WebNavigationData)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (120214 => 120215)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2012-06-13 16:13:19 UTC (rev 120215)
@@ -73,7 +73,6 @@
typedef void (*WKPageDidNewFirstVisuallyNonEmptyLayoutCallback)(WKPageRef page, WKTypeRef userData, const void *clientInfo);
typedef void (*WKPageWillGoToBackForwardListItemCallback)(WKPageRef page, WKBackForwardListItemRef item, WKTypeRef userData, const void *clientInfo);
typedef void (*WKPagePluginDidFailCallback)(WKPageRef page, WKErrorCode errorCode, WKStringRef mimeType, WKStringRef pluginIdentifier, WKStringRef pluginVersion, const void* clientInfo);
-typedef void (*WKPageDidReceiveIntentForFrameCallback)(WKPageRef page, WKFrameRef frame, WKIntentDataRef intent, const void *clientInfo);
// Deprecated
typedef void (*WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0)(WKPageRef page, WKStringRef mimeType, const void* clientInfo);
@@ -121,13 +120,10 @@
WKPageCallback interactionOccurredWhileProcessUnresponsive;
WKPagePluginDidFailCallback pluginDidFail;
-
- // Version 2
- WKPageDidReceiveIntentForFrameCallback didReceiveIntentForFrame;
};
typedef struct WKPageLoaderClient WKPageLoaderClient;
-enum { kWKPageLoaderClientCurrentVersion = 2 };
+enum { kWKPageLoaderClientCurrentVersion = 1 };
// Policy Client.
typedef void (*WKPageDecidePolicyForNavigationActionCallback)(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp (120214 => 120215)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2012-06-13 16:13:19 UTC (rev 120215)
@@ -149,7 +149,6 @@
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail
- 0, // didReceiveIntentForFrame
};
WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
WKPageSetPageLoaderClient(wkPage, &wkLoaderClient);
Deleted: trunk/Source/WebKit2/UIProcess/WebIntentData.cpp (120214 => 120215)
--- trunk/Source/WebKit2/UIProcess/WebIntentData.cpp 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/UIProcess/WebIntentData.cpp 2012-06-13 16:13:19 UTC (rev 120215)
@@ -1,47 +0,0 @@
-/*
- * 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 "WebIntentData.h"
-
-#if ENABLE(WEB_INTENTS)
-
-namespace WebKit {
-
-WebIntentData::WebIntentData(const IntentData& store)
- : m_store(store)
-{
-}
-
-PassRefPtr<WebSerializedScriptValue> WebIntentData::data() const
-{
- Vector<uint8_t> dataCopy = m_store.data;
- return WebSerializedScriptValue::adopt(dataCopy);
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(WEB_INTENTS)
-
Deleted: trunk/Source/WebKit2/UIProcess/WebIntentData.h (120214 => 120215)
--- trunk/Source/WebKit2/UIProcess/WebIntentData.h 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/UIProcess/WebIntentData.h 2012-06-13 16:13:19 UTC (rev 120215)
@@ -1,67 +0,0 @@
-/*
- * 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 WebIntentData_h
-#define WebIntentData_h
-
-#if ENABLE(WEB_INTENTS)
-
-#include "APIObject.h"
-#include "IntentData.h"
-#include "WebSerializedScriptValue.h"
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-class WebIntentData : public APIObject {
-public:
- static const Type APIType = TypeIntentData;
-
- static PassRefPtr<WebIntentData> create(const IntentData& store)
- {
- return adoptRef(new WebIntentData(store));
- }
-
- virtual ~WebIntentData() { }
-
- const String& action() const { return m_store.action; }
- const String& payloadType() const { return m_store.type; }
- PassRefPtr<WebSerializedScriptValue> data() const;
- const HashMap<String, String>& extras() const { return m_store.extras; }
- const Vector<WebCore::KURL>& suggestions() const { return m_store.suggestions; }
-
-private:
- WebIntentData(const IntentData&);
-
- virtual Type type() const { return APIType; }
-
- IntentData m_store;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(WEB_INTENTS)
-
-#endif // WebIntentData_h
Modified: trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp (120214 => 120215)
--- trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2012-06-13 16:13:19 UTC (rev 120215)
@@ -27,9 +27,8 @@
#include "WebLoaderClient.h"
#include "ImmutableArray.h"
-#include "WKAPICast.h"
#include "WebBackForwardListItem.h"
-#include "WebIntentData.h"
+#include "WKAPICast.h"
#include <string.h>
using namespace WebCore;
@@ -164,16 +163,6 @@
m_client.didDetectXSSForFrame(toAPI(page), toAPI(frame), toAPI(userData), m_client.clientInfo);
}
-#if ENABLE(WEB_INTENTS)
-void WebLoaderClient::didReceiveIntentForFrame(WebPageProxy* page, WebFrameProxy* frame, WebIntentData* intentData)
-{
- if (!m_client.didReceiveIntentForFrame)
- return;
-
- m_client.didReceiveIntentForFrame(toAPI(page), toAPI(frame), toAPI(intentData), m_client.clientInfo);
-}
-#endif
-
bool WebLoaderClient::canAuthenticateAgainstProtectionSpaceInFrame(WebPageProxy* page, WebFrameProxy* frame, WebProtectionSpace* protectionSpace)
{
if (!m_client.canAuthenticateAgainstProtectionSpaceInFrame)
Modified: trunk/Source/WebKit2/UIProcess/WebLoaderClient.h (120214 => 120215)
--- trunk/Source/WebKit2/UIProcess/WebLoaderClient.h 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/UIProcess/WebLoaderClient.h 2012-06-13 16:13:19 UTC (rev 120215)
@@ -47,10 +47,6 @@
class WebPageProxy;
class WebProtectionSpace;
-#if ENABLE(WEB_INTENTS)
-class WebIntentData;
-#endif
-
class WebLoaderClient : public APIClient<WKPageLoaderClient, kWKPageLoaderClientCurrentVersion> {
public:
void didStartProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
@@ -68,9 +64,6 @@
void didDisplayInsecureContentForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
void didRunInsecureContentForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
void didDetectXSSForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
-#if ENABLE(WEB_INTENTS)
- void didReceiveIntentForFrame(WebPageProxy*, WebFrameProxy*, WebIntentData*);
-#endif
// FIXME: didFirstVisuallyNonEmptyLayoutForFrame and didNewFirstVisuallyNonEmptyLayout should be merged.
// The only reason for both to exist is to experiment with different heuristics for the time being.
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (120214 => 120215)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-06-13 16:13:19 UTC (rev 120215)
@@ -33,7 +33,6 @@
#include "DrawingAreaProxy.h"
#include "EventDispatcherMessages.h"
#include "FindIndicator.h"
-#include "IntentData.h"
#include "Logging.h"
#include "MessageID.h"
#include "NativeWebKeyboardEvent.h"
@@ -62,7 +61,6 @@
#include "WebFramePolicyListenerProxy.h"
#include "WebFullScreenManagerProxy.h"
#include "WebInspectorProxy.h"
-#include "WebIntentData.h"
#include "WebNotificationManagerProxy.h"
#include "WebOpenPanelResultListenerProxy.h"
#include "WebPageCreationParameters.h"
@@ -2138,17 +2136,6 @@
m_loaderClient.didDetectXSSForFrame(this, frame, userData.get());
}
-#if ENABLE(WEB_INTENTS)
-void WebPageProxy::didReceiveIntentForFrame(uint64_t frameID, const IntentData& intentData)
-{
- WebFrameProxy* frame = process()->webFrame(frameID);
- MESSAGE_CHECK(frame);
-
- RefPtr<WebIntentData> webIntentData = WebIntentData::create(intentData);
- m_loaderClient.didReceiveIntentForFrame(this, frame, webIntentData.get());
-}
-#endif
-
void WebPageProxy::frameDidBecomeFrameSet(uint64_t frameID, bool value)
{
WebFrameProxy* frame = process()->webFrame(frameID);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (120214 => 120215)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2012-06-13 16:13:19 UTC (rev 120215)
@@ -156,10 +156,6 @@
class WebGestureEvent;
#endif
-#if ENABLE(WEB_INTENTS)
-struct IntentData;
-#endif
-
typedef GenericCallback<WKStringRef, StringImpl*> StringCallback;
typedef GenericCallback<WKSerializedScriptValueRef, WebSerializedScriptValue*> ScriptValueCallback;
@@ -713,10 +709,6 @@
void didStartProgress();
void didChangeProgress(double);
void didFinishProgress();
-
-#if ENABLE(WEB_INTENTS)
- void didReceiveIntentForFrame(uint64_t frameID, const IntentData&);
-#endif
void decidePolicyForNavigationAction(uint64_t frameID, uint32_t navigationType, uint32_t modifiers, int32_t mouseButton, const WebCore::ResourceRequest&, uint64_t listenerID, CoreIPC::ArgumentDecoder*, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
void decidePolicyForNewWindowAction(uint64_t frameID, uint32_t navigationType, uint32_t modifiers, int32_t mouseButton, const WebCore::ResourceRequest&, const String& frameName, uint64_t listenerID, CoreIPC::ArgumentDecoder*);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (120214 => 120215)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2012-06-13 16:13:19 UTC (rev 120215)
@@ -89,11 +89,6 @@
DecidePolicyForNewWindowAction(uint64_t frameID, uint32_t navigationType, uint32_t modifiers, int32_t mouseButton, WebCore::ResourceRequest request, WTF::String frameName, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData)
UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData)
- # Intent messages
-#if ENABLE(WEB_INTENTS)
- DidReceiveIntentForFrame(uint64_t frameID, WebKit::IntentData intent)
-#endif
-
# Progress messages
DidChangeProgress(double value)
DidFinishProgress()
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (120214 => 120215)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-06-13 16:13:19 UTC (rev 120215)
@@ -33,7 +33,6 @@
#include "InjectedBundleDOMWindowExtension.h"
#include "InjectedBundleNavigationAction.h"
#include "InjectedBundleUserMessageCoders.h"
-#include "IntentData.h"
#include "PlatformCertificateInfo.h"
#include "PluginView.h"
#include "StringPairVector.h"
@@ -1539,22 +1538,9 @@
#endif // PLATFORM(WIN) && USE(CFNETWORK)
#if ENABLE(WEB_INTENTS)
-void WebFrameLoaderClient::dispatchIntent(PassRefPtr<IntentRequest> request)
+void WebFrameLoaderClient::dispatchIntent(PassRefPtr<IntentRequest>)
{
- WebPage* webPage = m_frame->page();
- if (!webPage)
- return;
-
- IntentData intentData;
- Intent* coreIntent = request->intent();
- ASSERT(coreIntent);
- intentData.action = ""
- intentData.type = coreIntent->type();
- intentData.data = ""
- intentData.extras = coreIntent->extras();
- intentData.suggestions = coreIntent->suggestions();
-
- webPage->send(Messages::WebPageProxy::DidReceiveIntentForFrame(m_frame->frameID(), intentData));
+ notImplemented();
}
#endif
Modified: trunk/Tools/ChangeLog (120214 => 120215)
--- trunk/Tools/ChangeLog 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Tools/ChangeLog 2012-06-13 16:13:19 UTC (rev 120215)
@@ -1,3 +1,17 @@
+2012-06-13 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r120209.
+ http://trac.webkit.org/changeset/120209
+ https://bugs.webkit.org/show_bug.cgi?id=89007
+
+ Broke the WebKit2 mac build. (Requested by andersca on
+ #webkit).
+
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController awakeFromNib]):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+
2012-06-13 Zoltan Horvath <[email protected]>
check-webkit-style needs to respect Qt API coding style
Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (120214 => 120215)
--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2012-06-13 16:13:19 UTC (rev 120215)
@@ -612,7 +612,6 @@
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail
- 0, // didReceiveIntentForFrame
};
WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (120214 => 120215)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2012-06-13 15:35:06 UTC (rev 120214)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2012-06-13 16:13:19 UTC (rev 120215)
@@ -409,7 +409,6 @@
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail
- 0, // didReceiveIntentForFrame
};
WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient);
}
