Fine tune Web Intents Chromium API

https://bugs.webkit.org/show_bug.cgi?id=76754

Patch by Greg Billock <gbillock@google.com> on 2012-01-23
Reviewed by Darin Fisher.

* public/WebIntent.h:
* public/WebIntentServiceInfo.h:
* src/WebIntent.cpp:
* src/WebIntentServiceInfo.cpp:
(WebKit::WebIntentServiceInfo::WebIntentServiceInfo):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 46cf3fa..eb7f41d 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2012-01-23  Greg Billock  <gbillock@google.com>
+
+        Fine tune Web Intents Chromium API
+        https://bugs.webkit.org/show_bug.cgi?id=76754
+
+        Reviewed by Darin Fisher.
+
+        * public/WebIntent.h:
+        * public/WebIntentServiceInfo.h:
+        * src/WebIntent.cpp:
+        * src/WebIntentServiceInfo.cpp:
+        (WebKit::WebIntentServiceInfo::WebIntentServiceInfo):
+
 2012-01-23  Shawn Singh  <shawnsingh@chromium.org>
 
         [chromium] updateRect is incorrect when contentBounds != bounds

diff --git a/Source/WebKit/chromium/public/WebIntent.h b/Source/WebKit/chromium/public/WebIntent.h
index a64e7ee..d01098f 100644 (file)
--- a/Source/WebKit/chromium/public/WebIntent.h
+++ b/Source/WebKit/chromium/public/WebIntent.h
@@ -62,9 +62,6 @@ public:
     WEBKIT_EXPORT WebString type() const;
     WEBKIT_EXPORT WebString data() const;
 
-    // FIXME: delete this.
-    WEBKIT_EXPORT int identifier() const;
-
 #if WEBKIT_IMPLEMENTATION
     WebIntent(const WTF::PassRefPtr<WebCore::Intent>&);
 #endif

diff --git a/Source/WebKit/chromium/public/WebIntentServiceInfo.h b/Source/WebKit/chromium/public/WebIntentServiceInfo.h
index 5879be8..b296ca4 100644 (file)
--- a/Source/WebKit/chromium/public/WebIntentServiceInfo.h
+++ b/Source/WebKit/chromium/public/WebIntentServiceInfo.h
@@ -67,6 +67,11 @@ public:
     WEBKIT_EXPORT WebString disposition() const;
     WEBKIT_EXPORT void setDisposition(const WebString&);
 
+#if WEBKIT_IMPLEMENTATION
+    WebIntentServiceInfo(const WebString& action, const WebString& type, const WebURL& href,
+                         const WebString& title, const WebString& disposition);
+#endif
+
 private:
     WebString m_action;
     WebString m_type;

diff --git a/Source/WebKit/chromium/src/WebIntent.cpp b/Source/WebKit/chromium/src/WebIntent.cpp
index 2358bfa..77d766d 100644 (file)
--- a/Source/WebKit/chromium/src/WebIntent.cpp
+++ b/Source/WebKit/chromium/src/WebIntent.cpp
@@ -102,9 +102,4 @@ WebString WebIntent::data() const
 #endif
 }
 
-int WebIntent::identifier() const
-{
-    return 0;
-}
-
 } // namespace WebKit

diff --git a/Source/WebKit/chromium/src/WebIntentServiceInfo.cpp b/Source/WebKit/chromium/src/WebIntentServiceInfo.cpp
index bd19834..f08ab48 100644 (file)
--- a/Source/WebKit/chromium/src/WebIntentServiceInfo.cpp
+++ b/Source/WebKit/chromium/src/WebIntentServiceInfo.cpp
@@ -83,4 +83,17 @@ void WebIntentServiceInfo::setDisposition(const WebString& disposition)
     m_disposition = disposition;
 }
 
+WebIntentServiceInfo::WebIntentServiceInfo(const WebString& action,
+                                           const WebString& type,
+                                           const WebURL& href,
+                                           const WebString& title,
+                                           const WebString& disposition)
+    : m_action(action)
+    , m_type(type)
+    , m_href(href)
+    , m_title(title)
+    , m_disposition(disposition)
+{
+}
+
 } // namespace WebKit