Avoid WebSocket::stop() being processed twice

Avoid WebSocket::stop() being processed twice

R=tyoshino

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=152201

[vivekg_samsung, 2013-06-08 23:31:14]

When navigation occurs on a page with WebSocket, these are two different code
flows which calls the stop().

1)
WebCore::WebSocket::stop()  Line 492	C++
WebCore::ScriptExecutionContext::stopActiveDOMObjects()  Line 213 + 0x1c
bytes	C++
WebCore::Document::detach()  Line 1897 + 0x13 bytes	C++
WebCore::Document::prepareForDestruction()  Line 1957 + 0x12 bytes	C++
WebCore::Frame::setView(WTF::PassRefPtr<WebCore::FrameView> view)  Line 223	C++
WebCore::Frame::createView()  Line 500	C++
WebKit::WebFrameImpl::createFrameView()  Line 2236	C++
WebKit::FrameLoaderClientImpl::transitionToCommittedForNewPage()  Line 1149	C++


2) 
WebCore::WebSocket::stop()  Line 492	C++
WebCore::ScriptExecutionContext::stopActiveDOMObjects()  Line 213 + 0x1c
bytes	C++
WebCore::FrameLoader::clear(bool clearWindowProperties, bool clearScriptObjects,
bool clearFrameView)  Line 500 + 0x1f bytes	C++
WebCore::DocumentWriter::begin(const WebCore::KURL & urlReference, bool
dispatch, WebCore::Document * ownerDocument)  Line 133	C++
WebCore::DocumentLoader::commitData(const char * bytes, unsigned int length) 
Line 645 + 0x2f bytes	C++
WebCore::DocumentLoader::finishedLoading(double finishTime)  Line 352	C++
WebCore::DocumentLoader::maybeLoadEmpty()  Line 964	C++
WebCore::DocumentLoader::startLoadingMainResource()  Line 975 + 0x8 bytes	C++
WebCore::FrameLoader::checkNavigationPolicyAndContinueLoad(WTF::PassRefPtr<WebCore::FormState>
formState)  Line 2130	C++
WebCore::FrameLoader::loadWithNavigationAction()  Line 1144	C++
WebCore::FrameLoader::load(const WebCore::FrameLoadRequest & passedRequest) 
Line 1113 + 0xb6 bytes	C++
WebKit::WebFrameImpl::loadRequest(const WebKit::WebURLRequest & request)  Line
953 + 0x7c bytes	C++
content::RenderViewImpl::NavigateToSwappedOutURL(WebKit::WebFrame * frame)  Line
5666 + 0x19 bytes	C++


In the second flow, the processing within WebSocket::stop() is redundant. Hence
early returning from the call.

[tyoshino (SeeGerritForStatus), 2013-06-10 04:41:49]

Thanks

https://codereview.chromium.org/16385005/diff/1/Source/modules/websockets/Web...
File Source/modules/websockets/WebSocket.cpp (right):

https://codereview.chromium.org/16385005/diff/1/Source/modules/websockets/Web...
Source/modules/websockets/WebSocket.cpp:492: if (!hasPendingActivity())
could you please insert
ASSERT(!m_channel);
here?

[vivekg_samsung, 2013-06-10 06:29:46]

https://codereview.chromium.org/16385005/diff/1/Source/modules/websockets/Web...
File Source/modules/websockets/WebSocket.cpp (right):

https://codereview.chromium.org/16385005/diff/1/Source/modules/websockets/Web...
Source/modules/websockets/WebSocket.cpp:492: if (!hasPendingActivity())
On 2013/06/10 04:41:49, tyoshino wrote:
> could you please insert
> ASSERT(!m_channel);
> here?

Yeah I will add it, thank you! 
How about also adding ASSERT(m_state == CLOSED) ?

[tyoshino (SeeGerritForStatus), 2013-06-10 08:49:46]

https://codereview.chromium.org/16385005/diff/1/Source/modules/websockets/Web...
File Source/modules/websockets/WebSocket.cpp (right):

https://codereview.chromium.org/16385005/diff/1/Source/modules/websockets/Web...
Source/modules/websockets/WebSocket.cpp:492: if (!hasPendingActivity())
On 2013/06/10 06:29:46, vivekg wrote:
> On 2013/06/10 04:41:49, tyoshino wrote:
> > could you please insert
> > ASSERT(!m_channel);
> > here?
> 
> Yeah I will add it, thank you! 
> How about also adding ASSERT(m_state == CLOSED) ?

Sounds good. Please :)

[tyoshino (SeeGerritForStatus), 2013-06-11 05:37:50]

LGTM

[commit-bot: I haz the power, 2013-06-11 05:38:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/vivek.vg@samsung.com/16385005/8001

[commit-bot: I haz the power, 2013-06-11 07:39:12]

Retried try job too often on mac_layout_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_layout...

[commit-bot: I haz the power, 2013-06-11 07:39:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/vivek.vg@samsung.com/16385005/8001

[commit-bot: I haz the power, 2013-06-11 08:06:22]

Change committed as 152201