Changeset 117793 in webkit

Timestamp:

May 21, 2012, 9:24:06 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Add suggestions field to web intents API.
​https://bugs.webkit.org/show_bug.cgi?id=86791

Patch by Greg Billock <​gbillock@google.com> on 2012-05-21
Reviewed by Adam Barth.

Source/WebCore:

The |suggestions| field is used by the client to avoid an empty
web intents selection window (picker). The UA can add the given
suggestions to the picker if it would otherwise be empty. See
​http://dvcs.w3.org/hg/web-intents/raw-file/tip/spec/Overview.html#intent-parameters-dictionary

• Modules/intents/DeliveredIntent.cpp:

(WebCore::DeliveredIntent::DeliveredIntent):

• Modules/intents/Intent.cpp:

(WebCore::Intent::create):
(WebCore::Intent::Intent):

• Modules/intents/Intent.h:

(WebCore::Intent::suggestions):
(Intent):

Source/WebKit/chromium:

• public/WebIntent.h:

(WebIntent):

• src/WebIntent.cpp:

(WebKit::WebIntent::suggestions):
(WebKit):

Location:

trunk

Files:

• LayoutTests/webintents/web-intents-obj-constructor-expected.txt (modified) (2 diffs)
• LayoutTests/webintents/web-intents-obj-constructor.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/intents/DeliveredIntent.cpp (modified) (2 diffs)
• Source/WebCore/Modules/intents/Intent.cpp (modified) (4 diffs)
• Source/WebCore/Modules/intents/Intent.h (modified) (3 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebIntent.h (modified) (1 diff)
• Source/WebKit/chromium/src/WebIntent.cpp (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebViewHost.cpp (modified) (2 diffs)

trunk/LayoutTests/webintents/web-intents-obj-constructor-expected.txt

@@ -6 +6 @@
 Received Web Intent: action=action1 type=text/plain+port
 Have 1 ports
+Received Web Intent: action=action1 type=text/plain+suggestions
+Have suggestion http://www.example.com/
 PASS successfullyParsed is true
 
@@ -44 +46 @@
 * sent intent with extras
 * sent intent with port
+PASS new WebKitIntent(badPortIntentObj) threw exception Error: DATA_CLONE_ERR: DOM Exception 25.
+PASS new WebKitIntent(suggestionsIntent) threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebKitIntent(suggestionsIntent) threw exception Error: SYNTAX_ERR: DOM Exception 12.
+* sent intent with suggestions
 

trunk/LayoutTests/webintents/web-intents-obj-constructor.html

@@ -93 +93 @@
         navigator.webkitStartActivity(portIntent);
         debug("* sent intent with port");
+
+        // Ports, if present, must be put in |transfer|.
+        var badchannel = new MessageChannel();
+        badchannel.port2.onMessage = function() {
+            debug("* got message");
+        }
+        badPortIntentObj = 
+            {"action":"action1",
+             "type":"text/plain+badport",
+             "data":badchannel.port1};
+        shouldThrow("new WebKitIntent(badPortIntentObj)", "'Error: DATA_CLONE_ERR: DOM Exception 25'");
+
+        suggestionsIntent =
+            {"action":"action1",
+             "type":"text/plain+suggestions",
+             "data":"message",
+             "suggestions":["www.example.com/", "http://ww2.example.com"]};
+        shouldThrow("new WebKitIntent(suggestionsIntent)", "'Error: SYNTAX_ERR: DOM Exception 12'");
+
+        suggestionsIntent.suggestions = [15];
+        shouldThrow("new WebKitIntent(suggestionsIntent)", "'Error: SYNTAX_ERR: DOM Exception 12'");
+
+        suggestionsIntent.suggestions = ["http://www.example.com/"];
+        navigator.webkitStartActivity(new WebKitIntent(suggestionsIntent));
+        debug("* sent intent with suggestions");
+
     }
     </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-21  Greg Billock  <gbillock@google.com>
+
+        Add suggestions field to web intents API.
+        https://bugs.webkit.org/show_bug.cgi?id=86791
+
+        Reviewed by Adam Barth.
+
+        The |suggestions| field is used by the client to avoid an empty
+        web intents selection window (picker). The UA can add the given
+        suggestions to the picker if it would otherwise be empty. See
+        http://dvcs.w3.org/hg/web-intents/raw-file/tip/spec/Overview.html#intent-parameters-dictionary
+
+        * Modules/intents/DeliveredIntent.cpp:
+        (WebCore::DeliveredIntent::DeliveredIntent):
+        * Modules/intents/Intent.cpp:
+        (WebCore::Intent::create):
+        (WebCore::Intent::Intent):
+        * Modules/intents/Intent.h:
+        (WebCore::Intent::suggestions):
+        (Intent):
+
 2012-05-21  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/Modules/intents/DeliveredIntent.cpp

@@ -36 +36 @@
 #include "Frame.h"
 #include "SerializedScriptValue.h"
+#include <wtf/Vector.h>
 
 namespace WebCore {
@@ -49 +50 @@
                                  PassRefPtr<SerializedScriptValue> data, PassOwnPtr<MessagePortArray> ports,
                                  const HashMap<String, String>& extras)
-    : Intent(action, type, data, PassOwnPtr<MessagePortChannelArray>(), extras, KURL())
+    : Intent(action, type, data, PassOwnPtr<MessagePortChannelArray>(), extras, KURL(), Vector<KURL>())
     , FrameDestructionObserver(frame)
     , m_client(client)

trunk/Source/WebCore/Modules/intents/Intent.cpp

@@ -35 +35 @@
 #include "MessagePort.h"
 #include "SerializedScriptValue.h"
+#include <wtf/HashSet.h>
 
 namespace WebCore {
@@ -51 +52 @@
     OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(&ports, ec);
 
-    WTF::HashMap<String, String> extras;
-    KURL serviceUrl;
+    HashMap<String, String> extras;
+    KURL serviceURL;
+    Vector<KURL> suggestions;
 
-    return adoptRef(new Intent(action, type, data, channels.release(), extras, serviceUrl));
+    return adoptRef(new Intent(action, type, data, channels.release(), extras, serviceURL, suggestions));
 }
 
@@ -97 +99 @@
     }
 
