Introduce webkit_glue bridges for the new WebSocket Implementation.

webkit/child/webkitplatformsupport_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_
 #define WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/platform_file.h"
 #include "base/timer/timer.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "ui/base/layout.h"
 #include "webkit/child/resource_loader_bridge.h"
 #include "webkit/child/webkit_child_export.h"
 
 namespace base {
 class MessageLoop;
 }
 
 namespace WebKit {
+class WebSocketHandle;
 class WebSocketStreamHandle;
 }
 
 namespace webkit_glue {
 
 class WebSocketStreamHandleDelegate;
 class WebSocketStreamHandleBridge;
+class WebSocketHandleDelegate;
+class WebSocketHandleBridge;
 
 class WEBKIT_CHILD_EXPORT WebKitPlatformSupportImpl :
     NON_EXPORTED_BASE(public WebKit::Platform) {
  public:
   WebKitPlatformSupportImpl();
   virtual ~WebKitPlatformSupportImpl();
 
   // Platform methods (partial implementation):
   virtual base::PlatformFile databaseOpenFile(
       const WebKit::WebString& vfs_file_name, int desired_flags);
@@ skipping 13 matching lines @@
   virtual void startHeapProfiling(const WebKit::WebString& prefix);
   virtual void stopHeapProfiling() OVERRIDE;
   virtual void dumpHeapProfiling(const WebKit::WebString& reason);
   virtual WebKit::WebString getHeapProfile() OVERRIDE;
 
   virtual bool processMemorySizesInBytes(size_t* private_bytes,
                                          size_t* shared_bytes);
   virtual bool memoryAllocatorWasteInBytes(size_t* size);
   virtual WebKit::WebURLLoader* createURLLoader();
   virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle();
+  virtual WebKit::WebSocketHandle* createWebSocketHandle();
   virtual WebKit::WebString userAgent(const WebKit::WebURL& url);
   virtual WebKit::WebData parseDataURL(
       const WebKit::WebURL& url, WebKit::WebString& mimetype,
       WebKit::WebString& charset);
   virtual WebKit::WebURLError cancelledError(const WebKit::WebURL& url) const;
   virtual void decrementStatsCounter(const char* name);
   virtual void incrementStatsCounter(const char* name);
   virtual void histogramCustomCounts(
     const char* name, int sample, int min, int max, int bucket_count);
   virtual void histogramEnumeration(
@@ skipping 42 matching lines @@
 
   // Returns the raw data for a resource.  This resource must have been
   // specified as BINDATA in the relevant .rc file.
   virtual base::StringPiece GetDataResource(int resource_id,
                                             ui::ScaleFactor scale_factor) = 0;
 
   // Creates a ResourceLoaderBridge.
   virtual ResourceLoaderBridge* CreateResourceLoader(
       const ResourceLoaderBridge::RequestInfo& request_info) = 0;
   // Creates a WebSocketStreamHandleBridge.
-  virtual WebSocketStreamHandleBridge* CreateWebSocketBridge(
+  virtual WebSocketStreamHandleBridge* CreateWebSocketStreamBridge(
       WebKit::WebSocketStreamHandle* handle,
       WebSocketStreamHandleDelegate* delegate) = 0;
+  // Creates a WebSocketHandleBridge.
+  virtual WebSocketHandleBridge* CreateWebSocketBridge(
+      WebSocketHandleDelegate* delegate) = 0;

[kinuko, 2013/09/05 08:10:39]

I suspect we might be able to move websocketstreamhandle_impl.cc from
webkit/child to content/child, move this definition to
content::WebKitPlatformSupportImpl and implement only in content layer (rather
than adding stub impl in webkit_glue layer)?

(This can be addressed separately from this patch)

[yhirano, 2013/09/05 11:25:02]

I filed a ticket and will do it in the future.

 
   void SuspendSharedTimer();
   void ResumeSharedTimer();
   virtual void OnStartSharedTimer(base::TimeDelta delay) {}
 
  private:
   void DoTimeout() {
     if (shared_timer_func_ && !shared_timer_suspended_)
       shared_timer_func_();
   }
 
   base::MessageLoop* main_loop_;
   base::OneShotTimer<WebKitPlatformSupportImpl> shared_timer_;
   void (*shared_timer_func_)();
   double shared_timer_fire_time_;
   bool shared_timer_fire_time_was_set_while_suspended_;
   int shared_timer_suspended_;  // counter
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_