Diff
Modified: branches/safari-534.59-branch/Source/WebKit2/ChangeLog (147585 => 147586)
--- branches/safari-534.59-branch/Source/WebKit2/ChangeLog 2013-04-03 21:35:12 UTC (rev 147585)
+++ branches/safari-534.59-branch/Source/WebKit2/ChangeLog 2013-04-03 21:51:11 UTC (rev 147586)
@@ -1,5 +1,21 @@
2013-04-03 Lucas Forschler <[email protected]>
+ Fix the build after merging 147042.
+
+ * Platform/mac/StringUtilities.h: Added.
+ (WebKit):
+ * Platform/mac/StringUtilities.mm: Added.
+ (WebKit):
+ (WebKit::nsStringFromWebCoreString):
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ (WKContextCopyPlugInInfoForBundleIdentifier):
+ * UIProcess/Plugins/PluginInfoStore.h:
+ (PluginInfoStore):
+ * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+ (WebKit::PluginInfoStore::findPluginWithBundleIdentifier):
+
+2013-04-03 Lucas Forschler <[email protected]>
+
Remove include after mis-merge of r147052.
* UIProcess/API/C/WKAPICast.h:
Added: branches/safari-534.59-branch/Source/WebKit2/Platform/mac/StringUtilities.h (0 => 147586)
--- branches/safari-534.59-branch/Source/WebKit2/Platform/mac/StringUtilities.h (rev 0)
+++ branches/safari-534.59-branch/Source/WebKit2/Platform/mac/StringUtilities.h 2013-04-03 21:51:11 UTC (rev 147586)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 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 StringUtilities_h
+#define StringUtilities_h
+
+#import <wtf/Forward.h>
+
+namespace WebKit {
+
+// NOTE: This does not use String::operator NSString*() since that function
+// expects to be called on the thread running WebCore.
+NSString* nsStringFromWebCoreString(const String&);
+
+}
+
+#endif // StringUtilities_h
Added: branches/safari-534.59-branch/Source/WebKit2/Platform/mac/StringUtilities.mm (0 => 147586)
--- branches/safari-534.59-branch/Source/WebKit2/Platform/mac/StringUtilities.mm (rev 0)
+++ branches/safari-534.59-branch/Source/WebKit2/Platform/mac/StringUtilities.mm 2013-04-03 21:51:11 UTC (rev 147586)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+#import "config.h"
+#import "StringUtilities.h"
+
+#import <WebCore/FoundationExtras.h>
+#import "WKSharedAPICast.h"
+#import "WKStringCF.h"
+#import <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+NSString* nsStringFromWebCoreString(const String& string)
+{
+ return string.impl() ? HardAutorelease(WKStringCopyCFString(0, toAPI(string.impl()))) : @"";
+}
+
+}
Modified: branches/safari-534.59-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (147585 => 147586)
--- branches/safari-534.59-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-04-03 21:35:12 UTC (rev 147585)
+++ branches/safari-534.59-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-04-03 21:51:11 UTC (rev 147586)
@@ -78,7 +78,7 @@
WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef contextRef, WKStringRef plugInBundleIdentifierRef)
{
- PluginModuleInfo info = toImpl(contextRef)->pluginInfoStore().findPluginWithBundleIdentifier(toWTFString(plugInBundleIdentifierRef));
+ PluginInfoStore::Plugin info = toImpl(contextRef)->pluginInfoStore().findPluginWithBundleIdentifier(toWTFString(plugInBundleIdentifierRef));
if (info.path.isNull())
return 0;
Modified: branches/safari-534.59-branch/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h (147585 => 147586)
--- branches/safari-534.59-branch/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h 2013-04-03 21:35:12 UTC (rev 147585)
+++ branches/safari-534.59-branch/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h 2013-04-03 21:51:11 UTC (rev 147586)
@@ -65,7 +65,7 @@
Plugin findPlugin(String& mimeType, const WebCore::KURL& url);
// Returns the info for the plug-in with the given bundle identifier.
- PluginModuleInfo findPluginWithBundleIdentifier(const String& bundleIdentifier);
+ Plugin findPluginWithBundleIdentifier(const String& bundleIdentifier);
// Returns the info for the plug-in with the given path.
Plugin infoForPluginWithPath(const String& pluginPath);
Modified: branches/safari-534.59-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (147585 => 147586)
--- branches/safari-534.59-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2013-04-03 21:35:12 UTC (rev 147585)
+++ branches/safari-534.59-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2013-04-03 21:51:11 UTC (rev 147586)
@@ -143,7 +143,7 @@
return PluginModuleLoadNormally;
}
-PluginModuleInfo PluginInfoStore::findPluginWithBundleIdentifier(const String& bundleIdentifier)
+PluginInfoStore::Plugin PluginInfoStore::findPluginWithBundleIdentifier(const String& bundleIdentifier)
{
loadPluginsIfNecessary();
@@ -152,7 +152,7 @@
return m_plugins[i];
}
- return PluginModuleInfo();
+ return Plugin();
}
} // namespace WebKit
