Changeset 70785 in webkit


Ignore:
Timestamp:
Oct 28, 2010 9:53:38 AM (13 years ago)
Author:
mitz@apple.com
Message:

No longer soft-link zlib
https://bugs.webkit.org/show_bug.cgi?id=48004

Reviewed by Adam Roben.

WebCore:

  • platform/graphics/WOFFFileFormat.cpp:

(WebCore::convertWOFFToSfnt): Removed Windows-speciific code to soft-link
zlib.

WebKit2:

  • win/WebKit2Common.vsprops: Added zlib.lib to AdditionalDependencies.

LayoutTests:

  • platform/win/Skipped: Enabled fast/css/font-face-woff.html.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r70784 r70785  
     12010-10-28  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        No longer soft-link zlib
     6        https://bugs.webkit.org/show_bug.cgi?id=48004
     7
     8        * platform/win/Skipped: Enabled fast/css/font-face-woff.html.
     9
    1102010-10-27  Zhenyao Mo  <zmo@google.com>
    211
  • trunk/LayoutTests/platform/win/Skipped

    r70691 r70785  
    897897http/tests/security/xss-DENIED-iframe-src-alias.html
    898898
    899 # Doesn't support WOFF yet.
    900 fast/css/font-face-woff.html
    901 
    902899# https://bugs.webkit.org/show_bug.cgi?id=38376
    903900media/media-document-audio-size.html
  • trunk/WebCore/ChangeLog

    r70784 r70785  
     12010-10-28  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        No longer soft-link zlib
     6        https://bugs.webkit.org/show_bug.cgi?id=48004
     7
     8        * platform/graphics/WOFFFileFormat.cpp:
     9        (WebCore::convertWOFFToSfnt): Removed Windows-speciific code to soft-link
     10        zlib.
     11
    1122010-10-27  Zhenyao Mo  <zmo@google.com>
    213
  • trunk/WebCore/platform/graphics/WOFFFileFormat.cpp

    r65442 r70785  
    2626#include "config.h"
    2727#include "WOFFFileFormat.h"
     28#include <zlib.h>
    2829
    2930#if !ENABLE(OPENTYPE_SANITIZER)
     
    3132#include "SharedBuffer.h"
    3233
    33 #if !PLATFORM(WIN)
    3434#if OS(UNIX)
    3535#include <netinet/in.h>
    3636#endif
    37 #include <zlib.h>
     37
    3838#if PLATFORM(BREWMP)
    3939#include <AEEStdLib.h>
     
    4343#define ntohs(x) NTOHS(x)
    4444#endif
    45 #else
    46 #include "SoftLinking.h"
    47 
    48 typedef unsigned char Bytef;
    49 typedef unsigned long uLong;
    50 typedef unsigned long uLongf;
    51 #define Z_OK 0
    52 
    53 SOFT_LINK_LIBRARY(zlib1);
    54 SOFT_LINK(zlib1, uncompress, int, __cdecl, (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen), (dest, destLen, source, sourceLen));
    55 
     45
     46#if PLATFORM(WIN)
    5647#if CPU(BIG_ENDIAN)
    5748#define ntohs(x) ((uint16_t)(x))
     
    7162#define htonl(x) ntohl(x)
    7263#endif
    73 
    7464#endif // PLATFORM(WIN)
    7565
     
    124114bool convertWOFFToSfnt(SharedBuffer* woff, Vector<char>& sfnt)
    125115{
    126 #if PLATFORM(WINDOWS)
    127     if (!zlib1Library())
    128         return false;
    129 #endif
    130116    ASSERT_ARG(sfnt, sfnt.isEmpty());
    131117
  • trunk/WebKit2/ChangeLog

    r70781 r70785  
     12010-10-28  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        No longer soft-link zlib
     6        https://bugs.webkit.org/show_bug.cgi?id=48004
     7
     8        * win/WebKit2Common.vsprops: Added zlib.lib to AdditionalDependencies.
     9
    1102010-10-28  Adam Roben  <aroben@apple.com>
    211
     
    129138
    130139        Remove the reference to the pageNamespace in the QWKPagePrivate.
    131         Access it though the WebPageProxy instead which holds a strong
     140        Access it through the WebPageProxy instead which holds a strong
    132141        ref to it.
    133142
  • trunk/WebKit2/win/WebKit2Common.vsprops

    r70687 r70785  
    1616        <Tool
    1717                Name="VCLinkerTool"
    18                 AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitLib$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib iphlpapi.lib winmm.lib comsuppw.lib rpcrt4.lib"
     18                AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitLib$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib iphlpapi.lib winmm.lib comsuppw.lib rpcrt4.lib zlib.lib"
    1919                OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"
    2020                AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"
Note: See TracChangeset for help on using the changeset viewer.