WebCore:
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 8 Mar 2009 00:05:05 +0000 (00:05 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 8 Mar 2009 00:05:05 +0000 (00:05 +0000)
        Reviewed by Mark Rowe.

        - WebCore part of removing build-time and run-time support for legacy
          versions of CFNetwork and Core Graphics

        * platform/graphics/win/FontCGWin.cpp:
        (WebCore::Font::drawGlyphs):
        * platform/graphics/win/FontCustomPlatformData.cpp:
        (WebCore::FontCustomPlatformData::fontPlatformData):
        * platform/graphics/win/FontPlatformDataCGWin.cpp:
        (WebCore::FontPlatformData::platformDataInit):
        * platform/network/cf/FormDataStreamCFNet.cpp:
        (WebCore::setHTTPBody):
        (WebCore::httpBodyFromRequest):
        * platform/network/cf/ResourceHandleCFNet.cpp:
        (WebCore::didSendBodyData):
        (WebCore::shouldUseCredentialStorageCallback):
        (WebCore::ResourceHandle::start):
        * platform/network/win/CookieJarCFNetWin.cpp:
        (WebCore::filterCookies):

WebKit/win:

        Reviewed by Mark Rowe.

        - WebKit part of removing build-time and run-time support for legacy
          versions of CFNetwork and Core Graphics

        * WebView.cpp:
        (WebView::setCacheModel):

WebKitLibraries:

        Reviewed by Mark Rowe.

        - WebKitSystemInterface part of removing build-time and run-time support
          for legacy versions of CFNetwork and Core Graphics

        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
        * win/lib/WebKitSystemInterface.lib:
        * win/lib/WebKitSystemInterface_debug.lib:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41517 268f45cc-cd09-0410-ab3c-d52691b4dbfc

13 files changed:
WebCore/ChangeLog
WebCore/platform/graphics/win/FontCGWin.cpp
WebCore/platform/graphics/win/FontCustomPlatformData.cpp
WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp
WebCore/platform/network/cf/FormDataStreamCFNet.cpp
WebCore/platform/network/cf/ResourceHandleCFNet.cpp
WebCore/platform/network/win/CookieJarCFNetWin.cpp
WebKit/win/ChangeLog
WebKit/win/WebView.cpp
WebKitLibraries/ChangeLog
WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
WebKitLibraries/win/lib/WebKitSystemInterface.lib
WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib

index e627b3b0a15f5bf2ff6cbd204dc0a0b7349b32b1..fa5dda75888cd88365bd7766efc3d40f79375520 100644 (file)
@@ -1,3 +1,26 @@
+2009-03-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        - WebCore part of removing build-time and run-time support for legacy
+          versions of CFNetwork and Core Graphics
+
+        * platform/graphics/win/FontCGWin.cpp:
+        (WebCore::Font::drawGlyphs):
+        * platform/graphics/win/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData):
+        * platform/graphics/win/FontPlatformDataCGWin.cpp:
+        (WebCore::FontPlatformData::platformDataInit):
+        * platform/network/cf/FormDataStreamCFNet.cpp:
+        (WebCore::setHTTPBody):
+        (WebCore::httpBodyFromRequest):
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::didSendBodyData):
+        (WebCore::shouldUseCredentialStorageCallback):
+        (WebCore::ResourceHandle::start):
+        * platform/network/win/CookieJarCFNetWin.cpp:
+        (WebCore::filterCookies):
+
 2009-03-07  Adele Peterson  <adele@apple.com>
 
         Reviewed by Dan Bernstein.
