The code to find and use the WebKit.resources bundle on Windows was replicated in a couple of places, and incompletely done in another. This patch provides a single implementation of this logic, and updates the bundle referencing sites to use this one (correct) implementation. This change also allows the WinLauncher executable to find and use the Inspector.
<rdar://problem/14751077>
Created attachment 208863 [details] Patch
Comment on attachment 208863 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208863&action=review > Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters:7069 > + <ClCompile Include="..\css\CSSFilterImageValue.cpp" /> I think these are unrelated, but maybe expected automatic VS changes? > Source/WebCore/platform/win/WebCoreBundleWin.cpp:2 > + * Copyright (C) 2013 Apple Inc. All rights reserved. The license from the old file should carry over (so this should be '2011, 2013'). > Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp:161 > + RetainPtr<CFURLRef> htmlURLRef = adoptCF(CFBundleCopyResourceURL(WebCore::webKitBundle(), CFSTR("inspector"), CFSTR("html"), CFSTR("inspector"))); why do you need the explicit namespace? This file 'using namespace WebCore's.
Comment on attachment 208863 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208863&action=review >> Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters:7069 >> + <ClCompile Include="..\css\CSSFilterImageValue.cpp" /> > > I think these are unrelated, but maybe expected automatic VS changes? VS does annoying things when you add/remove files. These may have been added to the vcxproj in an earlier change, but not added to the *filters file (*cough* krit *cough*) and are getting picked up with this commit. >> Source/WebCore/platform/win/WebCoreBundleWin.cpp:2 >> + * Copyright (C) 2013 Apple Inc. All rights reserved. > > The license from the old file should carry over (so this should be '2011, 2013'). Will do. >> Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp:161 >> + RetainPtr<CFURLRef> htmlURLRef = adoptCF(CFBundleCopyResourceURL(WebCore::webKitBundle(), CFSTR("inspector"), CFSTR("html"), CFSTR("inspector"))); > > why do you need the explicit namespace? This file 'using namespace WebCore's. Huh. I'll correct.
Committed r154146: <http://trac.webkit.org/changeset/154146>