-    WTF::HashMap<String, String> extras;
+    HashMap<String, String> extras;
     Dictionary extrasDictionary;
     if (options.get("extras", extrasDictionary))
         extrasDictionary.getOwnPropertiesAsStringHashMap(extras);
 
-    return adoptRef(new Intent(action, type, serializedData.release(), channels.release(), extras, serviceUrl));
+    HashSet<AtomicString> suggestionsStrings;
+    Vector<KURL> suggestions;
+    if (options.get("suggestions", suggestionsStrings)) {
+        for (HashSet<AtomicString>::iterator iter = suggestionsStrings.begin(); iter != suggestionsStrings.end(); ++iter) {
+            KURL suggestedURL = KURL(KURL(), *iter);
+            if (!suggestedURL.isValid()) {
+                ec = SYNTAX_ERR;
+                return 0;
+            }
+            suggestions.append(suggestedURL);
+        }
+    }
+
+    return adoptRef(new Intent(action, type, serializedData.release(), channels.release(), extras, serviceUrl, suggestions));
 }
 
 Intent::Intent(const String& action, const String& type,
                PassRefPtr<SerializedScriptValue> data, PassOwnPtr<MessagePortChannelArray> ports,
-               const WTF::HashMap<String, String>& extras, const KURL& service)
+               const HashMap<String, String>& extras, const KURL& service, const Vector<KURL>& suggestions)
     : m_action(action)
     , m_type(type)
@@ -113 +128 @@
     , m_service(service)
     , m_extras(extras)
+    , m_suggestions(suggestions)
 {
     if (data)

trunk/Source/WebCore/Modules/intents/Intent.h

@@ -41 +41 @@
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
+#include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
@@ -62 +63 @@
     MessagePortChannelArray* messagePorts() const { return m_ports.get(); }
     const KURL& service() const { return m_service; }
-    const WTF::HashMap<String, String>& extras() const { return m_extras; }
+    const HashMap<String, String>& extras() const { return m_extras; }
+    const Vector<KURL>& suggestions() const { return m_suggestions; }
 
 protected:
     Intent(const String& action, const String& type,
            PassRefPtr<SerializedScriptValue> data, PassOwnPtr<MessagePortChannelArray> ports,
-           const WTF::HashMap<String, String>& extras, const KURL& service);
+           const HashMap<String, String>& extras, const KURL& service, const Vector<KURL>& suggestions);
 
 private:
@@ -75 +77 @@
     OwnPtr<MessagePortChannelArray> m_ports;
     KURL m_service;
-    WTF::HashMap<String, String> m_extras;
+    HashMap<String, String> m_extras;
+    Vector<KURL> m_suggestions;
 };
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-21  Greg Billock  <gbillock@google.com>
+
+        Add suggestions field to web intents API.
+        https://bugs.webkit.org/show_bug.cgi?id=86791
+
+        Reviewed by Adam Barth.
+
+        * public/WebIntent.h:
+        (WebIntent):
+        * src/WebIntent.cpp:
+        (WebKit::WebIntent::suggestions):
+        (WebKit):
+
 2012-05-20  Kinuko Yasuda  <kinuko@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebIntent.h

@@ -67 +67 @@
     WEBKIT_EXPORT WebString data() const;
     WEBKIT_EXPORT WebURL service() const;
+    WEBKIT_EXPORT WebVector<WebURL> suggestions() const;
 
     // Retrieve a list of the names of extra metadata associated with the

trunk/Source/WebKit/chromium/src/WebIntent.cpp

@@ -128 +128 @@
 }
 
+WebVector<WebURL> WebIntent::suggestions() const
+{
+#if ENABLE(WEB_INTENTS)
+    WebVector<WebURL> suggestions(m_private->suggestions().size());
+    for (size_t i = 0; i < m_private->suggestions().size(); ++i)
+        suggestions[i] = m_private->suggestions().at(i);
+    return suggestions;
+#else
+    return WebVector<WebURL>();
+#endif
+}
+
 WebMessagePortChannelArray* WebIntent::messagePortChannelsRelease() const
 {

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -1347 +1347 @@
         delete ports;
     }
+
     if (!request.intent().service().isEmpty())
         printf("Explicit intent service: %s\n", request.intent().service().spec().data());
+
     WebVector<WebString> extras = request.intent().extrasNames();
     for (size_t i = 0; i < extras.size(); ++i) {
@@ -1354 +1356 @@
                request.intent().extrasValue(extras[i]).utf8().data());
     }
+
+    WebVector<WebURL> suggestions = request.intent().suggestions();
+    for (size_t i = 0; i < suggestions.size(); ++i)
+        printf("Have suggestion %s\n", suggestions[i].spec().data());
 }