Changeset 107766 in webkit


Ignore:
Timestamp:
Feb 14, 2012 6:02:53 PM (12 years ago)
Author:
bashi@chromium.org
Message:

Source/WebCore: [WebSocket] Add deflater/inflater classes
​https://bugs.webkit.org/show_bug.cgi?id=78449

Add WebSocketDeflater/WebSocketInflater classes which wrap zlib
functions. These classes are not used yet, but will be used for
supporting WebSocket deflate-frame extension.

Reviewed by Kent Tamura.

No new tests except for chromium port. Behavior is unchanged.

  • GNUmakefile.list.am: Added.WebSocketDeflater.(cpp|h).
  • WebCore.gypi: Ditto.
  • WebCore.vcproj/WebCore.vcproj: Ditto.
  • WebCore.xcodeproj/project.pbxproj: Ditto.
  • websockets/WebSocketDeflater.cpp: Added.

(WebCore):
(WebCore::WebSocketDeflater::create):
(WebCore::WebSocketDeflater::WebSocketDeflater):
(WebCore::WebSocketDeflater::initialize):
(WebCore::WebSocketDeflater::~WebSocketDeflater):
(WebCore::WebSocketDeflater::addBytes):
(WebCore::WebSocketDeflater::finish):
(WebCore::WebSocketDeflater::reset):
(WebCore::WebSocketInflater::create):
(WebCore::WebSocketInflater::WebSocketInflater):
(WebCore::WebSocketInflater::initialize):
(WebCore::WebSocketInflater::~WebSocketInflater):
(WebCore::WebSocketInflater::addBytes):
(WebCore::WebSocketInflater::finish):
(WebCore::WebSocketInflater::reset):

  • websockets/WebSocketDeflater.h: Added.

(WebCore):
(WebSocketDeflater):
(WebCore::WebSocketDeflater::data):
(WebCore::WebSocketDeflater::size):
(WebSocketInflater):
(WebCore::WebSocketInflater::data):
(WebCore::WebSocketInflater::size):

Source/WebKit/chromium: [WebSocket] Add deflater/inflater classes.
​https://bugs.webkit.org/show_bug.cgi?id=78449

Add tests which ensure WebSocketDeflater/WebSocketInflater can
compress/decompress data correctly.

Reviewed by Kent Tamura.

  • WebKit.gypi:
  • tests/WebSocketDeflaterTest.cpp: Added.

(WebCore):
(WebCore::TEST):

