Title: [105681] trunk/Source/WebKit/chromium
Revision
105681
Author
[email protected]
Date
2012-01-23 19:20:08 -0800 (Mon, 23 Jan 2012)

Log Message

Fine tune Web Intents Chromium API
https://bugs.webkit.org/show_bug.cgi?id=76754

Patch by Greg Billock <[email protected]> on 2012-01-23
Reviewed by Darin Fisher.

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

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (105680 => 105681)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-01-24 02:45:03 UTC (rev 105680)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-01-24 03:20:08 UTC (rev 105681)
@@ -1,3 +1,16 @@
+2012-01-23  Greg Billock  <[email protected]>
+
+        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  <[email protected]>
 
         [chromium] updateRect is incorrect when contentBounds != bounds

Modified: trunk/Source/WebKit/chromium/public/WebIntent.h (105680 => 105681)


--- trunk/Source/WebKit/chromium/public/WebIntent.h	2012-01-24 02:45:03 UTC (rev 105680)
+++ trunk/Source/WebKit/chromium/public/WebIntent.h	2012-01-24 03:20:08 UTC (rev 105681)
@@ -62,9 +62,6 @@
     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

Modified: trunk/Source/WebKit/chromium/public/WebIntentServiceInfo.h (105680 => 105681)


--- trunk/Source/WebKit/chromium/public/WebIntentServiceInfo.h	2012-01-24 02:45:03 UTC (rev 105680)
+++ trunk/Source/WebKit/chromium/public/WebIntentServiceInfo.h	2012-01-24 03:20:08 UTC (rev 105681)
@@ -67,6 +67,11 @@
     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;

Modified: trunk/Source/WebKit/chromium/src/WebIntent.cpp (105680 => 105681)


--- trunk/Source/WebKit/chromium/src/WebIntent.cpp	2012-01-24 02:45:03 UTC (rev 105680)
+++ trunk/Source/WebKit/chromium/src/WebIntent.cpp	2012-01-24 03:20:08 UTC (rev 105681)
@@ -102,9 +102,4 @@
 #endif
 }
 
-int WebIntent::identifier() const
-{
-    return 0;
-}
-
 } // namespace WebKit

Modified: trunk/Source/WebKit/chromium/src/WebIntentServiceInfo.cpp (105680 => 105681)


--- trunk/Source/WebKit/chromium/src/WebIntentServiceInfo.cpp	2012-01-24 02:45:03 UTC (rev 105680)
+++ trunk/Source/WebKit/chromium/src/WebIntentServiceInfo.cpp	2012-01-24 03:20:08 UTC (rev 105681)
@@ -83,4 +83,17 @@
     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
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to