Changeset 70785 in webkit
- Timestamp:
- Oct 28, 2010 9:53:38 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r70784 r70785 1 2010-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 1 10 2010-10-27 Zhenyao Mo <zmo@google.com> 2 11 -
trunk/LayoutTests/platform/win/Skipped
r70691 r70785 897 897 http/tests/security/xss-DENIED-iframe-src-alias.html 898 898 899 # Doesn't support WOFF yet.900 fast/css/font-face-woff.html901 902 899 # https://bugs.webkit.org/show_bug.cgi?id=38376 903 900 media/media-document-audio-size.html -
trunk/WebCore/ChangeLog
r70784 r70785 1 2010-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 1 12 2010-10-27 Zhenyao Mo <zmo@google.com> 2 13 -
trunk/WebCore/platform/graphics/WOFFFileFormat.cpp
r65442 r70785 26 26 #include "config.h" 27 27 #include "WOFFFileFormat.h" 28 #include <zlib.h> 28 29 29 30 #if !ENABLE(OPENTYPE_SANITIZER) … … 31 32 #include "SharedBuffer.h" 32 33 33 #if !PLATFORM(WIN)34 34 #if OS(UNIX) 35 35 #include <netinet/in.h> 36 36 #endif 37 #include <zlib.h> 37 38 38 #if PLATFORM(BREWMP) 39 39 #include <AEEStdLib.h> … … 43 43 #define ntohs(x) NTOHS(x) 44 44 #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) 56 47 #if CPU(BIG_ENDIAN) 57 48 #define ntohs(x) ((uint16_t)(x)) … … 71 62 #define htonl(x) ntohl(x) 72 63 #endif 73 74 64 #endif // PLATFORM(WIN) 75 65 … … 124 114 bool convertWOFFToSfnt(SharedBuffer* woff, Vector<char>& sfnt) 125 115 { 126 #if PLATFORM(WINDOWS)127 if (!zlib1Library())128 return false;129 #endif130 116 ASSERT_ARG(sfnt, sfnt.isEmpty()); 131 117 -
trunk/WebKit2/ChangeLog
r70781 r70785 1 2010-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 1 10 2010-10-28 Adam Roben <aroben@apple.com> 2 11 … … 129 138 130 139 Remove the reference to the pageNamespace in the QWKPagePrivate. 131 Access it th ough the WebPageProxy instead which holds a strong140 Access it through the WebPageProxy instead which holds a strong 132 141 ref to it. 133 142 -
trunk/WebKit2/win/WebKit2Common.vsprops
r70687 r70785 16 16 <Tool 17 17 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" 19 19 OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll" 20 20 AdditionalLibraryDirectories=""$(IntDir)\lib""
Note: See TracChangeset
for help on using the changeset viewer.