summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/public/WebFrameClient.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/chromium/public/WebFrameClient.h')
-rw-r--r--Source/WebKit/chromium/public/WebFrameClient.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/WebKit/chromium/public/WebFrameClient.h b/Source/WebKit/chromium/public/WebFrameClient.h
index fa6fc7a33..9270d1ab9 100644
--- a/Source/WebKit/chromium/public/WebFrameClient.h
+++ b/Source/WebKit/chromium/public/WebFrameClient.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -63,6 +63,8 @@ class WebMediaPlayerClient;
class WebNode;
class WebPlugin;
class WebSharedWorker;
+class WebSharedWorkerClient;
+class WebSocketStreamHandle;
class WebStorageQuotaCallbacks;
class WebString;
class WebURL;
@@ -70,7 +72,6 @@ class WebURLLoader;
class WebURLRequest;
class WebURLResponse;
class WebWorker;
-class WebSharedWorkerClient;
struct WebPluginParams;
struct WebRect;
struct WebSize;
@@ -284,10 +285,6 @@ public:
// A reflected XSS was encountered in the page and suppressed.
virtual void didDetectXSS(WebFrame*, const WebURL&, bool didBlockEntirePage) { }
- // This frame adopted the resource that is being loaded. This happens when
- // an iframe, that is loading a subresource, is transferred between windows.
- virtual void didAdoptURLLoader(WebURLLoader*) { }
-
// Script notifications ------------------------------------------------
// Script in the page tried to allocate too much memory.
@@ -385,6 +382,11 @@ public:
// object to coordinate replies to the intent invocation.
virtual void dispatchIntent(WebFrame*, const WebIntentRequest&) { }
+ // WebSocket -----------------------------------------------------
+
+ // A WebSocket object is going to open new stream connection.
+ virtual void willOpenSocketStream(WebSocketStreamHandle*) { }
+
// Messages ------------------------------------------------------
// Notifies the embedder that a postMessage was issued on this frame, and