third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp - Issue 2224713002: Move WebSocketHandleImpl into Blink

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 2224713002: Move WebSocketHandleImpl into Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix issue w/ Java bindings missing a dependency Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/modules/websockets/WebSocketHandleClient.h ('K') | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/WebSharedWorkerImpl.h » ('j') | third_party/WebKit/public/platform/modules/websockets/OWNERS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

index 517be6b2cdd123e78831e3ff0757cf5b9fb8bb03..6ecebcbecb62f7d7b4ef0aca279e6a01b9fd942b 100644

--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

@@ -929,11 +929,6 @@ void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase*

m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(frameElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode(), frameElement->marginWidth(), frameElement->marginHeight(), frameElement->allowFullscreen(), frameElement->delegatedPermissions()));

}

-void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle)

- m_webFrame->client()->willOpenWebSocket(handle);

void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPeerConnectionHandler* handler)

{

m_webFrame->client()->willStartUsingPeerConnectionHandler(handler);