third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp - Issue 2191533003: Refactor Timer classes in preparation for landing FrameTimers.

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/modules/websockets/DOMWebSocket.cpp

Issue 2191533003: Refactor Timer classes in preparation for landing FrameTimers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Android build fix Created 4 years, 5 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/core/svg/graphics/SVGImageChromeClient.h ('K') | « third_party/WebKit/Source/modules/websockets/DOMWebSocket.h ('k') | third_party/WebKit/Source/platform/AsyncMethodRunner.h » ('j') | third_party/WebKit/Source/platform/Timer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

index b30348d408ffac02a2f1c89da3292893ffdff40b..75453668eabbab85d644ff1fb57a81f5d46ae09e 100644

--- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

+++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

@@ -145,7 +145,7 @@ void DOMWebSocket::EventQueue::dispatchQueuedEvents()

}

-void DOMWebSocket::EventQueue::resumeTimerFired(Timer<EventQueue>*)

+void DOMWebSocket::EventQueue::resumeTimerFired(TimerBase*)

{

ASSERT(m_state == Suspended);

m_state = Active;

@@ -363,7 +363,7 @@ void DOMWebSocket::updateBufferedAmountAfterClose(uint64_t payloadSize)

logError("WebSocket is already in CLOSING or CLOSED state.");

}

-void DOMWebSocket::reflectBufferedAmountConsumption(Timer<DOMWebSocket>*)

+void DOMWebSocket::reflectBufferedAmountConsumption(TimerBase*)

{

ASSERT(m_bufferedAmount >= m_consumedBufferedAmount);

// Cast to unsigned long long is required since clang doesn't accept