Location:
trunk/Source
Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r107763 r107766  
     12012-02-14  Kenichi Ishibashi  <bashi@chromium.org>
     2
     3        [WebSocket] Add deflater/inflater classes
     4        https://bugs.webkit.org/show_bug.cgi?id=78449
     5
     6        Add WebSocketDeflater/WebSocketInflater classes which wrap zlib
     7        functions. These classes are not used yet, but will be used for
     8        supporting WebSocket deflate-frame extension.
     9
     10        Reviewed by Kent Tamura.
     11
     12        No new tests except for chromium port. Behavior is unchanged.
     13
     14        * GNUmakefile.list.am: Added.WebSocketDeflater.(cpp|h).
     15        * WebCore.gypi: Ditto.
     16        * WebCore.vcproj/WebCore.vcproj: Ditto.
     17        * WebCore.xcodeproj/project.pbxproj: Ditto.
     18        * websockets/WebSocketDeflater.cpp: Added.
     19        (WebCore):
     20        (WebCore::WebSocketDeflater::create):
     21        (WebCore::WebSocketDeflater::WebSocketDeflater):
     22        (WebCore::WebSocketDeflater::initialize):
     23        (WebCore::WebSocketDeflater::~WebSocketDeflater):
     24        (WebCore::WebSocketDeflater::addBytes):
     25        (WebCore::WebSocketDeflater::finish):
     26        (WebCore::WebSocketDeflater::reset):
     27        (WebCore::WebSocketInflater::create):
     28        (WebCore::WebSocketInflater::WebSocketInflater):
     29        (WebCore::WebSocketInflater::initialize):
     30        (WebCore::WebSocketInflater::~WebSocketInflater):
     31        (WebCore::WebSocketInflater::addBytes):
     32        (WebCore::WebSocketInflater::finish):
     33        (WebCore::WebSocketInflater::reset):
     34        * websockets/WebSocketDeflater.h: Added.
     35        (WebCore):
     36        (WebSocketDeflater):
     37        (WebCore::WebSocketDeflater::data):
     38        (WebCore::WebSocketDeflater::size):
     39        (WebSocketInflater):
     40        (WebCore::WebSocketInflater::data):
     41        (WebCore::WebSocketInflater::size):
     42
    1432012-02-14  Dana Jansens  <danakj@chromium.org>
    244

  • trunk/Source/WebCore/GNUmakefile.list.am

    r107707 r107766  
    43214321        Source/WebCore/websockets/WebSocket.cpp \
    43224322        Source/WebCore/websockets/WebSocket.h \
     4323        Source/WebCore/websockets/WebSocketDeflater.cpp \
     4324        Source/WebCore/websockets/WebSocketDeflater.h \
    43234325        Source/WebCore/websockets/WebSocketExtensionDispatcher.cpp \
    43244326        Source/WebCore/websockets/WebSocketExtensionDispatcher.h \

  • trunk/Source/WebCore/WebCore.gypi

    r107707 r107766  
    48024802            'websockets/WebSocketChannel.h',
    48034803            'websockets/WebSocketChannelClient.h',
     4804            'websockets/WebSocketDeflater.cpp',
     4805            'websockets/WebSocketDeflater.h',
    48044806            'websockets/WebSocketExtensionDispatcher.cpp',
    48054807            'websockets/WebSocketExtensionDispatcher.h',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r107558 r107766  
    7297972979                        </File>
    7298072980                        <File
     72981                                RelativePath="..\websockets\WebSocketDeflater.cpp"
     72982                                >
     72983                        </File>
     72984                        <File
     72985                                RelativePath="..\websockets\WebSocketDeflater.h"
     72986                                >
     72987                        </File>
     72988                        <File
    7298172989                                RelativePath="..\websockets\WebSocketExtensionDispatcher.cpp"
    7298272990                                >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r107714 r107766  
    13831383                4AD0173D127E82860015035F /* JSHTMLOutputElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AD0173B127E82860015035F /* JSHTMLOutputElement.h */; };
    13841384                4ADE25FA14E3BB4C004C2213 /* WebSocketExtensionProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ADE25F914E3BB4C004C2213 /* WebSocketExtensionProcessor.h */; };
     1385                4AE02ABD14E8A9D200BC3BA7 /* WebSocketDeflater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AE02ABB14E8A9D200BC3BA7 /* WebSocketDeflater.cpp */; };
     1386                4AE02ABE14E8A9D200BC3BA7 /* WebSocketDeflater.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AE02ABC14E8A9D200BC3BA7 /* WebSocketDeflater.h */; };
    13851387                4AF1AD3E13FD23A400AA9590 /* EventDispatchMediator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AF1AD3C13FD23A400AA9590 /* EventDispatchMediator.cpp */; };
    13861388                4AF1AD3F13FD23A400AA9590 /* EventDispatchMediator.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF1AD3D13FD23A400AA9590 /* EventDispatchMediator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    82398241                4AD0173B127E82860015035F /* JSHTMLOutputElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLOutputElement.h; sourceTree = "<group>"; };
    82408242                4ADE25F914E3BB4C004C2213 /* WebSocketExtensionProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketExtensionProcessor.h; sourceTree = "<group>"; };
     8243                4AE02ABB14E8A9D200BC3BA7 /* WebSocketDeflater.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketDeflater.cpp; sourceTree = "<group>"; };
     8244                4AE02ABC14E8A9D200BC3BA7 /* WebSocketDeflater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketDeflater.h; sourceTree = "<group>"; };
    82418245                4AF1AD3C13FD23A400AA9590 /* EventDispatchMediator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventDispatchMediator.cpp; sourceTree = "<group>"; };
    82428246                4AF1AD3D13FD23A400AA9590 /* EventDispatchMediator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventDispatchMediator.h; sourceTree = "<group>"; };
    … …  
    1480714811                        isa = PBXGroup;
    1480814812                        children = (
    14809                                 4ADE25F914E3BB4C004C2213 /* WebSocketExtensionProcessor.h */,
    1481014813                                51FB54F4113E364200821176 /* CloseEvent.h */,
    1481114814                                51FB54F6113E365900821176 /* CloseEvent.idl */,
    … …  
    1482014823                                510D4A48103177A20049EA54 /* WebSocketChannel.h */,
    1482114824                                510D4A49103177A20049EA54 /* WebSocketChannelClient.h */,
     14825                                4AE02ABB14E8A9D200BC3BA7 /* WebSocketDeflater.cpp */,
     14826                                4AE02ABC14E8A9D200BC3BA7 /* WebSocketDeflater.h */,
    1482214827                                4A957F0314E241100049DBFB /* WebSocketExtensionDispatcher.cpp */,
    1482314828                                4A957F0414E241100049DBFB /* WebSocketExtensionDispatcher.h */,
     14829                                4ADE25F914E3BB4C004C2213 /* WebSocketExtensionProcessor.h */,
    1482414830                                51ABAE421043AB4A008C5260 /* WebSocketHandshake.cpp */,
    1482514831                                51ABAE431043AB4A008C5260 /* WebSocketHandshake.h */,
    … …  
    2426424270                                C598905714E9C28000E8D18B /* PasteboardStrategy.h in Headers */,
    2426524271                                C598905814E9C29900E8D18B /* PlatformPasteboard.h in Headers */,
     24272                                4AE02ABE14E8A9D200BC3BA7 /* WebSocketDeflater.h in Headers */,
    2426624273                        );
    2426724274                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2720727214                                97CC3AE214E8E4A200894988 /* NavigatorSupplement.cpp in Sources */,
    2720827215                                C598902E14E9B0F800E8D18B /* PlatformPasteboardMac.mm in Sources */,
     27216                                4AE02ABD14E8A9D200BC3BA7 /* WebSocketDeflater.cpp in Sources */,
    2720927217                        );
    2721027218                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebKit/chromium/ChangeLog

    r107763 r107766  
     12012-02-14  Kenichi Ishibashi  <bashi@chromium.org>
     2
     3        [WebSocket] Add deflater/inflater classes.
     4        https://bugs.webkit.org/show_bug.cgi?id=78449
     5
     6        Add tests which ensure WebSocketDeflater/WebSocketInflater can
     7        compress/decompress data correctly.
     8
     9        Reviewed by Kent Tamura.
     10
     11        * WebKit.gypi:
     12        * tests/WebSocketDeflaterTest.cpp: Added.
     13        (WebCore):
     14        (WebCore::TEST):
     15
    1162012-02-14  Dana Jansens  <danakj@chromium.org>
    217

  • trunk/Source/WebKit/chromium/WebKit.gypi

    r107365 r107766  
    119119            'tests/WebPageNewSerializerTest.cpp',
    120120            'tests/WebPageSerializerTest.cpp',
     121            'tests/WebSocketDeflaterTest.cpp',
    121122            'tests/WebSocketExtensionDispatcherTest.cpp',
    122123            'tests/WebURLRequestTest.cpp',
Note: See TracChangeset for help on using the changeset viewer.