Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (124697 => 124698)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-08-04 09:59:30 UTC (rev 124697)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-08-04 10:29:08 UTC (rev 124698)
@@ -159,7 +159,6 @@
Shared/WebGraphicsContext.cpp
Shared/WebHitTestResult.cpp
Shared/WebImage.cpp
- Shared/WebIntentData.cpp
Shared/WebIntentServiceInfo.cpp
Shared/WebKeyboardEvent.cpp
Shared/WebLayerTreeInfo.cpp
@@ -253,6 +252,7 @@
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 (124697 => 124698)
--- trunk/Source/WebKit2/ChangeLog 2012-08-04 09:59:30 UTC (rev 124697)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-04 10:29:08 UTC (rev 124698)
@@ -1,3 +1,34 @@
+2012-08-04 Christophe Dumez <[email protected]>
+
+ [WK2] Move WebIntentData from Shared to UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=93175
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Move WebIntentData from Shared to UIProcess to
+ prepare for MessagePorts support in WK2.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * UIProcess/WebIntentData.cpp: Renamed from Source/WebKit2/Shared/WebIntentData.cpp.
+ (WebKit):
+ (WebKit::WebIntentData::WebIntentData):
+ (WebKit::WebIntentData::data):
+ (WebKit::WebIntentData::suggestions):
+ (WebKit::WebIntentData::extra):
+ (WebKit::WebIntentData::extras):
+ * UIProcess/WebIntentData.h: Renamed from Source/WebKit2/Shared/WebIntentData.h.
+ (WebKit):
+ (WebIntentData):
+ (WebKit::WebIntentData::create):
+ (WebKit::WebIntentData::~WebIntentData):
+ (WebKit::WebIntentData::action):
+ (WebKit::WebIntentData::payloadType):
+ (WebKit::WebIntentData::service):
+ (WebKit::WebIntentData::store):
+ (WebKit::WebIntentData::type):
+
2012-08-03 Anders Carlsson <[email protected]>
Nothing happens when clicking on the unavailable plug-in button for a blocked plug-in
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (124697 => 124698)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2012-08-04 09:59:30 UTC (rev 124697)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2012-08-04 10:29:08 UTC (rev 124698)
@@ -469,8 +469,6 @@
Source/WebKit2/Shared/WebHitTestResult.h \
Source/WebKit2/Shared/WebImage.cpp \
Source/WebKit2/Shared/WebImage.h \
- Source/WebKit2/Shared/WebIntentData.cpp \
- Source/WebKit2/Shared/WebIntentData.h \
Source/WebKit2/Shared/WebIntentServiceInfo.cpp \
Source/WebKit2/Shared/WebIntentServiceInfo.h \
Source/WebKit2/Shared/WebKeyboardEvent.cpp \
@@ -871,6 +869,8 @@
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 \
Deleted: trunk/Source/WebKit2/Shared/WebIntentData.cpp (124697 => 124698)
--- trunk/Source/WebKit2/Shared/WebIntentData.cpp 2012-08-04 09:59:30 UTC (rev 124697)
+++ trunk/Source/WebKit2/Shared/WebIntentData.cpp 2012-08-04 10:29:08 UTC (rev 124698)
@@ -1,75 +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)
-
-#include "ImmutableArray.h"
-#include "ImmutableDictionary.h"
-#include "WebString.h"
-#include "WebURL.h"
-
-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);
-}
-
-PassRefPtr<ImmutableArray> WebIntentData::suggestions() const
-{
- const size_t numSuggestions = m_store.suggestions.size();
- Vector<RefPtr<APIObject> > wkSuggestions(numSuggestions);
- for (unsigned i = 0; i < numSuggestions; ++i)
- wkSuggestions[i] = WebURL::create(m_store.suggestions[i]);
- return ImmutableArray::adopt(wkSuggestions);
-}
-
-String WebIntentData::extra(const String& key) const
-{
- return m_store.extras.get(key);
-}
-
-PassRefPtr<ImmutableDictionary> WebIntentData::extras() const
-{
- ImmutableDictionary::MapType wkExtras;
- HashMap<String, String>::const_iterator end = m_store.extras.end();
- for (HashMap<String, String>::const_iterator it = m_store.extras.begin(); it != end; ++it)
- wkExtras.set(it->first, WebString::create(it->second));
- return ImmutableDictionary::adopt(wkExtras);
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(WEB_INTENTS)
-
Deleted: trunk/Source/WebKit2/Shared/WebIntentData.h (124697 => 124698)
--- trunk/Source/WebKit2/Shared/WebIntentData.h 2012-08-04 09:59:30 UTC (rev 124697)
+++ trunk/Source/WebKit2/Shared/WebIntentData.h 2012-08-04 10:29:08 UTC (rev 124698)
@@ -1,71 +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; }
- const WebCore::KURL& service() const { return m_store.service; }
- PassRefPtr<WebSerializedScriptValue> data() const;
- String extra(const String& key) const;
- PassRefPtr<ImmutableDictionary> extras() const;
- PassRefPtr<ImmutableArray> suggestions() const;
-
- const IntentData& store() const { return m_store; }
-
-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/Target.pri (124697 => 124698)
--- trunk/Source/WebKit2/Target.pri 2012-08-04 09:59:30 UTC (rev 124697)
+++ trunk/Source/WebKit2/Target.pri 2012-08-04 10:29:08 UTC (rev 124698)
@@ -112,7 +112,6 @@
Shared/WebGraphicsContext.h \
Shared/WebHitTestResult.h \
Shared/WebImage.h \
- Shared/WebIntentData.h \
Shared/WebIntentServiceInfo.h \
Shared/WebLayerTreeInfo.h \
Shared/WebNavigationDataStore.h \
@@ -267,6 +266,7 @@
UIProcess/WebIconDatabase.h \
UIProcess/WebIconDatabaseClient.h \
UIProcess/WebInspectorProxy.h \
+ UIProcess/WebIntentData.h \
UIProcess/WebKeyValueStorageManagerProxy.h \
UIProcess/WebLayerTreeRenderer.h \
UIProcess/WebLoaderClient.h \
@@ -495,7 +495,6 @@
Shared/WebHitTestResult.cpp \
Shared/WebKeyboardEvent.cpp \
Shared/WebImage.cpp \
- Shared/WebIntentData.cpp \
Shared/WebIntentServiceInfo.cpp \
Shared/WebLayerTreeInfo.cpp \
Shared/WebMouseEvent.cpp \
@@ -638,6 +637,7 @@
UIProcess/WebIconDatabase.cpp \
UIProcess/WebIconDatabaseClient.cpp \
UIProcess/WebInspectorProxy.cpp \
+ UIProcess/WebIntentData.cpp \
UIProcess/WebKeyValueStorageManagerProxy.cpp \
UIProcess/WebLayerTreeRenderer.cpp \
UIProcess/WebLoaderClient.cpp \
Copied: trunk/Source/WebKit2/UIProcess/WebIntentData.cpp (from rev 124697, trunk/Source/WebKit2/Shared/WebIntentData.cpp) (0 => 124698)
--- trunk/Source/WebKit2/UIProcess/WebIntentData.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/WebIntentData.cpp 2012-08-04 10:29:08 UTC (rev 124698)
@@ -0,0 +1,75 @@
+/*
+ * 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)
+
+#include "ImmutableArray.h"
+#include "ImmutableDictionary.h"
+#include "WebString.h"
+#include "WebURL.h"
+
+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);
+}
+
+PassRefPtr<ImmutableArray> WebIntentData::suggestions() const
+{
+ const size_t numSuggestions = m_store.suggestions.size();
+ Vector<RefPtr<APIObject> > wkSuggestions(numSuggestions);
+ for (unsigned i = 0; i < numSuggestions; ++i)
+ wkSuggestions[i] = WebURL::create(m_store.suggestions[i]);
+ return ImmutableArray::adopt(wkSuggestions);
+}
+
+String WebIntentData::extra(const String& key) const
+{
+ return m_store.extras.get(key);
+}
+
+PassRefPtr<ImmutableDictionary> WebIntentData::extras() const
+{
+ ImmutableDictionary::MapType wkExtras;
+ HashMap<String, String>::const_iterator end = m_store.extras.end();
+ for (HashMap<String, String>::const_iterator it = m_store.extras.begin(); it != end; ++it)
+ wkExtras.set(it->first, WebString::create(it->second));
+ return ImmutableDictionary::adopt(wkExtras);
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(WEB_INTENTS)
+
Copied: trunk/Source/WebKit2/UIProcess/WebIntentData.h (from rev 124697, trunk/Source/WebKit2/Shared/WebIntentData.h) (0 => 124698)
--- trunk/Source/WebKit2/UIProcess/WebIntentData.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/WebIntentData.h 2012-08-04 10:29:08 UTC (rev 124698)
@@ -0,0 +1,71 @@
+/*
+ * 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; }
+ const WebCore::KURL& service() const { return m_store.service; }
+ PassRefPtr<WebSerializedScriptValue> data() const;
+ String extra(const String& key) const;
+ PassRefPtr<ImmutableDictionary> extras() const;
+ PassRefPtr<ImmutableArray> suggestions() const;
+
+ const IntentData& store() const { return m_store; }
+
+private:
+ WebIntentData(const IntentData&);
+
+ virtual Type type() const { return APIType; }
+
+ IntentData m_store;
+};
+
+} // namespace WebKit
+
+#endif // ENABLE(WEB_INTENTS)
+
+#endif // WebIntentData_h