index 9ca95f32ba01fb61224825ebbd4f3ed9a2e2bbf4..77ee8ce3a92822467af068888c2e55e77e0ed49a 100644 (file)
@@ -298,8 +298,7 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext, const SimpleFontData* fo
     bool shouldUseFontSmoothing = WebCoreShouldUseFontSmoothing();
 
     if (font->platformData().useGDI()) {
-        static bool canUsePlatformNativeGlyphs = wkCanUsePlatformNativeGlyphs();
-        if (!canUsePlatformNativeGlyphs || !shouldUseFontSmoothing || (graphicsContext->textDrawingMode() & cTextStroke)) {
+        if (!shouldUseFontSmoothing || (graphicsContext->textDrawingMode() & cTextStroke)) {
             drawGDIGlyphs(graphicsContext, font, glyphBuffer, from, numGlyphs, point);
             return;
         }
index f7e680d1512ec54d14a2985fc3b59758d88521ef..1ac3359fe6df9cf71be29e0d0b06d8c2b3cb4d83 100644 (file)
@@ -65,10 +65,7 @@ FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, b
     ASSERT(m_fontReference);
     ASSERT(T2embedLibrary());
 
-    static bool canUsePlatformNativeGlyphs = wkCanUsePlatformNativeGlyphs();
-    LOGFONT _logFont;
-
-    LOGFONT& logFont = canUsePlatformNativeGlyphs ? *static_cast<LOGFONT*>(malloc(sizeof(LOGFONT))) : _logFont;
+    LOGFONT& logFont = *static_cast<LOGFONT*>(malloc(sizeof(LOGFONT)));
     if (m_name.isNull())
         TTGetNewFontName(&m_fontReference, logFont.lfFaceName, LF_FACESIZE, 0, 0);
     else
@@ -90,8 +87,7 @@ FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, b
     logFont.lfWeight = bold ? 700 : 400;
 
     HFONT hfont = CreateFontIndirect(&logFont);
-    if (canUsePlatformNativeGlyphs)
-        wkSetFontPlatformInfo(m_cgFont, &logFont, free);
+    wkSetFontPlatformInfo(m_cgFont, &logFont, free);
     return FontPlatformData(hfont, m_cgFont, size, bold, italic, renderingMode == AlternateRenderingMode);
 }
 
index c7e59ab4de5cf560e84f72b777a12bacba468ba6..59f7e5cc3799ee261bfa55343f824eafe0e0acad 100644 (file)
@@ -120,7 +120,7 @@ void FontPlatformData::platformDataInit(HFONT font, float size, HDC hdc, WCHAR*
             ASSERT(m_cgFont);
         }
     }
