Diff
Modified: trunk/Source/WebKit2/ChangeLog (109632 => 109633)
--- trunk/Source/WebKit2/ChangeLog 2012-03-03 00:29:41 UTC (rev 109632)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-03 00:39:06 UTC (rev 109633)
@@ -1,5 +1,28 @@
2012-03-02 Andy Estes <[email protected]>
+ Move nsStringFromWebCoreString out of PageClientImpl
+ https://bugs.webkit.org/show_bug.cgi?id=80202
+
+ Reviewed by Sam Weinig.
+
+ nsStringFromWebCoreString() doesn't really belong in PageClientImpl.mm,
+ and it makes us include PageClientImpl.h in places where we shouldn't.
+ Move this function into StringUtilities.{h, mm}.
+
+ * Platform/mac/StringUtilities.h: Added.
+ * Platform/mac/StringUtilities.mm: Added.
+ (WebKit::nsStringFromWebCoreString):
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ * UIProcess/API/mac/WKView.mm:
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ * UIProcess/mac/WebPageProxyMac.mm:
+ * UIProcess/mac/WebPopupMenuProxyMac.mm:
+ * UIProcess/mac/WebPreferencesMac.mm:
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2012-03-02 Andy Estes <[email protected]>
+
Remove com.apple.WebKit.PluginProcess.sb from WebKit2.xcodeproj's Headers build phase
https://bugs.webkit.org/show_bug.cgi?id=80197
Added: trunk/Source/WebKit2/Platform/mac/StringUtilities.h (0 => 109633)
--- trunk/Source/WebKit2/Platform/mac/StringUtilities.h (rev 0)
+++ trunk/Source/WebKit2/Platform/mac/StringUtilities.h 2012-03-03 00:39:06 UTC (rev 109633)
@@ -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: trunk/Source/WebKit2/Platform/mac/StringUtilities.mm (0 => 109633)
--- trunk/Source/WebKit2/Platform/mac/StringUtilities.mm (rev 0)
+++ trunk/Source/WebKit2/Platform/mac/StringUtilities.mm 2012-03-03 00:39:06 UTC (rev 109633)
@@ -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: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (109632 => 109633)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2012-03-03 00:29:41 UTC (rev 109632)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2012-03-03 00:39:06 UTC (rev 109633)
@@ -37,10 +37,6 @@
class FindIndicatorWindow;
-// NOTE: This does not use String::operator NSString*() since that function
-// expects to be called on the thread running WebCore.
-NSString* nsStringFromWebCoreString(const String&);
-
class PageClientImpl : public PageClient {
public:
static PassOwnPtr<PageClientImpl> create(WKView*);
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (109632 => 109633)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2012-03-03 00:29:41 UTC (rev 109632)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2012-03-03 00:39:06 UTC (rev 109633)
@@ -33,6 +33,7 @@
#import "WKAPICast.h"
#import "WKStringCF.h"
#import "WKViewInternal.h"
+#import "StringUtilities.h"
#import "WebContextMenuProxyMac.h"
#import "WebEditCommandProxy.h"
#import "WebPopupMenuProxyMac.h"
@@ -104,11 +105,6 @@
namespace WebKit {
-NSString* nsStringFromWebCoreString(const String& string)
-{
- return string.impl() ? HardAutorelease(WKStringCopyCFString(0, toAPI(string.impl()))) : @"";
-}
-
PassOwnPtr<PageClientImpl> PageClientImpl::create(WKView* wkView)
{
return adoptPtr(new PageClientImpl(wkView));
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (109632 => 109633)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-03-03 00:29:41 UTC (rev 109632)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-03-03 00:39:06 UTC (rev 109633)
@@ -40,6 +40,7 @@
#import "PDFViewController.h"
#import "PageClientImpl.h"
#import "PasteboardTypes.h"
+#import "StringUtilities.h"
#import "TextChecker.h"
#import "TextCheckerState.h"
#import "TiledCoreAnimationDrawingAreaProxy.h"
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (109632 => 109633)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2012-03-03 00:29:41 UTC (rev 109632)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2012-03-03 00:39:06 UTC (rev 109633)
@@ -27,6 +27,7 @@
#import "WebContextMenuProxyMac.h"
#import "PageClientImpl.h"
+#import "StringUtilities.h"
#import "WebContextMenuItemData.h"
#import "WKView.h"
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (109632 => 109633)
--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2012-03-03 00:29:41 UTC (rev 109632)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2012-03-03 00:39:06 UTC (rev 109633)
@@ -34,6 +34,7 @@
#import "PluginComplexTextInputState.h"
#import "PageClient.h"
#import "PageClientImpl.h"
+#import "StringUtilities.h"
#import "TextChecker.h"
#import "WebPageMessages.h"
#import "WebProcessProxy.h"
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (109632 => 109633)
--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2012-03-03 00:29:41 UTC (rev 109632)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2012-03-03 00:39:06 UTC (rev 109633)
@@ -29,6 +29,7 @@
#import "NativeWebMouseEvent.h"
#import "PageClientImpl.h"
#import "PlatformPopupMenuData.h"
+#import "StringUtilities.h"
#import "WKView.h"
#import "WebPopupItem.h"
#import <WebKitSystemInterface.h>
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm (109632 => 109633)
--- trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2012-03-03 00:29:41 UTC (rev 109632)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2012-03-03 00:39:06 UTC (rev 109633)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WebPreferences.h"
-#import "PageClientImpl.h"
+#import "StringUtilities.h"
#import <wtf/text/StringConcatenate.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (109632 => 109633)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-03-03 00:29:41 UTC (rev 109632)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-03-03 00:39:06 UTC (rev 109633)
@@ -249,6 +249,8 @@
1CA8B945127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */; };
1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */; };
1CA8B954127C891500576C2B /* WebInspectorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E2DAD1278C5B200BC7BD0 /* WebInspectorMac.mm */; };
+ 296BD85D15019BC30071F424 /* StringUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 296BD85B15019BC30071F424 /* StringUtilities.h */; };
+ 296BD85E15019BC30071F424 /* StringUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 296BD85C15019BC30071F424 /* StringUtilities.mm */; };
29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */; };
29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */; };
31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */; };
@@ -1248,6 +1250,8 @@
1CA8B935127C774E00576C2B /* WebInspectorProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspectorProxyMac.mm; sourceTree = "<group>"; };
1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorProxyMessageReceiver.cpp; sourceTree = "<group>"; };
1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorProxyMessages.h; sourceTree = "<group>"; };
+ 296BD85B15019BC30071F424 /* StringUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringUtilities.h; sourceTree = "<group>"; };
+ 296BD85C15019BC30071F424 /* StringUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringUtilities.mm; sourceTree = "<group>"; };
29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKAccessibilityWebPageObject.h; sourceTree = "<group>"; };
29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKAccessibilityWebPageObject.mm; sourceTree = "<group>"; };
31099968146C71F50029DEB9 /* WebNotificationClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationClient.h; sourceTree = "<group>"; };
@@ -2271,10 +2275,12 @@
1A24B5F011F531E800C38269 /* MachUtilities.cpp */,
1A24B5F111F531E800C38269 /* MachUtilities.h */,
C0E3AA481209E45000A49D01 /* ModuleMac.mm */,
+ BCE0937514FB128B001138D9 /* RemoteLayerClient.mm */,
+ BCE0937614FB128B001138D9 /* RemoteLayerClient.h */,
1A24BF39120896A600FBB059 /* SharedMemoryMac.cpp */,
+ 296BD85B15019BC30071F424 /* StringUtilities.h */,
+ 296BD85C15019BC30071F424 /* StringUtilities.mm */,
BC0092F6115837A300E0AE2A /* WorkQueueMac.cpp */,
- BCE0937514FB128B001138D9 /* RemoteLayerClient.mm */,
- BCE0937614FB128B001138D9 /* RemoteLayerClient.h */,
);
path = mac;
sourceTree = "<group>";
@@ -4148,6 +4154,7 @@
1AB42E8714BBBBB2004272F7 /* KeychainShimResponseMap.h in Headers */,
E17BF99614D0A73E00A5A069 /* NetscapeSandboxFunctions.h in Headers */,
BCE0937814FB128C001138D9 /* RemoteLayerClient.h in Headers */,
+ 296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4887,6 +4894,7 @@
BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */,
E17BF99814D0AA8300A5A069 /* NetscapeSandboxFunctions.mm in Sources */,
BCE0937714FB128C001138D9 /* RemoteLayerClient.mm in Sources */,
+ 296BD85E15019BC30071F424 /* StringUtilities.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
