1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/public/WebFrameClient.h b/Source/WebKit/chromium/public/WebFrameClient.h
index 2e1890a..d1fe751 100644
--- a/Source/WebKit/chromium/public/WebFrameClient.h
+++ b/Source/WebKit/chromium/public/WebFrameClient.h
@@ -41,6 +41,7 @@ namespace WebKit {
 
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
+class WebClipboard;
 class WebCookieJar;
 class WebDataSource;
 class WebFormElement;
@@ -88,6 +89,10 @@ public:
     // WebKitClient::cookieJar() will be called to access cookies.
     virtual WebCookieJar* cookieJar(WebFrame*) { return 0; }
 
+    // A frame specific clipboard. May return null, in which case the caller
+    // should assume there is no data in the clipboard.
+    virtual WebClipboard* clipboard() { return 0; }
+
 
     // General notifications -----------------------------------------------
 
@@ -279,7 +284,7 @@ public:
     // The indicated security origin has run active content (such as a
     // script) from an insecure source.  Note that the insecure content can
     // spread to other frames in the same origin.
-    virtual void didRunInsecureContent(WebFrame*, const WebSecurityOrigin&) { }
+    virtual void didRunInsecureContent(WebFrame*, const WebSecurityOrigin&, const WebURL& insecureURL) { }
 
 
     // Script notifications ------------------------------------------------
@@ -362,9 +367,6 @@ public:
         WebFrame*, WebFileSystem::Type, long long size,
         bool create, WebFileSystemCallbacks*) { }
 
-    // FIXME: This method should be deleted once chromium implements the new method above.
-    virtual void openFileSystem(WebFrame* frame, WebFileSystem::Type type, long long size, WebFileSystemCallbacks* callbacks) { return openFileSystem(frame, type, size, true, callbacks); }
-
 protected:
     ~WebFrameClient() { }
 };