-    if (m_useGDI && wkCanUsePlatformNativeGlyphs()) {
+    if (m_useGDI) {
         LOGFONT* logfont = static_cast<LOGFONT*>(malloc(sizeof(LOGFONT)));
         GetObject(font, sizeof(*logfont), logfont);
         wkSetFontPlatformInfo(m_cgFont.get(), logfont, free);
index 71fbfe7a96d71b3af9eae3a553233d5d36ee01ed..3414d900485cd10ce9c38f22e102f070626f531b 100644 (file)
@@ -317,8 +317,7 @@ static void formEventCallback(CFReadStreamRef stream, CFStreamEventType type, vo
 void setHTTPBody(CFMutableURLRequestRef request, PassRefPtr<FormData> formData)
 {
     if (!formData) {
-        if (wkCanAccessCFURLRequestHTTPBodyParts())
-            wkCFURLRequestSetHTTPRequestBodyParts(request, 0);
+        wkCFURLRequestSetHTTPRequestBodyParts(request, 0);
         return;
     }
 
@@ -338,52 +337,20 @@ void setHTTPBody(CFMutableURLRequestRef request, PassRefPtr<FormData> formData)
         }
     }
 
-    if (wkCanAccessCFURLRequestHTTPBodyParts()) {
-        RetainPtr<CFMutableArrayRef> array(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
-
-        for (size_t i = 0; i < count; ++i) {
-            const FormDataElement& element = formData->elements()[i];
-            if (element.m_type == FormDataElement::data) {
-                RetainPtr<CFDataRef> data(AdoptCF, CFDataCreate(0, reinterpret_cast<const UInt8*>(element.m_data.data()), element.m_data.size()));
-                CFArrayAppendValue(array.get(), data.get());
-            } else {
-                RetainPtr<CFStringRef> filename(AdoptCF, element.m_filename.createCFString());
-                CFArrayAppendValue(array.get(), filename.get());
-            }
-        }
+    RetainPtr<CFMutableArrayRef> array(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
 
-        wkCFURLRequestSetHTTPRequestBodyParts(request, array.get());
-        return;
-    }
-
-    // Precompute the content length so CFURLConnection doesn't use chunked mode.
-    bool haveLength = true;
-    long long length = 0;
     for (size_t i = 0; i < count; ++i) {
         const FormDataElement& element = formData->elements()[i];
-        if (element.m_type == FormDataElement::data)
-            length += element.m_data.size();
-        else {
-            long long size;
-            if (getFileSize(element.m_filename, size))
-                length += size;
-            else
-                haveLength = false;
+        if (element.m_type == FormDataElement::data) {
+            RetainPtr<CFDataRef> data(AdoptCF, CFDataCreate(0, reinterpret_cast<const UInt8*>(element.m_data.data()), element.m_data.size()));
+            CFArrayAppendValue(array.get(), data.get());
+        } else {
+            RetainPtr<CFStringRef> filename(AdoptCF, element.m_filename.createCFString());
+            CFArrayAppendValue(array.get(), filename.get());
         }
     }
 
-    if (haveLength) {
-        CFStringRef lengthStr = CFStringCreateWithFormat(0, 0, CFSTR("%lld"), length);
-        CFURLRequestSetHTTPHeaderFieldValue(request, CFSTR("Content-Length"), lengthStr);
-        CFRelease(lengthStr);
-    }
-
-    static WCReadStreamCallBacks formDataStreamCallbacks = 
-        { 1, formCreate, formFinalize, 0, formOpen, 0, formRead, 0, formCanRead, formClose, 0, 0, 0, formSchedule, formUnschedule };
-
-    CFReadStreamRef stream = CFReadStreamCreate(0, (CFReadStreamCallBacks *)&formDataStreamCallbacks, formData.releaseRef());
-    CFURLRequestSetHTTPRequestBodyStream(request, stream);
-    CFRelease(stream);
+    wkCFURLRequestSetHTTPRequestBodyParts(request, array.get());
 }
 
 PassRefPtr<FormData> httpBodyFromRequest(CFURLRequestRef request)
@@ -391,28 +358,23 @@ PassRefPtr<FormData> httpBodyFromRequest(CFURLRequestRef request)
     if (RetainPtr<CFDataRef> bodyData = CFURLRequestCopyHTTPRequestBody(request))
         return FormData::create(CFDataGetBytePtr(bodyData.get()), CFDataGetLength(bodyData.get()));
 
-    if (wkCanAccessCFURLRequestHTTPBodyParts()) {
-        if (RetainPtr<CFArrayRef> bodyParts = wkCFURLRequestCopyHTTPRequestBodyParts(request)) {
-            RefPtr<FormData> formData = FormData::create();
-
-            CFIndex count = CFArrayGetCount(bodyParts.get());
-            for (CFIndex i = 0; i < count; i++) {
-                CFTypeRef bodyPart = CFArrayGetValueAtIndex(bodyParts.get(), i);
-                CFTypeID typeID = CFGetTypeID(bodyPart);
-                if (typeID == CFStringGetTypeID()) {
-                    String filename = (CFStringRef)bodyPart;
-                    formData->appendFile(filename);
-                } else if (typeID == CFDataGetTypeID()) {
-                    CFDataRef data = (CFDataRef)bodyPart;
-                    formData->appendData(CFDataGetBytePtr(data), CFDataGetLength(data));
-                } else
-                    ASSERT_NOT_REACHED();
-            }
-            return formData.release();
+    if (RetainPtr<CFArrayRef> bodyParts = wkCFURLRequestCopyHTTPRequestBodyParts(request)) {
+        RefPtr<FormData> formData = FormData::create();
+
+        CFIndex count = CFArrayGetCount(bodyParts.get());
+        for (CFIndex i = 0; i < count; i++) {
+            CFTypeRef bodyPart = CFArrayGetValueAtIndex(bodyParts.get(), i);
+            CFTypeID typeID = CFGetTypeID(bodyPart);
+            if (typeID == CFStringGetTypeID()) {
+                String filename = (CFStringRef)bodyPart;
+                formData->appendFile(filename);
+            } else if (typeID == CFDataGetTypeID()) {
+                CFDataRef data = (CFDataRef)bodyPart;
+                formData->appendData(CFDataGetBytePtr(data), CFDataGetLength(data));
+            } else
+                ASSERT_NOT_REACHED();
         }
-    } else {
-        if (RetainPtr<CFReadStreamRef> bodyStream = CFURLRequestCopyHTTPRequestBodyStream(request))
-            return getStreamFormDatas().get(bodyStream.get());
+        return formData.release();
     }
 
     // FIXME: what to do about arbitrary body streams?
index 5163b546708366fdd11442511ee9fad914072771..243970a0004594acef964297d580108af76206e3 100644 (file)
 
 namespace WebCore {
 
-static HMODULE findCFNetworkModule()
-{
-    if (HMODULE module = GetModuleHandleA("CFNetwork"))
-        return module;
-    return GetModuleHandleA("CFNetwork_debug");
-}
-
-static DWORD cfNetworkVersion()
-{
-    HMODULE cfNetworkModule = findCFNetworkModule();
-    WCHAR filename[MAX_PATH];
-    GetModuleFileName(cfNetworkModule, filename, MAX_PATH);
-    DWORD handle;
-    DWORD versionInfoSize = GetFileVersionInfoSize(filename, &handle);
-    Vector<BYTE> versionInfo(versionInfoSize);
-    GetFileVersionInfo(filename, handle, versionInfoSize, versionInfo.data());
-    VS_FIXEDFILEINFO* fixedFileInfo;
-    UINT fixedFileInfoLength;
-    VerQueryValue(versionInfo.data(), TEXT("\\"), reinterpret_cast<LPVOID*>(&fixedFileInfo), &fixedFileInfoLength);
-    return fixedFileInfo->dwProductVersionMS;
-}
-
-static CFIndex highestSupportedCFURLConnectionClientVersion()
-{
-    const DWORD firstCFNetworkVersionWithConnectionClientV2 = 0x000101a8; // 1.424
-    const DWORD firstCFNetworkVersionWithConnectionClientV3 = 0x000101ad; // 1.429
-
-#ifndef _CFURLConnectionClientV2Present
-    return 1;
-#else
-
-    DWORD version = cfNetworkVersion();
-    if (version < firstCFNetworkVersionWithConnectionClientV2)
-        return 1;
-#ifndef _CFURLConnectionClientV3Present
-    return 2;
-#else
-
-    if (version < firstCFNetworkVersionWithConnectionClientV3)
-        return 2;
-    return 3;
-#endif // _CFURLConnectionClientV3Present
-#endif // _CFURLConnectionClientV2Present
-}
-
 static HashSet<String>& allowsAnyHTTPSCertificateHosts()
 {
     static HashSet<String> hosts;
@@ -154,7 +109,6 @@ void didReceiveData(CFURLConnectionRef conn, CFDataRef data, CFIndex originalLen
         handle->client()->didReceiveData(handle, (const char*)bytes, length, originalLength);
 }
 
-#ifdef _CFURLConnectionClientV2Present
 static void didSendBodyData(CFURLConnectionRef conn, CFIndex bytesWritten, CFIndex totalBytesWritten, CFIndex totalBytesExpectedToWrite, const void *clientInfo)
 {
     ResourceHandle* handle = (ResourceHandle*)clientInfo;
@@ -162,9 +116,7 @@ static void didSendBodyData(CFURLConnectionRef conn, CFIndex bytesWritten, CFInd
         return;
     handle->client()->didSendData(handle, totalBytesWritten, totalBytesExpectedToWrite);
 }
-#endif
 
-#ifdef _CFURLConnectionClientV3Present
 static Boolean shouldUseCredentialStorageCallback(CFURLConnectionRef conn, const void* clientInfo)
 {
     ResourceHandle* handle = const_cast<ResourceHandle*>(static_cast<const ResourceHandle*>(clientInfo));
@@ -176,7 +128,6 @@ static Boolean shouldUseCredentialStorageCallback(CFURLConnectionRef conn, const
 
     return handle->shouldUseCredentialStorage();
 }
-#endif
 
 void didFinishLoading(CFURLConnectionRef conn, const void* clientInfo) 
 {
@@ -348,20 +299,9 @@ bool ResourceHandle::start(Frame* frame)
 
     RetainPtr<CFURLRequestRef> request(AdoptCF, makeFinalRequest(d->m_request, d->m_shouldContentSniff));
 
-    static CFIndex clientVersion = highestSupportedCFURLConnectionClientVersion();
-    CFURLConnectionClient* client;
-#if defined(_CFURLConnectionClientV3Present)
-    CFURLConnectionClient_V3 client_V3 = {clientVersion, this, 0, 0, 0, willSendRequest, didReceiveResponse, didReceiveData, NULL, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData, shouldUseCredentialStorageCallback, 0};
-    client = reinterpret_cast<CFURLConnectionClient*>(&client_V3);
-#elif defined(_CFURLConnectionClientV2Present)
-    CFURLConnectionClient_V2 client_V2 = {clientVersion, this, 0, 0, 0, willSendRequest, didReceiveResponse, didReceiveData, NULL, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData};
-    client = reinterpret_cast<CFURLConnectionClient*>(&client_V2);
-#else
-    CFURLConnectionClient client_V1 = {1, this, 0, 0, 0, willSendRequest, didReceiveResponse, didReceiveData, NULL, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge};
-    client = &client_V1;
-#endif
-
-    d->m_connection.adoptCF(CFURLConnectionCreate(0, request.get(), client));
+    CFURLConnectionClient_V3 client = { 3, this, 0, 0, 0, willSendRequest, didReceiveResponse, didReceiveData, NULL, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData, shouldUseCredentialStorageCallback, 0};
+
+    d->m_connection.adoptCF(CFURLConnectionCreate(0, request.get(), reinterpret_cast<CFURLConnectionClient*>(&client)));
 
     CFURLConnectionScheduleWithCurrentMessageQueue(d->m_connection.get());
     CFURLConnectionScheduleDownloadWithRunLoop(d->m_connection.get(), loaderRunLoop(), kCFRunLoopDefaultMode);
index 56d7265a1e6078e2a328ef64517919b23f3db8ff..7e64813c8cd6d294ed5732202604d9ea2579164c 100644 (file)
@@ -41,28 +41,6 @@ namespace WebCore {
 static const CFStringRef s_setCookieKeyCF = CFSTR("Set-Cookie");
 static const CFStringRef s_cookieCF = CFSTR("Cookie");
 
-typedef Boolean (*IsHTTPOnlyFunction)(CFHTTPCookieRef);
-
-static HMODULE findCFNetworkModule()
-{
-    if (HMODULE module = GetModuleHandleA("CFNetwork"))
-        return module;
-    return GetModuleHandleA("CFNetwork_debug");
-}
-
-static IsHTTPOnlyFunction findIsHTTPOnlyFunction()
-{
-    return reinterpret_cast<IsHTTPOnlyFunction>(GetProcAddress(findCFNetworkModule(), "CFHTTPCookieIsHTTPOnly"));
-}
-
-static bool isHTTPOnly(CFHTTPCookieRef cookie)
-{
-    // Once we require a newer version of CFNetwork with the CFHTTPCookieIsHTTPOnly function,
-    // we can change this to be a normal function call and eliminate findIsHTTPOnlyFunction.
-    static IsHTTPOnlyFunction function = findIsHTTPOnlyFunction();
-    return function && function(cookie);
-}
-
 static RetainPtr<CFArrayRef> filterCookies(CFArrayRef unfilteredCookies)
 {
     CFIndex count = CFArrayGetCount(unfilteredCookies);
@@ -77,7 +55,7 @@ static RetainPtr<CFArrayRef> filterCookies(CFArrayRef unfilteredCookies)
         if (!CFStringGetLength(CFHTTPCookieGetName(cookie)))
             continue;
 
-        if (isHTTPOnly(cookie))
+        if (CFHTTPCookieIsHTTPOnly(cookie))
             continue;
 
         CFArrayAppendValue(filteredCookies.get(), cookie);
index 9623f0f31f4b4c2adddd0220e5027d2929d4d9c5..853b02a592fd138eb1d6d1cfc255519b9ba91132 100644 (file)
@@ -1,3 +1,13 @@
+2009-03-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        - WebKit part of removing build-time and run-time support for legacy
+          versions of CFNetwork and Core Graphics
+
+        * WebView.cpp:
+        (WebView::setCacheModel):
+
 2009-03-04  Adam Barth  <abath@webkit.org>
 
         Reviewed by Alexey Proskuryakov.
index 474fe7d65642c87618677bf2489ba639914fda19..45e0f55345046140870899fc843494826da1b5da 100644 (file)
@@ -127,20 +127,6 @@ static HashSet<WebView*> pendingDeleteBackingStoreSet;
 static String osVersion();
 static String webKitVersion();
 
-typedef CFURLCacheRef (*CopySharedURLCacheFunction)();
-
-static HMODULE findCFNetworkModule()
-{
-    if (HMODULE module = GetModuleHandleA("CFNetwork"))
-        return module;
-    return GetModuleHandleA("CFNetwork_debug");
-}
-
-static CopySharedURLCacheFunction findCopySharedURLCacheFunction()
-{
-    return reinterpret_cast<CopySharedURLCacheFunction>(GetProcAddress(findCFNetworkModule(), "CFURLCacheCopySharedURLCache"));
-}
-
 WebView* kit(Page* page)
 {
     return page ? static_cast<WebChromeClient*>(page->chrome()->client())->webView() : 0;
@@ -383,15 +369,7 @@ void WebView::setCacheModel(WebCacheModel cacheModel)
     if (s_didSetCacheModel && cacheModel == s_cacheModel)
         return;
 
-    // Once we require a newer version of CFNetwork with the CFURLCacheCopySharedURLCache function,
-    // we can call CFURLCacheCopySharedURLCache directly and eliminate copySharedURLCache.
-    static CopySharedURLCacheFunction copySharedURLCache = findCopySharedURLCacheFunction();
-    RetainPtr<CFURLCacheRef> cfurlCache;
-    if (copySharedURLCache)
-        cfurlCache.adoptCF(copySharedURLCache());
-    else
-        cfurlCache = CFURLCacheSharedURLCache();
-
+    RetainPtr<CFURLCacheRef> cfurlCache(AdoptCF, CFURLCacheCopySharedURLCache());
     RetainPtr<CFStringRef> cfurlCacheDirectory(AdoptCF, wkCopyFoundationCacheDirectory());
     if (!cfurlCacheDirectory)
         cfurlCacheDirectory.adoptCF(WebCore::localUserSpecificStorageDirectory().createCFString());
index f09e672a8c7b73dcabe0b163349084fd76290480..b7bd8d7a717bb533967d5f3d20357dfa67e19826 100644 (file)
@@ -1,3 +1,14 @@
+2009-03-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        - WebKitSystemInterface part of removing build-time and run-time support
+          for legacy versions of CFNetwork and Core Graphics
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
 2009-01-30  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Timothy Hatcher.
index 0196031f5f5870c0b5380f92c88fbeb006b39049..1d7adb44b688a61eb6355df4c56dc6ab62bff9f0 100644 (file)
@@ -49,7 +49,6 @@ void wkSetFontSmoothingContrast(CGFloat);
 CGFloat wkGetFontSmoothingContrast();
 uint32_t wkSetFontSmoothingStyle(CGContextRef cg, bool fontAllowsSmoothing);
 void wkRestoreFontSmoothingStyle(CGContextRef cg, uint32_t oldStyle);
-bool wkCanUsePlatformNativeGlyphs();
 void wkSetCGContextFontRenderingStyle(CGContextRef, bool isSystemFont, bool isPrinterFont, bool usePlatformNativeGlyphs);
 void wkGetGlyphAdvances(CGFontRef, const CGAffineTransform&, bool isSystemFont, bool isPrinterFont, CGGlyph, CGSize& advance);
 void wkGetGlyphs(CGFontRef, const UChar[], CGGlyph[], size_t count);
@@ -72,7 +71,6 @@ void wkSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool);
 CFStringRef wkCopyFoundationCacheDirectory();
 void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef);
 
-bool wkCanAccessCFURLRequestHTTPBodyParts();
 CFArrayRef wkCFURLRequestCopyHTTPRequestBodyParts(CFURLRequestRef);
 void wkCFURLRequestSetHTTPRequestBodyParts(CFMutableURLRequestRef, CFArrayRef bodyParts);
 
index 3189db7502aa4e30926fd58575596e4b2e44d1b3..2145701038e2d08c695336b523b15a642a88f4df 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ
index 68785e460f89f7e85ca4ba8afd5c60bde8c655bd..dda46d8e30db38ec331af36b11bbe107bda7e32f 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