Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)

1 files changed, 5 insertions, 7 deletions

diff --git a/Source/WebKit/chromium/public/WebFrameClient.h b/Source/WebKit/chromium/public/WebFrameClient.h
index 94abe83fb..d0507e3d1 100644
--- a/Source/WebKit/chromium/public/WebFrameClient.h
+++ b/Source/WebKit/chromium/public/WebFrameClient.h
@@ -55,8 +55,9 @@ class WebDataSource;
 class WebDOMEvent;
 class WebFormElement;
 class WebFrame;
-class WebIntentServiceInfo;
 class WebIntent;
+class WebIntentRequest;
+class WebIntentServiceInfo;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
 class WebNode;
@@ -83,9 +84,6 @@ public:
     virtual WebPlugin* createPlugin(WebFrame*, const WebPluginParams&) { return 0; }
 
     // May return null.
-    virtual WebWorker* createWorker(WebFrame*, WebSharedWorkerClient*) { return 0; }
-
-    // May return null.
     virtual WebSharedWorker* createSharedWorker(WebFrame*, const WebURL&, const WebString&, unsigned long long) { return 0; }
 
     // May return null.
@@ -383,9 +381,9 @@ public:
     // Register a service to handle Web Intents.
     virtual void registerIntentService(WebFrame*, const WebIntentServiceInfo&) { }
 
-    // Start a Web Intents activity. Replies to this request should be sent to
-    // the WebFrame starting the activity.
-    virtual void dispatchIntent(WebFrame*, const WebIntent&) { }
+    // Start a Web Intents activity. The callee uses the |WebIntentRequest|
+    // object to coordinate replies to the intent invocation.
+    virtual void dispatchIntent(WebFrame*, const WebIntentRequest&) { }
 
     // Messages ------------------------------------------------------