Diff
Modified: branches/safari-537.75-branch/Source/WTF/ChangeLog (163499 => 163500)
--- branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-02-06 01:18:23 UTC (rev 163499)
+++ branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-02-06 01:19:43 UTC (rev 163500)
@@ -1,3 +1,10 @@
+2014-02-05 Brent Fulgham <[email protected]>
+
+ Merge in build correction to prevent needless "rebuild all" builds.
+
+ * WTF.vcxproj/WTFGenerated.make: Avoid re-copying identical files, which
+ forces a complete rebuild.
+
2014-01-27 Brent Fulgham <[email protected]>
Merge r162723.
Modified: branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make (163499 => 163500)
--- branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make 2014-02-06 01:18:23 UTC (rev 163499)
+++ branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make 2014-02-06 01:19:43 UTC (rev 163500)
@@ -17,6 +17,9 @@
WTFHeaderDetection.h: WTFGenerated.make
-mkdir "%ConfigurationBuildDir%\include\private\wtf
<<testOSXLevel.cmd
+IF EXIST "%ConfigurationBuildDir%\include\private\wtf\$@" GOTO DONE
echo /* No Legible Output Support Found */ > "%ConfigurationBuildDir%\include\private\wtf\$@"
IF EXIST "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" (echo #define __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 1090 > "%ConfigurationBuildDir%\include\private\wtf\$@")
+:DONE
<<
+
Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (163499 => 163500)
--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-06 01:18:23 UTC (rev 163499)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-06 01:19:43 UTC (rev 163500)
@@ -1,3 +1,25 @@
+2014-02-05 Brent Fulgham <[email protected]>
+
+ Merge r154146, r155828, r156145
+
+ 2013-08-15 Brent Fulgham <[email protected]>
+
+ [Windows] Consolidate WebKit Bundle Handling
+ https://bugs.webkit.org/show_bug.cgi?id=119869
+
+ Reviewed by Tim Horton.
+
+ * WebCore.vcxproj/WebCore.vcxproj: Add new WebCoreBundleWin files.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::certificatePath): Use correct bundle handling logic.
+ * platform/win/LocalizedStringsWin.cpp: Move bundle implementation to
+ new WebCoreBundleWin.cpp file.
+ * platform/win/WebCoreBundleWin.cpp: Added.
+ (WebCore::createWebKitBundle):
+ (WebCore::webKitBundle):
+ * platform/win/WebCoreBundleWin.h: Added.
+
2014-02-04 Brent Fulgham <[email protected]>
Build fix after last branch merge.
Modified: branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (163499 => 163500)
--- branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-06 01:18:23 UTC (rev 163499)
+++ branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-06 01:19:43 UTC (rev 163500)
@@ -7113,6 +7113,7 @@
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">ICUVersion.h</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Production|x64'">ICUVersion.h</ForcedIncludeFiles>
</ClCompile>
+ <ClCompile Include="..\platform\win\WebCoreBundleWin.cpp" />
<ClCompile Include="..\platform\win\WebCoreInstanceHandle.cpp" />
<ClCompile Include="..\rendering\HitTestLocation.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -18856,6 +18857,7 @@
<ClInclude Include="..\platform\win\SystemInfo.h" />
<ClInclude Include="..\platform\graphics\TextRenderingMode.h" />
<ClInclude Include="..\platform\win\WCDataObject.h" />
+ <ClInclude Include="..\platform\win\WebCoreBundleWin.h" />
<ClInclude Include="..\platform\win\WebCoreInstanceHandle.h" />
<ClInclude Include="..\rendering\HitTestLocation.h" />
<ClInclude Include="..\rendering\style\StyleCachedImageSet.h" />
Modified: branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (163499 => 163500)
--- branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-06 01:18:23 UTC (rev 163499)
+++ branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-06 01:19:43 UTC (rev 163500)
@@ -6799,6 +6799,9 @@
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMediaQueryListListener.cpp" />
<ClCompile Include="..\dom\InlineStyleSheetOwner.cpp" />
<ClCompile Include="..\dom\TextNodeTraversal.cpp" />
+ <ClCompile Include="..\platform\win\WebCoreBundleWin.cpp">
+ <Filter>platform\win</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\filesystem\AsyncFileWriter.h">
@@ -14280,6 +14283,9 @@
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSDedicatedWorkerContext.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMediaQueryListListener.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGGraphicsElement.h" />
+ <ClInclude Include="..\platform\win\WebCoreBundleWin.h">
+ <Filter>platform\win</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\css\CSSGrammar.y.in">
Modified: branches/safari-537.75-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (163499 => 163500)
--- branches/safari-537.75-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-02-06 01:18:23 UTC (rev 163499)
+++ branches/safari-537.75-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-02-06 01:19:43 UTC (rev 163500)
@@ -42,6 +42,7 @@
#include "ResourceError.h"
#include "ResourceHandle.h"
#include "ResourceHandleInternal.h"
+#include "WebCoreBundleWin.h"
#include <errno.h>
#include <stdio.h>
@@ -68,9 +69,9 @@
static CString certificatePath()
{
#if USE(CF)
- CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
- if (webKitBundle) {
- RetainPtr<CFURLRef> certURLRef = adoptCF(CFBundleCopyResourceURL(webKitBundle, CFSTR("cacert"), CFSTR("pem"), CFSTR("certificates")));
+ CFBundleRef webKitBundleRef = webKitBundle();
+ if (webKitBundleRef) {
+ RetainPtr<CFURLRef> certURLRef = adoptCF(CFBundleCopyResourceURL(webKitBundleRef, CFSTR("cacert"), CFSTR("pem"), CFSTR("certificates")));
if (certURLRef) {
char path[MAX_PATH];
CFURLGetFileSystemRepresentation(certURLRef.get(), false, reinterpret_cast<UInt8*>(path), MAX_PATH);
Modified: branches/safari-537.75-branch/Source/WebCore/platform/win/LocalizedStringsWin.cpp (163499 => 163500)
--- branches/safari-537.75-branch/Source/WebCore/platform/win/LocalizedStringsWin.cpp 2014-02-06 01:18:23 UTC (rev 163499)
+++ branches/safari-537.75-branch/Source/WebCore/platform/win/LocalizedStringsWin.cpp 2014-02-06 01:19:43 UTC (rev 163500)
@@ -34,43 +34,13 @@
#include <wtf/text/WTFString.h>
#if USE(CF)
+#include "WebCoreBundleWin.h"
#include <CoreFoundation/CFBundle.h>
#include <wtf/RetainPtr.h>
#endif
namespace WebCore {
-#if USE(CF)
-
-static CFBundleRef createWebKitBundle()
-{
- if (CFBundleRef existingBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"))) {
- CFRetain(existingBundle);
- return existingBundle;
- }
-
- wchar_t dllPathBuffer[MAX_PATH];
- DWORD length = ::GetModuleFileNameW(instanceHandle(), dllPathBuffer, WTF_ARRAY_LENGTH(dllPathBuffer));
- ASSERT(length);
- ASSERT(length < WTF_ARRAY_LENGTH(dllPathBuffer));
-
- RetainPtr<CFStringRef> dllPath = adoptCF(CFStringCreateWithCharactersNoCopy(0, reinterpret_cast<const UniChar*>(dllPathBuffer), length, kCFAllocatorNull));
- RetainPtr<CFURLRef> dllURL = adoptCF(CFURLCreateWithFileSystemPath(0, dllPath.get(), kCFURLWindowsPathStyle, false));
- RetainPtr<CFURLRef> dllDirectoryURL = adoptCF(CFURLCreateCopyDeletingLastPathComponent(0, dllURL.get()));
- RetainPtr<CFURLRef> resourcesDirectoryURL = adoptCF(CFURLCreateCopyAppendingPathComponent(0, dllDirectoryURL.get(), CFSTR("WebKit.resources"), true));
-
- return CFBundleCreate(0, resourcesDirectoryURL.get());
-}
-
-static CFBundleRef webKitBundle()
-{
- static CFBundleRef bundle = createWebKitBundle();
- ASSERT(bundle);
- return bundle;
-}
-
-#endif // USE(CF)
-
String localizedString(const char* key)
{
ASSERT(isMainThread());
Modified: branches/safari-537.75-branch/Source/WebKit/win/ChangeLog (163499 => 163500)
--- branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-02-06 01:18:23 UTC (rev 163499)
+++ branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-02-06 01:19:43 UTC (rev 163500)
@@ -1,3 +1,19 @@
+2014-02-05 Brent Fulgham <[email protected]>
+
+ Merge r154146
+
+ 2013-08-15 Brent Fulgham <[email protected]>
+
+ [Windows] Consolidate WebKit Bundle handling
+ https://bugs.webkit.org/show_bug.cgi?id=119869
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorClient::openInspectorFrontend): Switch to new
+ WebCore::webkitBundle() method.
+ (WebInspectorFrontendClient::localizedStringsURL): Ditto.
+
2014-02-03 Brent Fulgham <[email protected]>
Merge r154394
Modified: branches/safari-537.75-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (163499 => 163500)
--- branches/safari-537.75-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-02-06 01:18:23 UTC (rev 163499)
+++ branches/safari-537.75-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-02-06 01:19:43 UTC (rev 163500)
@@ -31,6 +31,7 @@
#if ENABLE(INSPECTOR)
+#include "WebCoreBundleWin.h"
#include "WebInspectorDelegate.h"
#include "WebKit.h"
#include "WebMutableURLRequest.h"
@@ -63,11 +64,6 @@
return rect;
}
-static CFBundleRef getWebKitBundle()
-{
- return CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
-}
-
WebInspectorClient::WebInspectorClient(WebView* webView)
: m_inspectedWebView(webView)
, m_frontendPage(0)
@@ -162,10 +158,8 @@
COMPtr<WebMutableURLRequest> request(AdoptCOM, WebMutableURLRequest::createInstance());
- RetainPtr<CFURLRef> htmlURLRef = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("Main"), CFSTR("html"), CFSTR("WebInspectorUI")));
+ RetainPtr<CFURLRef> htmlURLRef = adoptCF(CFBundleCopyResourceURL(webKitBundle(), CFSTR("Main"), CFSTR("html"), CFSTR("WebInspectorUI")));
if (!htmlURLRef)
- htmlURLRef = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("inspector"), CFSTR("html"), CFSTR("inspector")));
- if (!htmlURLRef)
return 0;
CFStringRef urlStringRef = ::CFURLGetString(htmlURLRef.get());
@@ -264,9 +258,9 @@
String WebInspectorFrontendClient::localizedStringsURL()
{
- RetainPtr<CFURLRef> url = "" CFSTR("localizedStrings"), CFSTR("js"), CFSTR("WebInspectorUI")));
+ RetainPtr<CFURLRef> url = "" CFSTR("localizedStrings"), CFSTR("js"), CFSTR("WebInspectorUI")));
if (!url)
- url = "" CFSTR("localizedStrings"), CFSTR("js"), 0));
+ url = "" CFSTR("localizedStrings"), CFSTR("js"), 0));
if (!url)
return String();
