Changeset 109633 in webkit


Ignore:
Timestamp:
Mar 2, 2012 4:39:06 PM (12 years ago)
Author:
aestes@apple.com
Message:

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:
Location:
trunk/Source/WebKit2
Files:
2 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r109622 r109633  
     12012-03-02  Andy Estes  <aestes@apple.com>
     2
     3        Move nsStringFromWebCoreString out of PageClientImpl
     4        https://bugs.webkit.org/show_bug.cgi?id=80202
     5
     6        Reviewed by Sam Weinig.
     7
     8        nsStringFromWebCoreString() doesn't really belong in PageClientImpl.mm,
     9        and it makes us include PageClientImpl.h in places where we shouldn't.
     10        Move this function into StringUtilities.{h, mm}.
     11
     12        * Platform/mac/StringUtilities.h: Added.
     13        * Platform/mac/StringUtilities.mm: Added.
     14        (WebKit::nsStringFromWebCoreString):
     15        * UIProcess/API/mac/PageClientImpl.h:
     16        * UIProcess/API/mac/PageClientImpl.mm:
     17        * UIProcess/API/mac/WKView.mm:
     18        * UIProcess/mac/WebContextMenuProxyMac.mm:
     19        * UIProcess/mac/WebPageProxyMac.mm:
     20        * UIProcess/mac/WebPopupMenuProxyMac.mm:
     21        * UIProcess/mac/WebPreferencesMac.mm:
     22        * WebKit2.xcodeproj/project.pbxproj:
     23
    1242012-03-02  Andy Estes  <aestes@apple.com>
    225

  • trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h

    r104635 r109633  
    3737
    3838class FindIndicatorWindow;
    39 
    40 // NOTE: This does not use String::operator NSString*() since that function
    41 // expects to be called on the thread running WebCore.
    42 NSString* nsStringFromWebCoreString(const String&);
    4339
    4440class PageClientImpl : public PageClient {

  • trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

    r104635 r109633  
    3434#import "WKStringCF.h"
    3535#import "WKViewInternal.h"
     36#import "StringUtilities.h"
    3637#import "WebContextMenuProxyMac.h"
    3738#import "WebEditCommandProxy.h"
    … …  
    105106namespace WebKit {
    106107
    107 NSString* nsStringFromWebCoreString(const String& string)
    108 {
    109     return string.impl() ? HardAutorelease(WKStringCopyCFString(0, toAPI(string.impl()))) : @"";
    110 }
    111 
    112108PassOwnPtr<PageClientImpl> PageClientImpl::create(WKView* wkView)
    113109{

  • trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r107307 r109633  
    4141#import "PageClientImpl.h"
    4242#import "PasteboardTypes.h"
     43#import "StringUtilities.h"
    4344#import "TextChecker.h"
    4445#import "TextCheckerState.h"

  • trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm

    r95901 r109633  
    2828
    2929#import "PageClientImpl.h"
     30#import "StringUtilities.h"
    3031#import "WebContextMenuItemData.h"
    3132#import "WKView.h"

  • trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

    r103009 r109633  
    3535#import "PageClient.h"
    3636#import "PageClientImpl.h"
     37#import "StringUtilities.h"
    3738#import "TextChecker.h"
    3839#import "WebPageMessages.h"

  • trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm

    r95901 r109633  
    3030#import "PageClientImpl.h"
    3131#import "PlatformPopupMenuData.h"
     32#import "StringUtilities.h"
    3233#import "WKView.h"
    3334#import "WebPopupItem.h"

  • trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm

    r95901 r109633  
    2727#import "WebPreferences.h"
    2828
    29 #import "PageClientImpl.h"
     29#import "StringUtilities.h"
    3030#import <wtf/text/StringConcatenate.h>
    3131

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r109621 r109633  
    250250                1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */; };
    251251                1CA8B954127C891500576C2B /* WebInspectorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E2DAD1278C5B200BC7BD0 /* WebInspectorMac.mm */; };
     252                296BD85D15019BC30071F424 /* StringUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 296BD85B15019BC30071F424 /* StringUtilities.h */; };
     253                296BD85E15019BC30071F424 /* StringUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 296BD85C15019BC30071F424 /* StringUtilities.mm */; };
    252254                29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */; };
    253255                29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */; };
    … …  
    12491251                1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorProxyMessageReceiver.cpp; sourceTree = "<group>"; };
    12501252                1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorProxyMessages.h; sourceTree = "<group>"; };
     1253                296BD85B15019BC30071F424 /* StringUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringUtilities.h; sourceTree = "<group>"; };
     1254                296BD85C15019BC30071F424 /* StringUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringUtilities.mm; sourceTree = "<group>"; };
    12511255                29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKAccessibilityWebPageObject.h; sourceTree = "<group>"; };
    12521256                29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKAccessibilityWebPageObject.mm; sourceTree = "<group>"; };
    … …  
    22722276                                1A24B5F111F531E800C38269 /* MachUtilities.h */,
    22732277                                C0E3AA481209E45000A49D01 /* ModuleMac.mm */,
    2274                                 1A24BF39120896A600FBB059 /* SharedMemoryMac.cpp */,
    2275                                 BC0092F6115837A300E0AE2A /* WorkQueueMac.cpp */,
    22762278                                BCE0937514FB128B001138D9 /* RemoteLayerClient.mm */,
    22772279                                BCE0937614FB128B001138D9 /* RemoteLayerClient.h */,
     2280                                1A24BF39120896A600FBB059 /* SharedMemoryMac.cpp */,
     2281                                296BD85B15019BC30071F424 /* StringUtilities.h */,
     2282                                296BD85C15019BC30071F424 /* StringUtilities.mm */,
     2283                                BC0092F6115837A300E0AE2A /* WorkQueueMac.cpp */,
    22782284                        );
    22792285                        path = mac;
    … …  
    41494155                                E17BF99614D0A73E00A5A069 /* NetscapeSandboxFunctions.h in Headers */,
    41504156                                BCE0937814FB128C001138D9 /* RemoteLayerClient.h in Headers */,
     4157                                296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
    41514158                        );
    41524159                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    48884895                                E17BF99814D0AA8300A5A069 /* NetscapeSandboxFunctions.mm in Sources */,
    48894896                                BCE0937714FB128C001138D9 /* RemoteLayerClient.mm in Sources */,
     4897                                296BD85E15019BC30071F424 /* StringUtilities.mm in Sources */,
    48904898                        );
    48914899                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.