Bug 40921 – WebKit1 and WebKit2 should build as a single DLL

• Component: WebKit API
• Status: RESOLVED FIXED

[Adam Roben (:aroben)]

We should build the WebKit1 and WebKit2 APIs into a single DLL on Windows. This way applications that use both APIs won't pull in two copies of WebCore (with unshared memory caches, etc.).

(The other option is to build WebCore as a separate DLL, but I think that would be much harder to do.)

[Adam Roben (:aroben)]

<rdar://problem/8113038>

[Steve Falkenburg]

Created attachment 61288 [details]
Patch

[Alice Liu]

Comment on attachment 61288 [details]
Patch

> Index: WebKit2/ChangeLog
> ===================================================================
> @@ -1,3 +1,56 @@
> +        * win/WebKit2.def: Added. Copied from WebKit project.
> +        * win/WebKit2.rc: Added resources previously in WebKit.
> +        * win/WebKit2.vcproj: Changed project name to WebKit so we will link output to WebKit.dll.
> +        Removed implementations overlapping with WebKitLib (WebCoreLocalizedStrings, DllMain, WebLocalizableStrings, WebProcessMain).
> +        * win/WebKit2Common.vsprops: Use a framework name of WebKit instead of WebKit2 to reflect project name.
> +        Renamed BUILDING_WEBKIT2 to BUILDING_WEBKIT since there is now just a single WebKit.dll.
> +        * win/WebKit2WebProcess.vcproj: Link against WebKit instead of WebKit2 due to renaming.        

I find it inconsistent that we're building the WebKit2 dll as WebKit.dll, but we're still calling several of these files "WebKit2(.*)".  Could you rename these files without the 2.  follow-up patch is fine with me. 



> Index: WebKit/win/WebKit.vcproj/WebKit.vcproj
> ===================================================================

> -			<File
> -				RelativePath=".\nullplugin.png"
> -				>
> -			</File>

the other pan*.pngs added in WebKit2.vcproj don't seem to be removed from WebKit.vcproj.  

> -			<File
> -				RelativePath=".\searchCancel.png"
> -				>
> -			</File>

[Steve Falkenburg]

http://trac.webkit.org/changeset/63151

[Simon Fraser (smfr)]

Roger, Tim and I have been confused for weeks now about why we couldn't find WebKit.def any more. Using WebKit2.def makes no sense.