Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (165055 => 165056)
--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-04 17:06:50 UTC (rev 165055)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-04 17:16:47 UTC (rev 165056)
@@ -1,3 +1,15 @@
+2014-03-04 Brent Fulgham <[email protected]>
+
+ Unreviewed build fix after bad merge of r154146.
+ <rdar://problem/16223155>
+
+ Two files were ommitted from the prior commit.
+
+ * platform/win/WebCoreBundleWin.cpp: Added.
+ (WebCore::createWebKitBundle):
+ (WebCore::webKitBundle):
+ * platform/win/WebCoreBundleWin.h: Added.
+
2014-03-03 Brent Fulgham <[email protected]>
Unreviewed build fix.
Added: branches/safari-537.75-branch/Source/WebCore/platform/win/WebCoreBundleWin.cpp (0 => 165056)
--- branches/safari-537.75-branch/Source/WebCore/platform/win/WebCoreBundleWin.cpp (rev 0)
+++ branches/safari-537.75-branch/Source/WebCore/platform/win/WebCoreBundleWin.cpp 2014-03-04 17:16:47 UTC (rev 165056)
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebCoreBundleWin.h"
+
+#if USE(CF)
+
+#include "WebCoreInstanceHandle.h"
+#include <CoreFoundation/CFBundle.h>
+#include <windows.h>
+#include <wtf/RetainPtr.h>
+
+namespace WebCore {
+
+static CFBundleRef createWebKitBundle()
+{
+ if (CFBundleRef existingBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"))) {
+ CFRetain(existingBundle);
+ return existingBundle;
+ }
+
+ wchar_t dllPathBuffer[MAX_PATH];
+ DWORD length = ::GetModuleFileNameW(WebCore::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());
+}
+
+CFBundleRef webKitBundle()
+{
+ static CFBundleRef bundle = createWebKitBundle();
+ ASSERT(bundle);
+ return bundle;
+}
+
+} // namespace WebCore
+
+#endif
Property changes on: branches/safari-537.75-branch/Source/WebCore/platform/win/WebCoreBundleWin.cpp
___________________________________________________________________
Added: branches/safari-537.75-branch/Source/WebCore/platform/win/WebCoreBundleWin.h (0 => 165056)
--- branches/safari-537.75-branch/Source/WebCore/platform/win/WebCoreBundleWin.h (rev 0)
+++ branches/safari-537.75-branch/Source/WebCore/platform/win/WebCoreBundleWin.h 2014-03-04 17:16:47 UTC (rev 165056)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebCoreBundleWin_h
+#define WebCoreBundleWin_h
+
+#if USE(CF)
+
+typedef struct __CFBundle* CFBundleRef;
+
+namespace WebCore {
+
+CFBundleRef webKitBundle();
+
+}
+
+#endif
+
+#endif // WebCoreBundleWin_h
Property changes on: branches/safari-537.75-branch/Source/WebCore/platform/win/WebCoreBundleWin.h
___________________________________________________________________
