Commit 41bbada4 authored by bfulgham@webkit.org's avatar bfulgham@webkit.org

2009-06-11 John Abd-El-Malek <jam@chromium.org>

        Reviewed by Steve Falkenburg.

        https://bugs.webkit.org/show_bug.cgi?id=26306

        Revert 42565 as it leads to DumpRenderTree crashing on startup because
        Windows can't find CFURLCacheCopySharedURLCache in CoreNetwork.dll.

        * DumpRenderTree/win/DumpRenderTree.cpp:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44609 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent eaa216e7
2009-06-11 John Abd-El-Malek <jam@chromium.org>
Reviewed by Steve Falkenburg.
https://bugs.webkit.org/show_bug.cgi?id=26306
Revert 42565 as it leads to DumpRenderTree crashing on startup because
Windows can't find CFURLCacheCopySharedURLCache in CoreNetwork.dll.
* DumpRenderTree/win/DumpRenderTree.cpp:
2009-06-10 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Jan Alonzo.
......
......@@ -1043,11 +1043,21 @@ IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow)
RetainPtr<CFURLCacheRef> sharedCFURLCache()
{
#ifdef CFURLCacheCopySharedURLCachePresent
return RetainPtr<CFURLCacheRef>(AdoptCF, CFURLCacheCopySharedURLCache());
#else
return CFURLCacheSharedURLCache();
#endif
HMODULE module = GetModuleHandle(TEXT("CFNetwork_debug.dll"));
if (!module)
module = GetModuleHandle(TEXT("CFNetwork.dll"));
if (!module)
return 0;
typedef CFURLCacheRef (*CFURLCacheCopySharedURLCacheProcPtr)(void);
if (CFURLCacheCopySharedURLCacheProcPtr copyCache = reinterpret_cast<CFURLCacheCopySharedURLCacheProcPtr>(GetProcAddress(module, "CFURLCacheCopySharedURLCache")))
return RetainPtr<CFURLCacheRef>(AdoptCF, copyCache());
typedef CFURLCacheRef (*CFURLCacheSharedURLCacheProcPtr)(void);
if (CFURLCacheSharedURLCacheProcPtr sharedCache = reinterpret_cast<CFURLCacheSharedURLCacheProcPtr>(GetProcAddress(module, "CFURLCacheSharedURLCache")))
return sharedCache();
return 0;
}
int main(int argc, char* argv[])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment