[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mitz at apple.com mitz at apple.com
Wed Dec 22 15:09:19 UTC 2010 

The following commit has been merged in the debian/experimental branch:
commit 53a68298afedf1fbc9c23806a55b1a3d44b91d58
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 16:53:38 2010 +0000

    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.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70785 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f468815..71992ea 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-28  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Adam Roben.
+
+        No longer soft-link zlib
+        https://bugs.webkit.org/show_bug.cgi?id=48004
+
+        * platform/win/Skipped: Enabled fast/css/font-face-woff.html.
+
 2010-10-27  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 2685c9f..d5a2d8a 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -896,9 +896,6 @@ fast/overflow/scrollbar-restored-and-then-locked.html
 # <http://webkit.org/b/37096> http/tests/security/xss-DENIED-iframe-src-alias.html sometimes times out on Windows
 http/tests/security/xss-DENIED-iframe-src-alias.html
 
-# Doesn't support WOFF yet.
-fast/css/font-face-woff.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=38376
 media/media-document-audio-size.html
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 73293eb..d2325dc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-28  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Adam Roben.
+
+        No longer soft-link zlib
+        https://bugs.webkit.org/show_bug.cgi?id=48004
+
+        * platform/graphics/WOFFFileFormat.cpp:
+        (WebCore::convertWOFFToSfnt): Removed Windows-speciific code to soft-link
+        zlib.
+
 2010-10-27  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/graphics/WOFFFileFormat.cpp b/WebCore/platform/graphics/WOFFFileFormat.cpp
index 25b3b00..5391f30 100644
--- a/WebCore/platform/graphics/WOFFFileFormat.cpp
+++ b/WebCore/platform/graphics/WOFFFileFormat.cpp
@@ -25,16 +25,16 @@
 
 #include "config.h"
 #include "WOFFFileFormat.h"
+#include <zlib.h>
 
 #if !ENABLE(OPENTYPE_SANITIZER)
 
 #include "SharedBuffer.h"
 
-#if !PLATFORM(WIN)
 #if OS(UNIX)
 #include <netinet/in.h>
 #endif
-#include <zlib.h>
+
 #if PLATFORM(BREWMP)
 #include <AEEStdLib.h>
 #define htonl(x) HTONL(x)
@@ -42,17 +42,8 @@
 #define ntohl(x) NTOHL(x)
 #define ntohs(x) NTOHS(x)
 #endif
-#else
-#include "SoftLinking.h"
-
-typedef unsigned char Bytef;
-typedef unsigned long uLong;
-typedef unsigned long uLongf;
-#define Z_OK 0
-
-SOFT_LINK_LIBRARY(zlib1);
-SOFT_LINK(zlib1, uncompress, int, __cdecl, (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen), (dest, destLen, source, sourceLen));
 
+#if PLATFORM(WIN)
 #if CPU(BIG_ENDIAN)
 #define ntohs(x) ((uint16_t)(x))
 #define htons(x) ((uint16_t)(x))
@@ -70,7 +61,6 @@ SOFT_LINK(zlib1, uncompress, int, __cdecl, (Bytef *dest, uLongf *destLen, const
                  (((uint32_t)(x) & 0x0000ff00) <<  8) | (((uint32_t)(x) & 0x000000ff) << 24)))
 #define htonl(x) ntohl(x)
 #endif
-
 #endif // PLATFORM(WIN)
 
 namespace WebCore {
@@ -123,10 +113,6 @@ bool isWOFF(SharedBuffer* buffer)
 
 bool convertWOFFToSfnt(SharedBuffer* woff, Vector<char>& sfnt)
 {
-#if PLATFORM(WINDOWS)
-    if (!zlib1Library())
-        return false;
-#endif
     ASSERT_ARG(sfnt, sfnt.isEmpty());
 
     size_t offset = 0;
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7d401d6..f48d5f4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-28  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Adam Roben.
+
+        No longer soft-link zlib
+        https://bugs.webkit.org/show_bug.cgi?id=48004
+
+        * win/WebKit2Common.vsprops: Added zlib.lib to AdditionalDependencies.
+
 2010-10-28  Adam Roben  <aroben at apple.com>
 
         Make PluginView retain its HTMLPlugInElement
@@ -128,7 +137,7 @@
         Reviewed by Andreas Kling.
 
         Remove the reference to the pageNamespace in the QWKPagePrivate.
-        Access it though the WebPageProxy instead which holds a strong
+        Access it through the WebPageProxy instead which holds a strong
         ref to it.
 
         * UIProcess/API/qt/qwkpage.cpp:
diff --git a/WebKit2/win/WebKit2Common.vsprops b/WebKit2/win/WebKit2Common.vsprops
index 5bbb024..a2166d5 100755
--- a/WebKit2/win/WebKit2Common.vsprops
+++ b/WebKit2/win/WebKit2Common.vsprops
@@ -15,7 +15,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		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"
+		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"
 		OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"
 		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"
 		DelayLoadDLLs="usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;iphlpapi.dll"

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list