Remove unused FrameLoaderClient::dispatchWillOpenSocketStream().
authorakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 8 Feb 2014 22:05:38 +0000 (22:05 +0000)
committerakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 8 Feb 2014 22:05:38 +0000 (22:05 +0000)
<https://webkit.org/b/128472>

Nobody listens for this callback anymore so remove it.

Reviewed by Anders Carlsson.

* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::willOpenSocketStream):
* loader/FrameLoaderClient.h:

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

Source/WebCore/ChangeLog
Source/WebCore/Modules/websockets/WebSocketChannel.cpp
Source/WebCore/loader/FrameLoaderClient.h

index f7ac2b31f2afedc3019b926032bb505ea12216ea..08a69f9ed8f3b7dcdf6078ca71f70c1c1d139445 100644 (file)
@@ -1,3 +1,16 @@
+2014-02-08  Andreas Kling  <akling@apple.com>
+
+        Remove unused FrameLoaderClient::dispatchWillOpenSocketStream().
+        <https://webkit.org/b/128472>
+
+        Nobody listens for this callback anymore so remove it.
+
+        Reviewed by Anders Carlsson.
+
+        * Modules/websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::willOpenSocketStream):
+        * loader/FrameLoaderClient.h:
+
 2014-02-08  Ryosuke Niwa  <rniwa@webkit.org>
 
         Split UserTriggered into FireSelectEvent and RevealSelection for selection options
index 81c6f765d28db8a6c7b4002a6490a010e8254d2a..93e075a687a0bcc0a944c21bc05896f1f93ca1f3 100644 (file)
@@ -41,8 +41,6 @@
 #include "FileError.h"
 #include "FileReaderLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
-#include "FrameLoaderClient.h"
 #include "InspectorInstrumentation.h"
 #include "Logging.h"
 #include "Page.h"
@@ -239,12 +237,9 @@ void WebSocketChannel::resume()
         m_resumeTimer.startOneShot(0);
 }
 
-void WebSocketChannel::willOpenSocketStream(SocketStreamHandle* handle)
+void WebSocketChannel::willOpenSocketStream(SocketStreamHandle*)
 {
     LOG(Network, "WebSocketChannel %p willOpenSocketStream()", this);
-    ASSERT(handle);
-    if (m_document->frame())
-        m_document->frame()->loader().client().dispatchWillOpenSocketStream(handle);
 }
 
 void WebSocketChannel::didOpenSocketStream(SocketStreamHandle* handle)
index c81bdba41d5fc2f1ddff8a1fc29e372c6891abd8..4daefba6ad6ee2cf5a9522a098341aae6b3c3936 100644 (file)
@@ -93,7 +93,6 @@ namespace WebCore {
 #endif
     class SecurityOrigin;
     class SharedBuffer;
-    class SocketStreamHandle;
     class StringWithDirection;
     class SubstituteData;
     class Widget;
@@ -312,8 +311,6 @@ namespace WebCore {
 
         virtual bool shouldPaintBrokenImage(const URL&) const { return true; }
 
-        virtual void dispatchWillOpenSocketStream(SocketStreamHandle*) { }
-
         virtual void dispatchGlobalObjectAvailable(DOMWrapperWorld&) { }
         virtual void dispatchWillDisconnectDOMWindowExtensionFromGlobalObject(DOMWindowExtension*) { }
         virtual void dispatchDidReconnectDOMWindowExtensionToGlobalObject(DOMWindowExtension*) { }