Bug 158551 – Clean up WebSocket code

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Alex Christensen]

Clean up WebSocket code

[Alex Christensen]

Created attachment 280859 [details]
Patch

[Alex Christensen]

Created attachment 280876 [details]
Patch

[Build Bot]

Comment on attachment 280876 [details]
Patch

Attachment 280876 [details] did not pass mac-debug-ews (mac):
Output: http://webkit-queues.webkit.org/results/1470285

New failing tests:
editing/selection/selection-in-iframe-removed-crash.html

[Build Bot]

Created attachment 280881 [details]
Archive of layout-test-results from ews116 for mac-yosemite

The attached test failures were seen while running run-webkit-tests on the mac-debug-ews.
Bot: ews116  Port: mac-yosemite  Platform: Mac OS X 10.10.5

[Alex Christensen]

Created attachment 280887 [details]
Patch

[Darin Adler]

Comment on attachment 280887 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=280887&action=review

> Source/WebCore/Modules/websockets/WebSocketChannel.h:199
> +    unsigned long m_unhandledBufferedAmount { 0 };

There is no reason to use "unsigned long" for this instead of "unsigned". This seems to be the typical confusion where when IDL says "long" it means "int", but sometimes people just use long in the C++ code. That’s OK except that then we have a mix of the types "int" and "long", and there is no distinction needed between the two.

For the same reason, the bufferedAmount function should return unsigned, not unsigned long.

> Source/WebCore/Modules/websockets/WebSocketChannel.h:201
> +    unsigned long m_identifier { 0 }; // m_identifier == 0 means that we could not obtain a valid identifier.

Ditto.

[Alex Christensen]

Created attachment 280930 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 280930 [details]
Patch

Rejecting attachment 280930 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'build', '--no-clean', '--no-update', '--build-style=release', '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 500 characters of output:
ia -c /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebCore/JSFetchRequest.cpp -o /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/JSFetchRequest.o

** BUILD FAILED **


The following build commands failed:
	CompileC /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/JSDOMWindowCustom.o bindings/js/JSDOMWindowCustom.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler
(1 failure)

Full output: http://webkit-queues.webkit.org/results/1473458

[Alex Christensen]

Created attachment 280938 [details]
Patch

[Alex Christensen]

http://trac.webkit.org/changeset/201880